summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/gimix.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/gimix.cpp')
-rw-r--r--src/mame/drivers/gimix.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index d1f1cfb45a2..6ce506eb6ed 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -548,71 +548,71 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
MACHINE_CONFIG_START(gimix_state::gimix)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(gimix_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gimix_mem)
/* rtc */
MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(WRITELINE(gimix_state,irq_w))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, gimix_state,irq_w))
/* timer */
MCFG_DEVICE_ADD("timer", PTM6840, XTAL(2'000'000)) // clock is a guess
- MCFG_PTM6840_IRQ_CB(WRITELINE(gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable)
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable)
/* floppy disks */
MCFG_FD1797_ADD("fdc",XTAL(8'000'000) / 4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(gimix_state,fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(gimix_state,fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, gimix_state,fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, gimix_state,fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", gimix_floppies, "525hd", gimix_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", gimix_floppies, "525hd", gimix_state::floppy_formats)
/* parallel ports */
MCFG_DEVICE_ADD("pia1",PIA6821,XTAL(2'000'000))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(gimix_state,pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(gimix_state,pia_pb_w))
- MCFG_PIA_READPA_HANDLER(READ8(gimix_state,pia_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(gimix_state,pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, gimix_state,pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, gimix_state,pia_pb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, gimix_state,pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, gimix_state,pia_pb_r))
MCFG_DEVICE_ADD("pia2",PIA6821,XTAL(2'000'000))
/* serial ports */
MCFG_DEVICE_ADD("acia1",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial1",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial1",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial1",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial1",rs232_port_device,write_rts))
MCFG_DEVICE_ADD("acia2",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial2",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial2",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial2",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial2",rs232_port_device,write_rts))
MCFG_DEVICE_ADD("acia3",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial3",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial3",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial3",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial3",rs232_port_device,write_rts))
MCFG_DEVICE_ADD("acia4",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial4",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial4",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial4",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial4",rs232_port_device,write_rts))
- MCFG_RS232_PORT_ADD("serial1",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia1",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia1",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial1",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia1",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia1",acia6850_device,write_cts))
- MCFG_RS232_PORT_ADD("serial2",default_rs232_devices,"terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia2",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia2",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial2",RS232_PORT, default_rs232_devices,"terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia2",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia2",acia6850_device,write_cts))
- MCFG_RS232_PORT_ADD("serial3",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia3",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia3",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial3",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia3",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia3",acia6850_device,write_cts))
- MCFG_RS232_PORT_ADD("serial4",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia4",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia4",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial4",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia4",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia4",acia6850_device,write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_rxc))
/* banking */
MCFG_ADDRESS_BANK("bank1")