diff options
Diffstat (limited to 'src/mame/drivers/rastersp.cpp')
-rw-r--r-- | src/mame/drivers/rastersp.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 7d9337a9b26..b05f4925c70 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -144,7 +144,7 @@ public: void update_irq(uint32_t which, uint32_t state); void upload_palette(uint32_t word1, uint32_t word2); IRQ_CALLBACK_MEMBER(irq_callback); - static void ncr53c700(device_t *device); + void ncr53c700(device_t *device); void rastersp(machine_config &config); void cpu_map(address_map &map); void dsp_map(address_map &map); @@ -843,9 +843,9 @@ void rastersp_state::ncr53c700(device_t *device) devcb_base *devcb; (void)devcb; MCFG_DEVICE_CLOCK(66000000) - MCFG_NCR53C7XX_IRQ_HANDLER(DEVWRITELINE(":", rastersp_state, scsi_irq)) - MCFG_NCR53C7XX_HOST_READ(DEVREAD32(":", rastersp_state, ncr53c700_read)) - MCFG_NCR53C7XX_HOST_WRITE(DEVWRITE32(":", rastersp_state, ncr53c700_write)) + MCFG_NCR53C7XX_IRQ_HANDLER(WRITELINE(*this, rastersp_state, scsi_irq)) + MCFG_NCR53C7XX_HOST_READ(READ32(*this, rastersp_state, ncr53c700_read)) + MCFG_NCR53C7XX_HOST_WRITE(WRITE32(*this, rastersp_state, ncr53c700_write)) } static void rastersp_scsi_devices(device_slot_interface &device) @@ -862,13 +862,13 @@ static void rastersp_scsi_devices(device_slot_interface &device) *************************************/ MACHINE_CONFIG_START(rastersp_state::rastersp) - MCFG_CPU_ADD("maincpu", I486, 33330000) - MCFG_CPU_PROGRAM_MAP(cpu_map) - MCFG_CPU_IO_MAP(io_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(rastersp_state,irq_callback) + MCFG_DEVICE_ADD("maincpu", I486, 33330000) + MCFG_DEVICE_PROGRAM_MAP(cpu_map) + MCFG_DEVICE_IO_MAP(io_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(rastersp_state,irq_callback) - MCFG_CPU_ADD("dsp", TMS32031, 33330000) - MCFG_CPU_PROGRAM_MAP(dsp_map) + MCFG_DEVICE_ADD("dsp", TMS32031, 33330000) + MCFG_DEVICE_PROGRAM_MAP(dsp_map) MCFG_TMS3203X_MCBL(true) // Boot-loader mode /* Devices */ @@ -880,7 +880,7 @@ MACHINE_CONFIG_START(rastersp_state::rastersp) MCFG_NSCSI_BUS_ADD("scsibus") MCFG_NSCSI_ADD("scsibus:0", rastersp_scsi_devices, "harddisk", true) MCFG_NSCSI_ADD("scsibus:7", rastersp_scsi_devices, "ncr53c700", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr53c700", ncr53c700) + MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr53c700", [this] (device_t *device) { ncr53c700(device); }) /* Video */ MCFG_SCREEN_ADD("screen", RASTER) @@ -890,15 +890,15 @@ MACHINE_CONFIG_START(rastersp_state::rastersp) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_PALETTE("palette") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rastersp_state, vblank_irq)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rastersp_state, vblank_irq)) MCFG_PALETTE_ADD_RRRRRGGGGGGBBBBB("palette") /* Sound */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC - MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC + MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC + MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT) MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT) |