diff options
author | 2014-04-29 07:24:36 +0000 | |
---|---|---|
committer | 2014-04-29 07:24:36 +0000 | |
commit | 181f87e14242ed6d845e780924ef0bec457d583d (patch) | |
tree | 29916503554c4fdf68663adb62cf92c1dd07e39f /src/mess/machine | |
parent | bf9cc508b5164c313c91a0a82ad3182a13423cf4 (diff) |
z80pio: converted to use devcb2. nw.
Diffstat (limited to 'src/mess/machine')
-rw-r--r-- | src/mess/machine/ac1.c | 11 | ||||
-rw-r--r-- | src/mess/machine/kaypro.c | 34 | ||||
-rw-r--r-- | src/mess/machine/kramermc.c | 11 | ||||
-rw-r--r-- | src/mess/machine/llc.c | 44 | ||||
-rw-r--r-- | src/mess/machine/mbee.c | 13 | ||||
-rw-r--r-- | src/mess/machine/mc80.c | 33 | ||||
-rw-r--r-- | src/mess/machine/mz700.c | 14 | ||||
-rw-r--r-- | src/mess/machine/super80.c | 12 |
8 files changed, 1 insertions, 171 deletions
diff --git a/src/mess/machine/ac1.c b/src/mess/machine/ac1.c index 9f0cc450353..b3ced599c92 100644 --- a/src/mess/machine/ac1.c +++ b/src/mess/machine/ac1.c @@ -96,17 +96,6 @@ WRITE8_MEMBER(ac1_state::ac1_port_b_w) m_cassette->output((data & 0x40) ? -1.0 : +1.0); } -Z80PIO_INTERFACE( ac1_z80pio_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(ac1_state,ac1_port_a_r), - DEVCB_DRIVER_MEMBER(ac1_state,ac1_port_a_w), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(ac1_state,ac1_port_b_r), - DEVCB_DRIVER_MEMBER(ac1_state,ac1_port_b_w), - DEVCB_NULL -}; - /* Driver initialization */ DRIVER_INIT_MEMBER(ac1_state,ac1) { diff --git a/src/mess/machine/kaypro.c b/src/mess/machine/kaypro.c index 72d4b8e4def..83ee20bbba9 100644 --- a/src/mess/machine/kaypro.c +++ b/src/mess/machine/kaypro.c @@ -80,39 +80,6 @@ WRITE8_MEMBER( kaypro_state::kaypro4_pio_system_w ) m_floppy->ss_w(BIT(data, 2)); } -const z80pio_interface kayproii_pio_g_intf = -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), - DEVCB_NULL, - DEVCB_DEVICE_MEMBER("cent_data_out", output_latch_device, write), - DEVCB_NULL, /* portA ready active callback */ - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL /* portB ready active callback */ -}; - -const z80pio_interface kayproii_pio_s_intf = -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), - DEVCB_DRIVER_MEMBER(kaypro_state, pio_system_r), /* read printer status */ - DEVCB_DRIVER_MEMBER(kaypro_state, kayproii_pio_system_w), /* activate various internal devices */ - DEVCB_NULL, /* portA ready active callback */ - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL /* portB ready active callback */ -}; - -const z80pio_interface kaypro4_pio_s_intf = -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), - DEVCB_DRIVER_MEMBER(kaypro_state, pio_system_r), /* read printer status */ - DEVCB_DRIVER_MEMBER(kaypro_state, kaypro4_pio_system_w), /* activate various internal devices */ - DEVCB_NULL, /* portA ready active callback */ - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL /* portB ready active callback */ -}; - /*********************************************************** KAYPRO2X SYSTEM PORT @@ -166,7 +133,6 @@ WRITE8_MEMBER( kaypro_state::kaypro2x_system_port_w ) } - /*********************************************************************** SIO diff --git a/src/mess/machine/kramermc.c b/src/mess/machine/kramermc.c index eeab9a5a5d0..9aeb2cfd8e8 100644 --- a/src/mess/machine/kramermc.c +++ b/src/mess/machine/kramermc.c @@ -29,17 +29,6 @@ WRITE8_MEMBER(kramermc_state::kramermc_port_a_w) m_key_row = ((data >> 1) & 0x07); } -Z80PIO_INTERFACE( kramermc_z80pio_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(kramermc_state,kramermc_port_a_r), - DEVCB_DRIVER_MEMBER(kramermc_state,kramermc_port_a_w), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(kramermc_state,kramermc_port_b_r), - DEVCB_NULL, - DEVCB_NULL -}; - /* Driver initialization */ DRIVER_INIT_MEMBER(kramermc_state,kramermc) { diff --git a/src/mess/machine/llc.c b/src/mess/machine/llc.c index 5f8b19e7e7f..8860e79958c 100644 --- a/src/mess/machine/llc.c +++ b/src/mess/machine/llc.c @@ -88,28 +88,6 @@ WRITE8_MEMBER(llc_state::llc1_port1_b_w) } } -Z80PIO_INTERFACE( llc1_z80pio1_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(llc_state, llc1_port1_a_r), - DEVCB_DRIVER_MEMBER(llc_state, llc1_port1_a_w), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(llc_state, llc1_port1_b_w), - DEVCB_NULL -}; - -Z80PIO_INTERFACE( llc1_z80pio2_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(llc_state, llc1_port2_a_r), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(llc_state, llc1_port2_b_r), - DEVCB_NULL, - DEVCB_NULL -}; - DRIVER_INIT_MEMBER(llc_state,llc1) { } @@ -194,29 +172,7 @@ WRITE8_MEMBER(llc_state::llc2_port1_b_w) m_rv = BIT(data, 5); } -Z80PIO_INTERFACE( llc2_z80pio1_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DEVICE_MEMBER(K7659_KEYBOARD_TAG, k7659_keyboard_device, read), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(llc_state, llc2_port1_b_r), - DEVCB_DRIVER_MEMBER(llc_state, llc2_port1_b_w), - DEVCB_NULL -}; - READ8_MEMBER(llc_state::llc2_port2_a_r) { return 0; // bit 2 low or hangs on ^Z^X^C sequence } - -Z80PIO_INTERFACE( llc2_z80pio2_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(llc_state, llc2_port2_a_r), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL -}; diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c index 4154029aa06..37db51cb20b 100644 --- a/src/mess/machine/mbee.c +++ b/src/mess/machine/mbee.c @@ -80,20 +80,9 @@ READ8_MEMBER( mbee_state::pio_port_b_r ) return data; }; -const z80pio_interface mbee_z80pio_intf = -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(mbee_state, pio_port_a_w), - DEVCB_DRIVER_LINE_MEMBER(mbee_state, pio_ardy), - DEVCB_DRIVER_MEMBER(mbee_state, pio_port_b_r), - DEVCB_DRIVER_MEMBER(mbee_state, pio_port_b_w), - DEVCB_NULL -}; - /************************************************************************************* - Floppy DIsk + Floppy Disk The callback is quite simple, no interrupts are used. If either IRQ or DRQ activate, they set bit 7 of inport 0x48. diff --git a/src/mess/machine/mc80.c b/src/mess/machine/mc80.c index f7177838e1a..ea6110ee639 100644 --- a/src/mess/machine/mc80.c +++ b/src/mess/machine/mc80.c @@ -54,17 +54,6 @@ WRITE8_MEMBER( mc80_state::mc80_port_b_w ) { } -Z80PIO_INTERFACE( mc8020_z80pio_intf ) -{ - DEVCB_NULL, /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(mc80_state, mc80_port_a_r), - DEVCB_DRIVER_MEMBER(mc80_state, mc80_port_a_w), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(mc80_state, mc80_port_b_r), - DEVCB_DRIVER_MEMBER(mc80_state, mc80_port_b_w), - DEVCB_NULL -}; - /*****************************************************************************/ /* Implementation for MC80.3x */ /*****************************************************************************/ @@ -124,17 +113,6 @@ WRITE8_MEMBER( mc80_state::zve_port_b_w ) { } -Z80PIO_INTERFACE( mc8030_zve_z80pio_intf ) -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(mc80_state, zve_port_a_r), - DEVCB_DRIVER_MEMBER(mc80_state, zve_port_a_w), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(mc80_state, zve_port_b_r), - DEVCB_DRIVER_MEMBER(mc80_state, zve_port_b_w), - DEVCB_NULL -}; - READ8_MEMBER( mc80_state::asp_port_a_r ) { return 0xff; @@ -153,17 +131,6 @@ WRITE8_MEMBER( mc80_state::asp_port_b_w ) { } -Z80PIO_INTERFACE( mc8030_asp_z80pio_intf ) -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), /* callback when change interrupt status */ - DEVCB_DRIVER_MEMBER(mc80_state, asp_port_a_r), - DEVCB_DRIVER_MEMBER(mc80_state, asp_port_a_w), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(mc80_state, asp_port_b_r), - DEVCB_DRIVER_MEMBER(mc80_state, asp_port_b_w), - DEVCB_NULL -}; - // SIO CH A in = keyboard; out = beeper; CH B = IFSS (??) Z80SIO_INTERFACE( mc8030_asp_z80sio_intf ) { diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c index 2ad240a1dda..910dde5d03f 100644 --- a/src/mess/machine/mz700.c +++ b/src/mess/machine/mz700.c @@ -523,20 +523,6 @@ WRITE8_MEMBER(mz_state::mz800_z80pio_port_a_w) m_centronics->write_strobe(BIT(data, 7)); } -const z80pio_interface mz800_z80pio_config = -{ - DEVCB_DRIVER_LINE_MEMBER(mz_state,mz800_z80pio_irq), - DEVCB_DRIVER_MEMBER(mz_state,mz800_z80pio_port_a_r), - DEVCB_DRIVER_MEMBER(mz_state,mz800_z80pio_port_a_w), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_DEVICE_MEMBER("cent_data_out", output_latch_device, write), - DEVCB_NULL, -}; - - - - /* port CE */ READ8_MEMBER(mz_state::mz800_crtc_r) { diff --git a/src/mess/machine/super80.c b/src/mess/machine/super80.c index 93de4b5832a..4e86f09a1d9 100644 --- a/src/mess/machine/super80.c +++ b/src/mess/machine/super80.c @@ -27,18 +27,6 @@ READ8_MEMBER( super80_state::pio_port_b_r ) return data; }; -Z80PIO_INTERFACE( super80_pio_intf ) -{ - DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0), - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(super80_state, pio_port_a_w), - DEVCB_NULL, /* portA ready active callback (not used in super80) */ - DEVCB_DRIVER_MEMBER(super80_state,pio_port_b_r), - DEVCB_NULL, - DEVCB_NULL /* portB ready active callback (not used in super80) */ -}; - - /**************************** CASSETTE ROUTINES *****************************************************************/ void super80_state::super80_cassette_motor( UINT8 data ) |