diff options
author | 2012-04-16 08:42:02 +0000 | |
---|---|---|
committer | 2012-04-16 08:42:02 +0000 | |
commit | 3f82bc4d81ff8bf80b7f8cda0ea8a664e5aa84c2 (patch) | |
tree | 4b5005808f4574426402f443dae2cf7fede221f1 /src | |
parent | 1092cb2f9b566aec7b5d2a6edb8800fe7f5f51be (diff) |
Clear out remaining AM_BASE_SIZE.
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/addrmap.h | 3 | ||||
-rw-r--r-- | src/mame/drivers/alg.c | 6 | ||||
-rw-r--r-- | src/mame/drivers/arcadia.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/cd32.c | 14 | ||||
-rw-r--r-- | src/mame/drivers/chinagat.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/mquake.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/namcos11.c | 5 | ||||
-rw-r--r-- | src/mame/drivers/pipedrm.c | 5 | ||||
-rw-r--r-- | src/mame/drivers/upscope.c | 2 | ||||
-rw-r--r-- | src/mame/includes/amiga.h | 6 | ||||
-rw-r--r-- | src/mame/includes/ddragon.h | 1 | ||||
-rw-r--r-- | src/mame/includes/fromance.h | 10 | ||||
-rw-r--r-- | src/mame/machine/amiga.c | 12 | ||||
-rw-r--r-- | src/mame/video/fromance.c | 2 |
14 files changed, 34 insertions, 38 deletions
diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h index 2d94c85c153..a597f540b8a 100644 --- a/src/emu/addrmap.h +++ b/src/emu/addrmap.h @@ -757,9 +757,6 @@ void _class :: _name(address_map &map, const device_t &device) \ #define AM_RAM_WRITE_LEGACY(_write) AM_READONLY AM_WRITE_LEGACY(_write) #define AM_RAM_DEVWRITE_LEGACY(_tag, _write) AM_READONLY AM_DEVWRITE_LEGACY(_tag, _write) -#define myoffsetof(_struct, _member) ((FPTR)&((_struct *)0x1000)->_member - 0x1000) -#define AM_BASE_SIZE(_base, _size) curentry->set_member_baseptr(myoffsetof(drivdata_class, _base)); curentry->set_member_sizeptr(myoffsetof(drivdata_class, _size)); - diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index fc548edd595..ee1cb916087 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -280,7 +280,7 @@ static WRITE8_DEVICE_HANDLER( alg_cia_1_porta_w ) static ADDRESS_MAP_START( main_map_r1, AS_PROGRAM, 16, alg_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE(m_chip_ram, m_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE_LEGACY(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE_LEGACY(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE_LEGACY(amiga_autoconfig_r, amiga_autoconfig_w) @@ -293,7 +293,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_map_r2, AS_PROGRAM, 16, alg_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE(m_chip_ram, m_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE_LEGACY(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE_LEGACY(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE_LEGACY(amiga_autoconfig_r, amiga_autoconfig_w) @@ -306,7 +306,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_map_picmatic, AS_PROGRAM, 16, alg_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE(m_chip_ram, m_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE_LEGACY(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE_LEGACY(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE_LEGACY(amiga_autoconfig_r, amiga_autoconfig_w) diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 30a431e31f5..88790f1ac56 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -195,7 +195,7 @@ static void arcadia_reset_coins(running_machine &machine) static ADDRESS_MAP_START( amiga_map, AS_PROGRAM, 16, arcadia_amiga_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE(m_chip_ram, m_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE_LEGACY(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE_LEGACY(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE_LEGACY(amiga_autoconfig_r, amiga_autoconfig_w) diff --git a/src/mame/drivers/cd32.c b/src/mame/drivers/cd32.c index 4f59d12f7b3..7f16d4cc1a8 100644 --- a/src/mame/drivers/cd32.c +++ b/src/mame/drivers/cd32.c @@ -1238,7 +1238,7 @@ static void cndypuzl_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //(*state->m_chip_ram_w)(0x051c02, 0x0000); @@ -1258,7 +1258,7 @@ static void haremchl_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //amiga_chip_ram_w8(state, 0x002907, 0x00); @@ -1279,7 +1279,7 @@ static void lsrquiz_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //amiga_chip_ram_w8(state, 0x001e1b, 0x00); @@ -1301,7 +1301,7 @@ static void lsrquiz2_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //amiga_chip_ram_w8(state, 0x046107, 0x00); @@ -1322,7 +1322,7 @@ static void lasstixx_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //amiga_chip_ram_w8(state, 0x00281c, 0x00); @@ -1343,7 +1343,7 @@ static void mgnumber_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //(*state->m_chip_ram_w)(0x04bfa0, 0x0000); @@ -1363,7 +1363,7 @@ static void mgprem11_input_hack(running_machine &machine) { cd32_state *state = machine.driver_data<cd32_state>(); - if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram_size) + if (cpu_get_pc(machine.device("maincpu")) < state->m_chip_ram.bytes()) { //amiga_chip_ram_w8(state, 0x044f7e, 0x00); diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index b77e0843c01..8715bbc8fa9 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -311,7 +311,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, ddragon_state ) AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_SHARE("bgvideoram") AM_RANGE(0x3000, 0x317f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram") AM_RANGE(0x3400, 0x357f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2") - AM_RANGE(0x3800, 0x397f) AM_WRITE_BANK("bank3") AM_BASE_SIZE(m_spriteram, m_spriteram_size) + AM_RANGE(0x3800, 0x397f) AM_WRITE_BANK("bank3") AM_SHARE("spriteram") AM_RANGE(0x3e00, 0x3e04) AM_WRITE_LEGACY(chinagat_interrupt_w) AM_RANGE(0x3e06, 0x3e06) AM_WRITEONLY AM_SHARE("scrolly_lo") AM_RANGE(0x3e07, 0x3e07) AM_WRITEONLY AM_SHARE("scrollx_lo") diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index 42bbfedc0b2..543e5fec05f 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -133,7 +133,7 @@ static WRITE16_HANDLER( coin_chip_w ) static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, amiga_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE(m_chip_ram, m_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE_LEGACY(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE_LEGACY(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE_LEGACY(amiga_autoconfig_r, amiga_autoconfig_w) diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index 256848c4324..f3b5abc48a5 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -285,12 +285,13 @@ public: namcos11_state(const machine_config &mconfig, device_type type, const char *tag) : psx_state(mconfig, type, tag), m_sharedram(*this,"sharedram"), + m_keycus(*this,"keycus"), m_maincpu(*this,"maincpu"), m_mcu(*this,"c76") { } required_shared_ptr<UINT32> m_sharedram; - UINT32 *m_keycus; + required_shared_ptr<UINT32> m_keycus; size_t m_keycus_size; UINT8 m_su_83; @@ -714,7 +715,7 @@ READ32_MEMBER(namcos11_state::lightgun_r) static ADDRESS_MAP_START( namcos11_map, AS_PROGRAM, 32, namcos11_state ) AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */ AM_RANGE(0x1fa04000, 0x1fa0ffff) AM_RAM AM_SHARE("sharedram") /* shared ram with C76 */ - AM_RANGE(0x1fa20000, 0x1fa2ffff) AM_WRITE(keycus_w) AM_BASE_SIZE(m_keycus, m_keycus_size) /* keycus */ + AM_RANGE(0x1fa20000, 0x1fa2ffff) AM_WRITE(keycus_w) AM_SHARE("keycus") /* keycus */ AM_RANGE(0x1fa30000, 0x1fa30fff) AM_DEVREADWRITE8_LEGACY("at28c16", at28c16_r, at28c16_w, 0x00ff00ff) /* eeprom */ AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITENOP /* ?? */ AM_RANGE(0x1fbf6000, 0x1fbf6003) AM_WRITENOP /* ?? */ diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 3e930c5175a..96ca8975eaa 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -269,7 +269,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, fromance_state ) AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram") - AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size) + AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_SHARE("videoram") ADDRESS_MAP_END @@ -879,8 +879,7 @@ static DRIVER_INIT( pipedrm ) fromance_state *state = machine.driver_data<fromance_state>(); /* sprite RAM lives at the end of palette RAM */ - state->m_spriteram = &state->m_generic_paletteram_8[0xc00]; - state->m_spriteram_size = 0x400; + state->m_spriteram.set_target(&state->m_generic_paletteram_8[0xc00], 0x400); machine.device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0xcc00, 0xcfff, state->m_spriteram); } diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index 02babe3a09a..d5137078ff5 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -243,7 +243,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_1_porta_w ) static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, upscope_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE(m_chip_ram, m_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE_LEGACY(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE_LEGACY(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE_LEGACY(amiga_autoconfig_r, amiga_autoconfig_w) diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 8c18fc9160d..1a25b3be318 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -374,10 +374,10 @@ class amiga_state : public driver_device public: amiga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_custom_regs(*this, "custom_regs") { } + m_chip_ram(*this, "chip_ram", 0), + m_custom_regs(*this, "custom_regs", 0) { } - UINT16 *m_chip_ram; - size_t m_chip_ram_size; + required_shared_ptr<UINT16> m_chip_ram; UINT16 (*m_chip_ram_r)(amiga_state *state, offs_t offset); void (*m_chip_ram_w)(amiga_state *state, offs_t offset, UINT16 data); required_shared_ptr<UINT16> m_custom_regs; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 5ad481eadf3..a4a57704551 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -28,7 +28,6 @@ public: optional_shared_ptr<UINT8> m_darktowr_mcu_ports; // UINT8 * m_paletteram; // currently this uses generic palette handling // UINT8 * m_paletteram_2; // currently this uses generic palette handling - size_t m_spriteram_size; // FIXME: this appears in chinagat.c, but is it really used? /* video-related */ tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 077d7da7814..6f8956d8455 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -11,14 +11,14 @@ class fromance_state : public driver_device { public: fromance_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_videoram(*this, "videoram"), + m_spriteram(*this, "spriteram") { } /* memory pointers (used by pipedrm) */ - UINT8 * m_videoram; - UINT8 * m_spriteram; + optional_shared_ptr<UINT8> m_videoram; + optional_shared_ptr<UINT8> m_spriteram; // UINT8 * m_paletteram; // currently this uses generic palette handling - size_t m_videoram_size; - size_t m_spriteram_size; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c index c99eab42e8e..d7f0bf94497 100644 --- a/src/mame/machine/amiga.c +++ b/src/mame/machine/amiga.c @@ -155,16 +155,16 @@ static TIMER_CALLBACK( scanline_callback ); static UINT16 amiga_chip_ram16_r(amiga_state *state, offs_t offset) { offset &= state->m_intf->chip_ram_mask; - return (offset < state->m_chip_ram_size) ? state->m_chip_ram[offset/2] : 0xffff; + return (offset < state->m_chip_ram.bytes()) ? state->m_chip_ram[offset/2] : 0xffff; } static UINT16 amiga_chip_ram32_r(amiga_state *state, offs_t offset) { offset &= state->m_intf->chip_ram_mask; - if (offset < state->m_chip_ram_size) + if (offset < state->m_chip_ram.bytes()) { - UINT32 *amiga_chip_ram32 = (UINT32 *)state->m_chip_ram; + UINT32 *amiga_chip_ram32 = reinterpret_cast<UINT32 *>(state->m_chip_ram.target()); UINT32 dat = amiga_chip_ram32[offset / 4]; if ( offset & 2 ) @@ -180,7 +180,7 @@ static void amiga_chip_ram16_w(amiga_state *state, offs_t offset, UINT16 data) { offset &= state->m_intf->chip_ram_mask; - if (offset < state->m_chip_ram_size) + if (offset < state->m_chip_ram.bytes()) state->m_chip_ram[offset/2] = data; } @@ -188,9 +188,9 @@ static void amiga_chip_ram32_w(amiga_state *state, offs_t offset, UINT16 data) { offset &= state->m_intf->chip_ram_mask; - if (offset < state->m_chip_ram_size) + if (offset < state->m_chip_ram.bytes()) { - UINT32 *amiga_chip_ram32 = (UINT32 *)state->m_chip_ram; + UINT32 *amiga_chip_ram32 = reinterpret_cast<UINT32 *>(state->m_chip_ram.target()); UINT32 dat = amiga_chip_ram32[offset / 4]; if ( offset & 2 ) diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index 0a6f2078b37..171d6808eee 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -304,7 +304,7 @@ static void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rec int offs; /* draw the sprites */ - for (offs = 0; offs < state->m_spriteram_size; offs += 8) + for (offs = 0; offs < state->m_spriteram.bytes(); offs += 8) { int data2 = spriteram[offs + 4] | (spriteram[offs + 5] << 8); int priority = (data2 >> 4) & 1; |