diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h index fd639f745e8..f1ce94f2ded 100644 --- a/src/emu/addrmap.h +++ b/src/emu/addrmap.h @@ -598,48 +598,6 @@ void _class :: _name(address_map &map, const device_t &device) \ curentry->set_handler(device, _tag, _rhandler, #_rhandler, _whandler, #_whandler, _unitmask); \ -// driver data base reads -#define AM_READ_BASE(_class, _handler) \ - curentry->set_handler(device, DEVICE_SELF, read_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0)); \ - -#define AM_READ8_BASE(_class, _handler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, read8_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0), _unitmask); \ - -#define AM_READ16_BASE(_class, _handler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, read16_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0), _unitmask); \ - -#define AM_READ32_BASE(_class, _handler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, read32_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0), _unitmask); \ - - -// driver data base writes -#define AM_WRITE_BASE(_class, _handler) \ - curentry->set_handler(device, DEVICE_SELF, write_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0)); \ - -#define AM_WRITE8_BASE(_class, _handler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, write8_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0), _unitmask); \ - -#define AM_WRITE16_BASE(_class, _handler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, write16_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0), _unitmask); \ - -#define AM_WRITE32_BASE(_class, _handler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, write32_delegate(&_class::_handler, "driver_data::" #_handler, (_class *)0), _unitmask); \ - - -// driver data base reads/writes -#define AM_READWRITE_BASE(_class, _rhandler, _whandler) \ - curentry->set_handler(device, DEVICE_SELF, read_delegate(&_class::_rhandler, "driver_data::" #_rhandler, (_class *)0), write_delegate(&_class::_whandler, "driver_data::" #_whandler, (_class *)0)); \ - -#define AM_READWRITE8_BASE(_class, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, read8_delegate(&_class::_rhandler, "driver_data::" #_rhandler, (_class *)0), write8_delegate(&_class::_whandler, "driver_data::" #_whandler, (_class *)0), _unitmask); \ - -#define AM_READWRITE16_BASE(_class, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, read16_delegate(&_class::_rhandler, "driver_data::" #_rhandler, (_class *)0), write16_delegate(&_class::_whandler, "driver_data::" #_whandler, (_class *)0), _unitmask); \ - -#define AM_READWRITE32_BASE(_class, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, DEVICE_SELF, read32_delegate(&_class::_rhandler, "driver_data::" #_rhandler, (_class *)0), write32_delegate(&_class::_whandler, "driver_data::" #_whandler, (_class *)0), _unitmask); \ - - // driver data reads #define AM_READ(_handler) \ curentry->set_handler(device, DEVICE_SELF, read_delegate(&drivdata_class::_handler, "driver_data::" #_handler, (drivdata_class *)0)); \ diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index fd515ddd441..a39affe7507 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -252,7 +252,7 @@ static ADDRESS_MAP_START( draco_io_map, AS_IO, 8, draco_state ) AM_RANGE(0x01, 0x01) AM_DEVREAD("ic29", cdp1852_device, read) AM_DEVWRITE("ic32", cdp1852_device, write) AM_RANGE(0x02, 0x02) AM_DEVREAD("ic30", cdp1852_device, read) AM_RANGE(0x04, 0x04) AM_DEVREAD("ic31", cdp1852_device, read) - AM_RANGE(0x03, 0x07) AM_WRITE_BASE(cidelsa_state, cdp1869_w) + AM_RANGE(0x03, 0x07) AM_WRITE(cdp1869_w) ADDRESS_MAP_END static ADDRESS_MAP_START( draco_sound_map, AS_PROGRAM, 8, draco_state ) diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c index fb7a87dd123..beae6986d47 100644 --- a/src/mame/drivers/liberatr.c +++ b/src/mame/drivers/liberatr.c @@ -217,20 +217,20 @@ static ADDRESS_MAP_START( liberatr_map, AS_PROGRAM, 8, liberatr_state ) AM_RANGE(0x0001, 0x0001) AM_RAM AM_SHARE("ycoord") AM_RANGE(0x0002, 0x0002) AM_READWRITE(bitmap_xy_r, bitmap_xy_w) AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(bitmap_w) AM_SHARE("bitmapram") /* overlapping for my convenience */ - AM_RANGE(0x4000, 0x403f) AM_READ_BASE(atarigen_state, earom_r) + AM_RANGE(0x4000, 0x403f) AM_READ(earom_r) AM_RANGE(0x5000, 0x5000) AM_READ(port0_r) AM_RANGE(0x5001, 0x5001) AM_READ_PORT("IN1") AM_RANGE(0x6000, 0x600f) AM_WRITEONLY AM_SHARE("base_ram") AM_RANGE(0x6200, 0x621f) AM_WRITEONLY AM_SHARE("colorram") AM_RANGE(0x6400, 0x6400) AM_WRITENOP - AM_RANGE(0x6600, 0x6600) AM_WRITE_BASE(atarigen_state, earom_control_w) + AM_RANGE(0x6600, 0x6600) AM_WRITE(earom_control_w) AM_RANGE(0x6800, 0x6800) AM_WRITEONLY AM_SHARE("planet_frame") AM_RANGE(0x6a00, 0x6a00) AM_WRITE_LEGACY(watchdog_reset_w) AM_RANGE(0x6c00, 0x6c01) AM_WRITE(led_w) AM_RANGE(0x6c04, 0x6c04) AM_WRITE(trackball_reset_w) AM_RANGE(0x6c05, 0x6c06) AM_WRITE(coin_counter_w) AM_RANGE(0x6c07, 0x6c07) AM_WRITEONLY AM_SHARE("planet_select") - AM_RANGE(0x6e00, 0x6e3f) AM_WRITE_BASE(atarigen_state, earom_w) + AM_RANGE(0x6e00, 0x6e3f) AM_WRITE(earom_w) AM_RANGE(0x7000, 0x701f) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w) AM_RANGE(0x7800, 0x781f) AM_DEVREADWRITE_LEGACY("pokey1", pokey_r, pokey_w) AM_RANGE(0x8000, 0xefff) AM_ROM @@ -255,15 +255,15 @@ static ADDRESS_MAP_START( liberat2_map, AS_PROGRAM, 8, liberatr_state ) AM_RANGE(0x4000, 0x400f) AM_WRITEONLY AM_SHARE("base_ram") AM_RANGE(0x4200, 0x421f) AM_WRITEONLY AM_SHARE("colorram") AM_RANGE(0x4400, 0x4400) AM_WRITENOP - AM_RANGE(0x4600, 0x4600) AM_WRITE_BASE(atarigen_state, earom_control_w) - AM_RANGE(0x4800, 0x483f) AM_READ_BASE(atarigen_state, earom_r) + AM_RANGE(0x4600, 0x4600) AM_WRITE(earom_control_w) + AM_RANGE(0x4800, 0x483f) AM_READ(earom_r) AM_RANGE(0x4800, 0x4800) AM_WRITEONLY AM_SHARE("planet_frame") AM_RANGE(0x4a00, 0x4a00) AM_WRITE_LEGACY(watchdog_reset_w) AM_RANGE(0x4c00, 0x4c01) AM_WRITE(led_w) AM_RANGE(0x4c04, 0x4c04) AM_WRITE(trackball_reset_w) AM_RANGE(0x4c05, 0x4c06) AM_WRITE(coin_counter_w) AM_RANGE(0x4c07, 0x4c07) AM_WRITEONLY AM_SHARE("planet_select") - AM_RANGE(0x4e00, 0x4e3f) AM_WRITE_BASE(atarigen_state, earom_w) + AM_RANGE(0x4e00, 0x4e3f) AM_WRITE(earom_w) AM_RANGE(0x5000, 0x501f) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w) AM_RANGE(0x5800, 0x581f) AM_DEVREADWRITE_LEGACY("pokey1", pokey_r, pokey_w) //AM_RANGE(0x6000, 0x601f) AM_WRITE(pokey1_w) /* bug ??? */