diff options
Diffstat (limited to 'src/mess/drivers/ami1200.c')
-rw-r--r-- | src/mess/drivers/ami1200.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/mess/drivers/ami1200.c b/src/mess/drivers/ami1200.c index 3435cd5ed41..9661c1e1e4b 100644 --- a/src/mess/drivers/ami1200.c +++ b/src/mess/drivers/ami1200.c @@ -38,6 +38,10 @@ public: int m_oldstate[2]; DECLARE_WRITE32_MEMBER(aga_overlay_w); DECLARE_DRIVER_INIT(a1200); + DECLARE_WRITE8_MEMBER(ami1200_cia_0_porta_w); + DECLARE_READ8_MEMBER(ami1200_cia_0_portb_r); + DECLARE_WRITE8_MEMBER(ami1200_cia_0_portb_w); + DECLARE_READ8_MEMBER(a1200_cia_0_portA_r); }; @@ -83,14 +87,14 @@ WRITE32_MEMBER(ami1200_state::aga_overlay_w) * *************************************/ -static WRITE8_DEVICE_HANDLER( ami1200_cia_0_porta_w ) +WRITE8_MEMBER(ami1200_state::ami1200_cia_0_porta_w) { - ami1200_state *state = space.machine().driver_data<ami1200_state>(); + device_t *device = machine().device("cia_0"); /* bit 2 = Power Led on Amiga */ - set_led_status(space.machine(), 0, !BIT(data, 1)); + set_led_status(machine(), 0, !BIT(data, 1)); - handle_cd32_joystick_cia(state, data, mos6526_r(device, space, 2)); + handle_cd32_joystick_cia(this, data, mos6526_r(device, space, 2)); } /************************************* @@ -108,17 +112,17 @@ static WRITE8_DEVICE_HANDLER( ami1200_cia_0_porta_w ) * *************************************/ -static READ8_DEVICE_HANDLER( ami1200_cia_0_portb_r ) +READ8_MEMBER(ami1200_state::ami1200_cia_0_portb_r) { /* parallel port */ - logerror("%s:CIA0_portb_r\n", space.machine().describe_context()); + logerror("%s:CIA0_portb_r\n", machine().describe_context()); return 0xff; } -static WRITE8_DEVICE_HANDLER( ami1200_cia_0_portb_w ) +WRITE8_MEMBER(ami1200_state::ami1200_cia_0_portb_w) { /* parallel port */ - logerror("%s:CIA0_portb_w(%02x)\n", space.machine().describe_context(), data); + logerror("%s:CIA0_portb_w(%02x)\n", machine().describe_context(), data); } static ADDRESS_MAP_START( a1200_map, AS_PROGRAM, 32, ami1200_state ) @@ -244,10 +248,10 @@ INPUT_PORTS_END * *************************************/ -static READ8_DEVICE_HANDLER( a1200_cia_0_portA_r ) +READ8_MEMBER(ami1200_state::a1200_cia_0_portA_r) { - UINT8 ret = space.machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ - ret |= space.machine().device<amiga_fdc>("fdc")->ciaapra_r(); + UINT8 ret = machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ + ret |= machine().device<amiga_fdc>("fdc")->ciaapra_r(); return ret; } @@ -258,10 +262,10 @@ static const mos6526_interface a1200_cia_0_intf = DEVCB_NULL, /* pc_func */ DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("cia_0", a1200_cia_0_portA_r), - DEVCB_DEVICE_HANDLER("cia_0", ami1200_cia_0_porta_w), /* port A */ - DEVCB_DEVICE_HANDLER("cia_0", ami1200_cia_0_portb_r), - DEVCB_DEVICE_HANDLER("cia_0", ami1200_cia_0_portb_w) /* port B */ + DEVCB_DRIVER_MEMBER(ami1200_state,a1200_cia_0_portA_r), + DEVCB_DRIVER_MEMBER(ami1200_state,ami1200_cia_0_porta_w), /* port A */ + DEVCB_DRIVER_MEMBER(ami1200_state,ami1200_cia_0_portb_r), + DEVCB_DRIVER_MEMBER(ami1200_state,ami1200_cia_0_portb_w) /* port B */ }; static const mos6526_interface a1200_cia_1_intf = |