summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers/mac.c
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2014-01-01 17:16:02 +0000
committer smf- <smf-@users.noreply.github.com>2014-01-01 17:16:02 +0000
commitc4c56cedeed23d5d19e9ced4b97f7000955914f3 (patch)
tree067b078bb4e69ca78249f285e06ea4bdbcfbce69 /src/mess/drivers/mac.c
parent3044336dd05d5078fefcf3fe0f80f8fcb046b08e (diff)
Removed cb2 callback from mac drivers, you now have to push the data. [smf]
Diffstat (limited to 'src/mess/drivers/mac.c')
-rw-r--r--src/mess/drivers/mac.c24
1 files changed, 6 insertions, 18 deletions
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index 9d9ac04ea47..69f03689c84 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -966,16 +966,16 @@ static MACHINE_CONFIG_START( mac512ke, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
-#ifdef MAC_USE_EMULATED_KBD
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_via_in_cb2))
-#endif
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
- MCFG_MACKBD_ADD()
+ MCFG_DEVICE_ADD(MACKBD_TAG, MACKBD, 0)
+#ifdef MAC_USE_EMULATED_KBD
+ MCFG_MACKBD_DATAOUT_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(mac_state, mac_kbd_clk_in))
+#endif
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1019,7 +1019,6 @@ static MACHINE_CONFIG_DERIVED( macse, macplus )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1030,7 +1029,7 @@ static MACHINE_CONFIG_DERIVED( macse, macplus )
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("2M,2560K,4M")
- MCFG_MACKBD_REMOVE()
+ MCFG_DEVICE_REMOVE(MACKBD_TAG)
MCFG_MACPDS_BUS_ADD("sepds", "maincpu", macpds_intf)
MCFG_MACPDS_SLOT_ADD("sepds", "pds", mac_sepds_cards, NULL)
@@ -1044,7 +1043,6 @@ static MACHINE_CONFIG_DERIVED( macclasc, macplus )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1055,7 +1053,7 @@ static MACHINE_CONFIG_DERIVED( macclasc, macplus )
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("2M,2560K,4M")
- MCFG_MACKBD_REMOVE()
+ MCFG_DEVICE_REMOVE(MACKBD_TAG)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( macprtb, mac_state )
@@ -1099,9 +1097,6 @@ static MACHINE_CONFIG_START( macprtb, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
-#ifdef MAC_USE_EMULATED_KBD
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_via_in_cb2))
-#endif
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
@@ -1154,7 +1149,6 @@ static MACHINE_CONFIG_START( macii, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1217,7 +1211,6 @@ static MACHINE_CONFIG_START( maciifx, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1427,7 +1420,6 @@ static MACHINE_CONFIG_START( macse30, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1488,7 +1480,6 @@ static MACHINE_CONFIG_START( macpb140, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1569,7 +1560,6 @@ static MACHINE_CONFIG_START( macpb160, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1751,7 +1741,6 @@ static MACHINE_CONFIG_START( pwrmac, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
@@ -1809,7 +1798,6 @@ static MACHINE_CONFIG_START( macqd700, mac_state )
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_READCB2_HANDLER(READLINE(mac_state,mac_adb_via_in_cb2))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))