diff options
Diffstat (limited to 'src/mame/drivers/excali64.cpp')
-rw-r--r-- | src/mame/drivers/excali64.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index d966475ec46..869854b2ec8 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -551,32 +551,32 @@ MC6845_UPDATE_ROW( excali64_state::update_row ) MACHINE_CONFIG_START(excali64_state::excali64) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4) - MCFG_CPU_PROGRAM_MAP(mem_map) - MCFG_CPU_IO_MAP(io_map) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_PROGRAM_MAP(mem_map) + MCFG_DEVICE_IO_MAP(io_map) MCFG_MACHINE_RESET_OVERRIDE(excali64_state, excali64) MCFG_DEVICE_ADD("uart", I8251, 0) - //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) + //MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd)) + //MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts)) MCFG_DEVICE_ADD("pit", PIT8253, 0) MCFG_PIT8253_CLK0(XTAL(16'000'000) / 16) /* Timer 0: tone gen for speaker */ - MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w)) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w)) //MCFG_PIT8253_CLK1(XTAL(16'000'000) / 16) /* Timer 1: baud rate gen for 8251 */ - //MCFG_PIT8253_OUT1_HANDLER(WRITELINE(excali64_state, write_uart_clock)) + //MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, excali64_state, write_uart_clock)) //MCFG_PIT8253_CLK2(XTAL(16'000'000) / 16) /* Timer 2: not used */ MCFG_DEVICE_ADD("ppi", I8255A, 0 ) - MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) // parallel port - MCFG_I8255_OUT_PORTB_CB(WRITE8(excali64_state, ppib_w)) - MCFG_I8255_IN_PORTC_CB(READ8(excali64_state, ppic_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(excali64_state, ppic_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) // parallel port + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, excali64_state, ppib_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, excali64_state, ppic_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, excali64_state, ppic_w)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05) @@ -595,25 +595,25 @@ MACHINE_CONFIG_START(excali64_state::excali64) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(excali64_state, update_row) - MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(excali64_state, crtc_hs)) - MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(excali64_state, crtc_vs)) + MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, excali64_state, crtc_hs)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, excali64_state, crtc_vs)) /* Devices */ MCFG_CASSETTE_ADD( "cassette" ) MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", excali64_floppies, "525qd", excali64_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", excali64_floppies, "525qd", excali64_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000)/4) - MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(excali64_state, busreq_w)) - MCFG_Z80DMA_IN_MREQ_CB(READ8(excali64_state, memory_read_byte)) - MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(excali64_state, memory_write_byte)) - MCFG_Z80DMA_IN_IORQ_CB(READ8(excali64_state, io_read_byte)) - MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(excali64_state, io_write_byte)) + MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, excali64_state, busreq_w)) + MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, excali64_state, memory_read_byte)) + MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, excali64_state, memory_write_byte)) + MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, excali64_state, io_read_byte)) + MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, excali64_state, io_write_byte)) MCFG_DEVICE_ADD("u12", TTL74123, 0) MCFG_TTL74123_CONNECTION_TYPE(TTL74123_GROUNDED) /* Hook up type (no idea what this means) */ @@ -622,10 +622,10 @@ MACHINE_CONFIG_START(excali64_state::excali64) MCFG_TTL74123_A_PIN_VALUE(0) /* A pin - grounded */ MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - driven by port e4 bit 5 */ MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */ - MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(excali64_state, motor_w)) + MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, excali64_state, motor_w)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(excali64_state, cent_busy_w)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, excali64_state, cent_busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END |