diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c index e68ab5cf879..fd5a83c74d8 100644 --- a/src/mame/drivers/blitz.c +++ b/src/mame/drivers/blitz.c @@ -481,8 +481,8 @@ static ADDRESS_MAP_START( megadpkr_map, AS_PROGRAM, 8, blitz_state ) // ADDRESS_MAP_GLOBAL_MASK(0x7fff) // seems that hardware is playing with A14 & A15 CPU lines... AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_SHARE("nvram") /* battery backed RAM */ -// AM_RANGE(0x0800, 0x0800) AM_DEVWRITE_LEGACY("crtc", mc6845_address_w) -// AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE_LEGACY("crtc", mc6845_register_r, mc6845_register_w) +// AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_device, address_w) +// AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_device, read, write) AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE("pia1", pia6821_device, read, write) diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index c677bf3fb44..4dad6b59af7 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -189,8 +189,8 @@ READ8_MEMBER(jubilee_state::unk_r) static ADDRESS_MAP_START( jubileep_cru_map, AS_IO, 8, jubilee_state ) // AM_RANGE(0x0000, 0xffff) AM_READ(unk_r) -// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE_LEGACY("crtc", mc6845_status_r, mc6845_address_w) -// AM_RANGE(0x01, 0x01) AM_DEVREADWRITE_LEGACY("crtc", mc6845_register_r, mc6845_register_w) +// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w) +// AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) AM_RANGE(0xc8, 0xc8) AM_READ(unk_r) ADDRESS_MAP_END diff --git a/src/mess/drivers/ccs2810.c b/src/mess/drivers/ccs2810.c index d6dd97a205f..c9ff393c591 100644 --- a/src/mess/drivers/ccs2810.c +++ b/src/mess/drivers/ccs2810.c @@ -96,7 +96,7 @@ static ADDRESS_MAP_START(ccs2810_io, AS_IO, 8, ccs2810_state) AM_RANGE(0x20, 0x20) AM_READWRITE(ccs2810_20_r,ccs2810_20_w) AM_RANGE(0x25, 0x25) AM_READ(ccs2810_25_r) AM_RANGE(0x26, 0x26) AM_READ(ccs2810_26_r) - //AM_RANGE(0x20, 0x27) AM_DEVREADWRITE_LEGACY("ins8250", ins8250_r, ins8250_w ) + //AM_RANGE(0x20, 0x27) AM_DEVREADWRITE("ins8250", ins8250_device, ins8250_r, ins8250_w ) ADDRESS_MAP_END /* Input ports */ diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c index f6ada95ad29..7881e670b39 100644 --- a/src/mess/drivers/compis.c +++ b/src/mess/drivers/compis.c @@ -132,7 +132,7 @@ static ADDRESS_MAP_START( compis_io, AS_IO, 16, compis_state ) AM_RANGE( 0x0080, 0x0087) AM_DEVREADWRITE8("pit8253", pit8253_device, read, write, 0xffff) AM_RANGE( 0x0100, 0x011b) AM_DEVREADWRITE8("mm58274c", mm58274c_device, read, write, 0xffff) AM_RANGE( 0x0280, 0x0283) AM_DEVREADWRITE8("pic8259_master", pic8259_device, read, write, 0x00ff) /* 80150/80130 */ - //AM_RANGE( 0x0288, 0x028f) AM_DEVREADWRITE_LEGACY("pit8254", compis_osp_pit_r, compis_osp_pit_w ) /* PIT 8254 (80150/80130) */ + //AM_RANGE( 0x0288, 0x028f) AM_READWRITE( compis_osp_pit_r, compis_osp_pit_w ) /* PIT 8254 (80150/80130) */ AM_RANGE( 0x0310, 0x031f) AM_READWRITE8( compis_usart_r, compis_usart_w, 0xff00) /* USART 8251 Keyboard */ AM_RANGE( 0x0330, 0x0333) AM_DEVREADWRITE8("upd7220", upd7220_device, read, write, 0x00ff) /* GDC 82720 PCS6:6 */ AM_RANGE( 0x0340, 0x0343) AM_DEVICE8("i8272a", i8272a_device, map, 0x00ff) /* iSBX0 (J8) FDC 8272 */ diff --git a/src/mess/drivers/mc1000.c b/src/mess/drivers/mc1000.c index 3720f09d894..fd9972853d6 100644 --- a/src/mess/drivers/mc1000.c +++ b/src/mess/drivers/mc1000.c @@ -135,8 +135,8 @@ static ADDRESS_MAP_START( mc1000_io, AS_IO, 8, mc1000_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x04, 0x04) AM_READWRITE(printer_r, printer_w) AM_RANGE(0x05, 0x05) AM_DEVWRITE(CENTRONICS_TAG, centronics_device, write) -// AM_RANGE(0x10, 0x10) AM_DEVWRITE_LEGACY(MC6845_TAG, mc6845_address_w) -// AM_RANGE(0x11, 0x11) AM_DEVREADWRITE_LEGACY(MC6845_TAG, mc6845_register_r, mc6845_register_w) +// AM_RANGE(0x10, 0x10) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w) +// AM_RANGE(0x11, 0x11) AM_DEVREADWRITE(MC6845_TAG, mc6845_device, register_r, register_w) AM_RANGE(0x12, 0x12) AM_WRITE(mc6845_ctrl_w) AM_RANGE(0x20, 0x20) AM_DEVWRITE(AY8910_TAG, ay8910_device, address_w) AM_RANGE(0x40, 0x40) AM_DEVREAD(AY8910_TAG, ay8910_device, data_r) diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c index 30f4daeb2e4..8ee63b95571 100644 --- a/src/mess/drivers/mtx.c +++ b/src/mess/drivers/mtx.c @@ -69,8 +69,8 @@ static ADDRESS_MAP_START( mtx_io, AS_IO, 8, mtx_state ) AM_RANGE(0x30, 0x31) AM_WRITE(hrx_address_w) AM_RANGE(0x32, 0x32) AM_READWRITE(hrx_data_r, hrx_data_w) AM_RANGE(0x33, 0x33) AM_READWRITE(hrx_attr_r, hrx_attr_w) -// AM_RANGE(0x38, 0x38) AM_DEVWRITE_LEGACY(MC6845_TAG, mc6845_address_w) -// AM_RANGE(0x39, 0x39) AM_DEVWRITE_LEGACY(MC6845_TAG, mc6845_register_r, mc6845_register_w) +// AM_RANGE(0x38, 0x38) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w) +// AM_RANGE(0x39, 0x39) AM_DEVWRITE(MC6845_TAG, mc6845_device, register_r, register_w) /* AM_RANGE(0x40, 0x43) AM_DEVREADWRITE_LEGACY(FD1791_TAG, wd17xx_r, wd17xx_w) AM_RANGE(0x44, 0x44) AM_READWRITE(fdx_status_r, fdx_control_w) AM_RANGE(0x45, 0x45) AM_WRITE(fdx_drv_sel_w) diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 6ccfe70df8e..80a01ad4dcc 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -249,12 +249,12 @@ static ADDRESS_MAP_START(ec1841_io, AS_IO, 16, pc_state) // AM_RANGE(0x0230, 0x021f) // mouse AM_RANGE(0x0240, 0x0257) AM_READWRITE8(pc_rtc_r, pc_rtc_w, 0xffff) AM_RANGE(0x02b0, 0x02b3) AM_READWRITE8(ec1841_memboard_r, ec1841_memboard_w, 0xffff); -// AM_RANGE(0x02f8, 0x02f8) AM_DEVREADWRITE8_LEGACY("upd8251_1", i8251_device, data_r, data_w, 0x00ff) -// AM_RANGE(0x02f9, 0x02f9) AM_DEVREADWRITE8_LEGACY("upd8251_1", i8251_device, status_r, control_w, 0xff00) +// AM_RANGE(0x02f8, 0x02f8) AM_DEVREADWRITE8("upd8251_1", i8251_device, data_r, data_w, 0x00ff) +// AM_RANGE(0x02f9, 0x02f9) AM_DEVREADWRITE8("upd8251_1", i8251_device, status_r, control_w, 0xff00) AM_RANGE(0x0378, 0x037f) AM_DEVREADWRITE8_LEGACY("lpt_0", pc_lpt_r, pc_lpt_w, 0xffff) AM_RANGE(0x03f0, 0x03f7) AM_DEVICE8("fdc", pc_fdc_interface, map, 0xffff) -// AM_RANGE(0x03f8, 0x03f9) AM_DEVREADWRITE8_LEGACY("upd8251_0", i8251_device, data_r, data_w, 0x00ff) -// AM_RANGE(0x03f8, 0x03f9) AM_DEVREADWRITE8_LEGACY("upd8251_0", i8251_device, status_r, control_w, 0xff00) +// AM_RANGE(0x03f8, 0x03f9) AM_DEVREADWRITE8("upd8251_0", i8251_device, data_r, data_w, 0x00ff) +// AM_RANGE(0x03f8, 0x03f9) AM_DEVREADWRITE8("upd8251_0", i8251_device, status_r, control_w, 0xff00) ADDRESS_MAP_END diff --git a/src/mess/drivers/pc8001.c b/src/mess/drivers/pc8001.c index d7a5f205e96..a3117bd381a 100644 --- a/src/mess/drivers/pc8001.c +++ b/src/mess/drivers/pc8001.c @@ -185,13 +185,13 @@ static ADDRESS_MAP_START( pc8001_io, AS_IO, 8, pc8001_state ) // AM_RANGE(0xb1, 0xb1) AM_WRITE(pc8011_gpio8_w) // AM_RANGE(0xb2, 0xb2) AM_READ(pc8011_gpio4_r) // AM_RANGE(0xb3, 0xb3) AM_WRITE(pc8011_gpio4_w) -// AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE_LEGACY(PC8011_CH1_I8251_TAG, i8251_device, data_r, data_w) -// AM_RANGE(0xc1, 0xc1) AM_DEVREADWRITE_LEGACY(PC8011_CH1_I8251_TAG, i8251_device, status_r, control_w) -// AM_RANGE(0xc2, 0xc2) AM_DEVREADWRITE_LEGACY(PC8011_CH2_I8251_TAG, i8251_device, data_r, data_w) -// AM_RANGE(0xc3, 0xc3) AM_DEVREADWRITE_LEGACY(PC8011_CH2_I8251_TAG, i8251_device, status_r, control_w) +// AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE(PC8011_CH1_I8251_TAG, i8251_device, data_r, data_w) +// AM_RANGE(0xc1, 0xc1) AM_DEVREADWRITE(PC8011_CH1_I8251_TAG, i8251_device, status_r, control_w) +// AM_RANGE(0xc2, 0xc2) AM_DEVREADWRITE(PC8011_CH2_I8251_TAG, i8251_device, data_r, data_w) +// AM_RANGE(0xc3, 0xc3) AM_DEVREADWRITE(PC8011_CH2_I8251_TAG, i8251_device, status_r, control_w) // AM_RANGE(0xc8, 0xc8) RS-232 output enable? // AM_RANGE(0xca, 0xca) RS-232 output disable? -// AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE_LEGACY(PC8011_IEEE488_I8255A_TAG, i8255a_r, i8255a_w) +// AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE(PC8011_IEEE488_I8255A_TAG, i8255_device, read, write) // AM_RANGE(0xd8, 0xd8) AM_READ(pc8011_ieee488_control_signal_input_r) // AM_RANGE(0xda, 0xda) AM_READ(pc8011_ieee488_bus_address_mode_r) // AM_RANGE(0xdc, 0xdc) AM_WRITE(pc8011_ieee488_nrfd_w) diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index 4cfc99ca65e..cc3dc640b0b 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -533,7 +533,7 @@ static ADDRESS_MAP_START( portfolio_io, AS_IO, 8, portfolio_state ) AM_RANGE(0x8050, 0x8050) AM_READWRITE(irq_status_r, irq_mask_w) AM_RANGE(0x8051, 0x8051) AM_READWRITE(battery_r, unknown_w) AM_RANGE(0x8060, 0x8060) AM_RAM AM_SHARE("contrast") -// AM_RANGE(0x8070, 0x8077) AM_DEVREADWRITE_LEGACY(M82C50A_TAG, ins8250_r, ins8250_w) // Serial Interface +// AM_RANGE(0x8070, 0x8077) AM_DEVREADWRITE(M82C50A_TAG, ins8250_device, ins8250_r, ins8250_w) // Serial Interface // AM_RANGE(0x8078, 0x807b) AM_DEVREADWRITE(M82C55A_TAG, i8255_device, read, write) // Parallel Interface AM_RANGE(0x807c, 0x807c) AM_WRITE(ncc1_w) AM_RANGE(0x807f, 0x807f) AM_READWRITE(pid_r, sivr_w)