diff options
Diffstat (limited to 'src/mame/drivers/seta.cpp')
-rw-r--r-- | src/mame/drivers/seta.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index dd81bc1c926..4b6d9ce70d9 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1592,7 +1592,7 @@ WRITE16_MEMBER(seta_state::sub_ctrl_w) /* DSW reading for 16 bit CPUs */ READ16_MEMBER(seta_state::seta_dsw_r) { - uint16_t dsw = ioport("DSW")->read(); + uint16_t dsw = m_dsw->read(); if (offset == 0) return (dsw >> 8) & 0xff; else return (dsw >> 0) & 0xff; } @@ -2852,14 +2852,13 @@ READ16_MEMBER(seta_state::kiwame_input_r) { int row_select = m_kiwame_row_select; int i; - static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; for(i = 0; i < 5; i++) if (row_select & (1<<i)) break; switch( offset ) { - case 0x00/2: return ioport(keynames[i])->read(); + case 0x00/2: return m_key[i]->read(); case 0x02/2: return 0xffff; case 0x04/2: return m_coins->read(); // case 0x06/2: @@ -3263,10 +3262,10 @@ READ16_MEMBER(jockeyc_state::trackball_r) { switch (offset) { - case 0/2: return (ioport("P1X")->read() >> 0) & 0xff; - case 2/2: return (ioport("P1X")->read() >> 8) & 0xff; - case 4/2: return (ioport("P1Y")->read() >> 0) & 0xff; - case 6/2: return (ioport("P1Y")->read() >> 8) & 0xff; + case 0/2: return (m_p1x->read() >> 0) & 0xff; + case 2/2: return (m_p1x->read() >> 8) & 0xff; + case 4/2: return (m_p1y->read() >> 0) & 0xff; + case 6/2: return (m_p1y->read() >> 8) & 0xff; } return 0; } @@ -3467,21 +3466,21 @@ void seta_state::twineagl_sub_map(address_map &map) READ8_MEMBER(seta_state::downtown_ip_r) { - int dir1 = ioport("ROT1")->read(); // analog port - int dir2 = ioport("ROT2")->read(); // analog port + int dir1 = m_rot[0]->read(); // analog port + int dir2 = m_rot[1]->read(); // analog port dir1 = (~ (0x800 >> dir1)) & 0xfff; dir2 = (~ (0x800 >> dir2)) & 0xfff; switch (offset) { - case 0: return (ioport("COINS")->read() & 0xf0) + (dir1 >> 8); // upper 4 bits of p1 rotation + coins + case 0: return (m_coins->read() & 0xf0) + (dir1 >> 8); // upper 4 bits of p1 rotation + coins case 1: return (dir1 & 0xff); // lower 8 bits of p1 rotation - case 2: return ioport("P1")->read(); // p1 + case 2: return m_p1->read(); // p1 case 3: return 0xff; // ? case 4: return (dir2 >> 8); // upper 4 bits of p2 rotation + ? case 5: return (dir2 & 0xff); // lower 8 bits of p2 rotation - case 6: return ioport("P2")->read(); // p2 + case 6: return m_p2->read(); // p2 case 7: return 0xff; // ? } @@ -10376,7 +10375,7 @@ ROM_END ROM_START( rezont ) ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "us001001.u3", 0x000000, 0x020000, CRC(ab923052) SHA1(26761c228b63c300f635787e63e1276b6e3083f0) ) - ROM_LOAD16_BYTE( "rezon_1_p.u4", 0x000001, 0x020000, CRC(9ed32f8c) SHA1(68b926de4cb5f2632ab78b2cdf7409411fadbb1d) ) + ROM_LOAD16_BYTE( "rezon_1_p.u4", 0x000001, 0x020000, CRC(9ed32f8c) SHA1(68b926de4cb5f2632ab78b2cdf7409411fadbb1d) ) /* empty gap */ ROM_LOAD16_BYTE( "us001004.103", 0x100000, 0x020000, CRC(54871c7c) SHA1(2f807b15760b1e712fa69eee6f33cc8a36ee1c02) ) // 1xxxxxxxxxxxxxxxx = 0x00 ROM_LOAD16_BYTE( "us001003.102", 0x100001, 0x020000, CRC(1ac3d272) SHA1(0f19bc9c19e355dad5b463b0fa33127523bf141b) ) // 1xxxxxxxxxxxxxxxx = 0x00 |