diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/macs.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/macs.cpp')
-rw-r--r-- | src/mame/drivers/macs.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp index b9b32cf00c0..7ff6fad678f 100644 --- a/src/mame/drivers/macs.cpp +++ b/src/mame/drivers/macs.cpp @@ -110,19 +110,20 @@ public: -ADDRESS_MAP_START(macs_state::macs_mem) - AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("rombank1") - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("rombank2") +void macs_state::macs_mem(address_map &map) +{ + map(0x0000, 0x7fff).bankr("rombank1"); + map(0x8000, 0xbfff).bankr("rombank2"); //AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w) //AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) - AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram ? */ - AM_RANGE(0xe800, 0xe87f) AM_RAM AM_SHARE("ram2") + map(0xe000, 0xe7ff).ram(); /* work ram ? */ + map(0xe800, 0xe87f).ram().share("ram2"); //AM_RANGE(0xe900, 0xe9ff) // sound - internal //AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) //AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) - AM_RANGE(0xf000, 0xf7ff) AM_RAMBANK("rambank1") /* common /backup ram ?*/ - AM_RANGE(0xf800, 0xffff) AM_RAMBANK("rambank2") /* common /backup ram ?*/ -ADDRESS_MAP_END + map(0xf000, 0xf7ff).bankrw("rambank1"); /* common /backup ram ?*/ + map(0xf800, 0xffff).bankrw("rambank2"); /* common /backup ram ?*/ +} WRITE8_MEMBER(macs_state::rambank_w) { @@ -196,19 +197,20 @@ WRITE8_MEMBER(macs_state::macs_output_w) } } -ADDRESS_MAP_START(macs_state::macs_io) - ADDRESS_MAP_GLOBAL_MASK(0xff) +void macs_state::macs_io(address_map &map) +{ + map.global_mask(0xff); //AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */ - AM_RANGE(0xc0, 0xc7) AM_READWRITE(macs_input_r,macs_output_w) - AM_RANGE(0xe0, 0xe0) AM_WRITENOP /* renju = $40, neratte = 0 */ - AM_RANGE(0xe1, 0xe1) AM_WRITE(macs_rom_bank_w) + map(0xc0, 0xc7).rw(this, FUNC(macs_state::macs_input_r), FUNC(macs_state::macs_output_w)); + map(0xe0, 0xe0).nopw(); /* renju = $40, neratte = 0 */ + map(0xe1, 0xe1).w(this, FUNC(macs_state::macs_rom_bank_w)); //AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w) //AM_RANGE(0xe3, 0xe4) AM_WRITE(st0016_character_bank_w) //AM_RANGE(0xe5, 0xe5) AM_WRITE(st0016_palette_bank_w) - AM_RANGE(0xe6, 0xe6) AM_WRITE(rambank_w) /* banking ? ram bank ? shared rambank ? */ - AM_RANGE(0xe7, 0xe7) AM_WRITENOP /* watchdog */ + map(0xe6, 0xe6).w(this, FUNC(macs_state::rambank_w)); /* banking ? ram bank ? shared rambank ? */ + map(0xe7, 0xe7).nopw(); /* watchdog */ //AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r) -ADDRESS_MAP_END +} //static GFXDECODE_START( macs ) // GFXDECODE_ENTRY( nullptr, 0, charlayout, 0, 16*4 ) |