diff options
Diffstat (limited to 'src/mame/drivers/bebox.cpp')
-rw-r--r-- | src/mame/drivers/bebox.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index 2e51eada11c..570186d80a8 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -147,42 +147,42 @@ static void pci_devices(device_slot_interface &device) MACHINE_CONFIG_START(bebox_state::bebox) /* basic machine hardware */ - MCFG_CPU_ADD("ppc1", PPC603, 66000000) /* 66 MHz */ - MCFG_CPU_PROGRAM_MAP(bebox_mem) + MCFG_DEVICE_ADD("ppc1", PPC603, 66000000) /* 66 MHz */ + MCFG_DEVICE_PROGRAM_MAP(bebox_mem) - MCFG_CPU_ADD("ppc2", PPC603, 66000000) /* 66 MHz */ - MCFG_CPU_PROGRAM_MAP(bebox_slave_mem) + MCFG_DEVICE_ADD("ppc2", PPC603, 66000000) /* 66 MHz */ + MCFG_DEVICE_PROGRAM_MAP(bebox_slave_mem) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD("pit8254", PIT8254, 0) MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */ - MCFG_PIT8253_OUT0_HANDLER(WRITELINE(bebox_state, bebox_timer0_w)) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, bebox_state, bebox_timer0_w)) MCFG_PIT8253_CLK1(4772720/4) /* dram refresh */ MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */ - MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("kbdc", kbdc8042_device, write_out2)) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE("kbdc", kbdc8042_device, write_out2)) MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 ) - MCFG_I8237_OUT_HREQ_CB(WRITELINE(bebox_state, bebox_dma_hrq_changed)) - MCFG_I8237_OUT_EOP_CB(WRITELINE(bebox_state, bebox_dma8237_out_eop)) - MCFG_I8237_IN_MEMR_CB(READ8(bebox_state, bebox_dma_read_byte)) - MCFG_I8237_OUT_MEMW_CB(WRITE8(bebox_state, bebox_dma_write_byte)) - MCFG_I8237_IN_IOR_2_CB(READ8(bebox_state, bebox_dma8237_fdc_dack_r)) - MCFG_I8237_OUT_IOW_2_CB(WRITE8(bebox_state, bebox_dma8237_fdc_dack_w)) - MCFG_I8237_OUT_DACK_0_CB(WRITELINE(bebox_state, pc_dack0_w)) - MCFG_I8237_OUT_DACK_1_CB(WRITELINE(bebox_state, pc_dack1_w)) - MCFG_I8237_OUT_DACK_2_CB(WRITELINE(bebox_state, pc_dack2_w)) - MCFG_I8237_OUT_DACK_3_CB(WRITELINE(bebox_state, pc_dack3_w)) + MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, bebox_state, bebox_dma_hrq_changed)) + MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, bebox_state, bebox_dma8237_out_eop)) + MCFG_I8237_IN_MEMR_CB(READ8(*this, bebox_state, bebox_dma_read_byte)) + MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, bebox_state, bebox_dma_write_byte)) + MCFG_I8237_IN_IOR_2_CB(READ8(*this, bebox_state, bebox_dma8237_fdc_dack_r)) + MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, bebox_state, bebox_dma8237_fdc_dack_w)) + MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, bebox_state, pc_dack0_w)) + MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, bebox_state, pc_dack1_w)) + MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, bebox_state, pc_dack2_w)) + MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, bebox_state, pc_dack3_w)) MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 ) MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(WRITELINE(bebox_state, bebox_pic8259_master_set_int_line)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, bebox_state, bebox_pic8259_master_set_int_line)) MCFG_PIC8259_IN_SP_CB(VCC) - MCFG_PIC8259_CASCADE_ACK_CB(READ8(bebox_state, get_slave_ack)) + MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, bebox_state, get_slave_ack)) MCFG_DEVICE_ADD("pic8259_2", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(WRITELINE(bebox_state, bebox_pic8259_slave_set_int_line)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, bebox_state, bebox_pic8259_slave_set_int_line)) MCFG_PIC8259_IN_SP_CB(GND) MCFG_DEVICE_ADD( "ns16550_0", NS16550, 0 ) /* TODO: Verify model */ @@ -199,7 +199,7 @@ MACHINE_CONFIG_START(bebox_state::bebox) MCFG_VIDEO_SET_SCREEN("screen") MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ym3812", YM3812, 3579545) + MCFG_DEVICE_ADD("ym3812", YM3812, 3579545) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_FUJITSU_29F016A_ADD("flash") @@ -215,7 +215,7 @@ MACHINE_CONFIG_START(bebox_state::bebox) MCFG_LEGACY_SCSI_PORT("scsi") MCFG_IDE_CONTROLLER_ADD( "ide", ata_devices, "hdd", nullptr, false ) /* FIXME */ - MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(bebox_state, bebox_ide_interrupt)) + MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, bebox_state, bebox_ide_interrupt)) /* pci */ MCFG_PCI_BUS_ADD("pcibus", 0) @@ -227,8 +227,8 @@ MACHINE_CONFIG_START(bebox_state::bebox) /*MCFG_PCI_BUS_DEVICE(12, nullptr, scsi53c810_pci_read, scsi53c810_pci_write)*/ MCFG_SMC37C78_ADD("smc37c78") - MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(bebox_state, fdc_interrupt)) - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w)) + MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, bebox_state, fdc_interrupt)) + MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma8237_1", am9517a_device, dreq2_w)) MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", bebox_state::floppy_formats) MCFG_MC146818_ADD( "rtc", XTAL(32'768) ) @@ -236,7 +236,7 @@ MACHINE_CONFIG_START(bebox_state::bebox) MCFG_DEVICE_ADD("kbdc", KBDC8042, 0) MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_STANDARD) MCFG_KBDC8042_SYSTEM_RESET_CB(INPUTLINE("ppc1", INPUT_LINE_RESET)) - MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(bebox_state, bebox_keyboard_interrupt)) + MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(*this, bebox_state, bebox_keyboard_interrupt)) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -246,11 +246,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(bebox_state::bebox2) bebox(config); - MCFG_CPU_REPLACE("ppc1", PPC603E, 133000000) /* 133 MHz */ - MCFG_CPU_PROGRAM_MAP(bebox_mem) + MCFG_DEVICE_REPLACE("ppc1", PPC603E, 133000000) /* 133 MHz */ + MCFG_DEVICE_PROGRAM_MAP(bebox_mem) - MCFG_CPU_REPLACE("ppc2", PPC603E, 133000000) /* 133 MHz */ - MCFG_CPU_PROGRAM_MAP(bebox_slave_mem) + MCFG_DEVICE_REPLACE("ppc2", PPC603E, 133000000) /* 133 MHz */ + MCFG_DEVICE_PROGRAM_MAP(bebox_slave_mem) MACHINE_CONFIG_END static INPUT_PORTS_START( bebox ) |