diff options
Diffstat (limited to 'src/mame/drivers/s3.c')
-rw-r--r-- | src/mame/drivers/s3.c | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c index 64f28f16f0f..c1c30a73b9f 100644 --- a/src/mame/drivers/s3.c +++ b/src/mame/drivers/s3.c @@ -323,18 +323,18 @@ WRITE8_MEMBER( s3_state::sol1_w ) static const pia6821_interface pia22_intf = { - DEVCB_NULL, /* port A in */ - DEVCB_NULL, /* port B in */ - DEVCB_LINE_GND, /* line CA1 in */ - DEVCB_LINE_GND, /* line CB1 in */ - DEVCB_NULL, /* line CA2 in */ - DEVCB_NULL, /* line CB2 in */ - DEVCB_DRIVER_MEMBER(s3_state, sol0_w), /* port A out */ - DEVCB_DRIVER_MEMBER(s3_state, sol1_w), /* port B out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia22_ca2_w), /* line CA2 out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia22_cb2_w), /* line CB2 out */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ + DEVCB_NULL, /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_LINE_GND, /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s3_state, sol0_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s3_state, sol1_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia22_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia22_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ }; WRITE8_MEMBER( s3_state::lamp0_w ) @@ -348,18 +348,18 @@ WRITE8_MEMBER( s3_state::lamp1_w ) static const pia6821_interface pia24_intf = { - DEVCB_NULL, /* port A in */ - DEVCB_NULL, /* port B in */ - DEVCB_LINE_GND, /* line CA1 in */ - DEVCB_LINE_GND, /* line CB1 in */ - DEVCB_NULL, /* line CA2 in */ - DEVCB_NULL, /* line CB2 in */ - DEVCB_DRIVER_MEMBER(s3_state, lamp0_w), /* port A out */ - DEVCB_DRIVER_MEMBER(s3_state, lamp1_w), /* port B out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia24_ca2_w), /* line CA2 out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia24_cb2_w), /* line CB2 out */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ + DEVCB_NULL, /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_LINE_GND, /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s3_state, lamp0_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s3_state, lamp1_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia24_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia24_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ }; READ_LINE_MEMBER( s3_state::pia28_ca1_r ) @@ -412,18 +412,18 @@ WRITE8_MEMBER( s3_state::dig1_w ) static const pia6821_interface pia28_intf = { - DEVCB_DRIVER_MEMBER(s3_state, dips_r), /* port A in */ - DEVCB_NULL, /* port B in */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_ca1_r), /* line CA1 in */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_cb1_r), /* line CB1 in */ - DEVCB_NULL, /* line CA2 in */ - DEVCB_NULL, /* line CB2 in */ - DEVCB_DRIVER_MEMBER(s3_state, dig0_w), /* port A out */ - DEVCB_DRIVER_MEMBER(s3_state, dig1_w), /* port B out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_ca2_w), /* line CA2 out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_cb2_w), /* line CB2 out */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ + DEVCB_DRIVER_MEMBER(s3_state, dips_r), /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_ca1_r), /* line CA1 in */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_cb1_r), /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s3_state, dig0_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s3_state, dig1_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ }; READ8_MEMBER( s3_state::switch_r ) @@ -440,18 +440,18 @@ WRITE8_MEMBER( s3_state::switch_w ) static const pia6821_interface pia30_intf = { - DEVCB_DRIVER_MEMBER(s3_state, switch_r), /* port A in */ - DEVCB_NULL, /* port B in */ - DEVCB_LINE_GND, /* line CA1 in */ - DEVCB_LINE_GND, /* line CB1 in */ - DEVCB_NULL, /* line CA2 in */ - DEVCB_NULL, /* line CB2 in */ - DEVCB_NULL, /* port A out */ - DEVCB_DRIVER_MEMBER(s3_state, switch_w), /* port B out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia30_ca2_w), /* line CA2 out */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pia30_cb2_w), /* line CB2 out */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ - DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ + DEVCB_DRIVER_MEMBER(s3_state, switch_r), /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_LINE_GND, /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_NULL, /* port A out */ + DEVCB_DRIVER_MEMBER(s3_state, switch_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia30_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pia30_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ }; READ_LINE_MEMBER( s3_state::pias_cb1_r ) @@ -471,18 +471,18 @@ WRITE8_MEMBER( s3_state::dac_w ) static const pia6821_interface pias_intf = { - DEVCB_NULL, /* port A in */ - DEVCB_DRIVER_MEMBER(s3_state, dac_r), /* port B in */ - DEVCB_NULL, /* line CA1 in */ - DEVCB_DRIVER_LINE_MEMBER(s3_state, pias_cb1_r), /* line CB1 in */ - DEVCB_NULL, /* line CA2 in */ - DEVCB_NULL, /* line CB2 in */ - DEVCB_DRIVER_MEMBER(s3_state, dac_w), /* port A out */ - DEVCB_NULL, /* port B out */ - DEVCB_NULL, /* line CA2 out */ - DEVCB_NULL, /* line CB2 out */ - DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */ - DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */ + DEVCB_NULL, /* port A in */ + DEVCB_DRIVER_MEMBER(s3_state, dac_r), /* port B in */ + DEVCB_NULL, /* line CA1 in */ + DEVCB_DRIVER_LINE_MEMBER(s3_state, pias_cb1_r), /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s3_state, dac_w), /* port A out */ + DEVCB_NULL, /* port B out */ + DEVCB_NULL, /* line CA2 out */ + DEVCB_NULL, /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */ }; TIMER_DEVICE_CALLBACK_MEMBER( s3_state::irq) |