diff options
author | Aaron Giles <aaron@aarongiles.com> | 2012-09-12 08:52:08 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2012-09-12 08:52:08 +0000 |
commit | dbf2cb905a69655ea504fd298d6a209a23871fce (patch) | |
tree | da1f355aad036ab69d1f21f5f997180f13afd96a /src/mess | |
parent | f987a35e275e7ffcf49b9fc03cfdc46fe8ce7c48 (diff) |
Kill off some AM_BASE_LEGACYs.
Diffstat (limited to 'src/mess')
-rw-r--r-- | src/mess/drivers/a310.c | 12 | ||||
-rw-r--r-- | src/mess/drivers/x1twin.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mess/drivers/a310.c b/src/mess/drivers/a310.c index c3f337b9266..1c38d78e369 100644 --- a/src/mess/drivers/a310.c +++ b/src/mess/drivers/a310.c @@ -69,7 +69,10 @@ class a310_state : public driver_device { public: a310_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_physram(*this, "physicalram") { } + + required_shared_ptr<UINT32> m_physram; DECLARE_READ32_MEMBER(a310_psy_wram_r); DECLARE_WRITE32_MEMBER(a310_psy_wram_w); @@ -95,19 +98,18 @@ static WRITE_LINE_DEVICE_HANDLER( a310_wd177x_drq_w ) READ32_MEMBER(a310_state::a310_psy_wram_r) { - return archimedes_memc_physmem[offset]; + return m_physram[offset]; } WRITE32_MEMBER(a310_state::a310_psy_wram_w) { - COMBINE_DATA(&archimedes_memc_physmem[offset]); + COMBINE_DATA(&m_physram[offset]); } DRIVER_INIT_MEMBER(a310_state,a310) { UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size(); - archimedes_memc_physmem = auto_alloc_array(machine(), UINT32, 0x01000000); machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x02000000, 0x02000000+(ram_size-1), read32_delegate(FUNC(a310_state::a310_psy_wram_r), this), write32_delegate(FUNC(a310_state::a310_psy_wram_w), this)); @@ -129,7 +131,7 @@ static MACHINE_RESET( a310 ) static ADDRESS_MAP_START( a310_mem, AS_PROGRAM, 32, a310_state ) AM_RANGE(0x00000000, 0x01ffffff) AM_READWRITE_LEGACY(archimedes_memc_logical_r, archimedes_memc_logical_w) -// AM_RANGE(0x02000000, 0x02ffffff) AM_RAM AM_BASE_LEGACY(&archimedes_memc_physmem) /* physical RAM - 16 MB for now, should be 512k for the A310 */ + AM_RANGE(0x02000000, 0x02ffffff) AM_RAM AM_SHARE("physicalram") /* physical RAM - 16 MB for now, should be 512k for the A310 */ AM_RANGE(0x03000000, 0x033fffff) AM_READWRITE_LEGACY(archimedes_ioc_r, archimedes_ioc_w) AM_RANGE(0x03400000, 0x035fffff) AM_READWRITE_LEGACY(archimedes_vidc_r, archimedes_vidc_w) AM_RANGE(0x03600000, 0x037fffff) AM_READWRITE_LEGACY(archimedes_memc_r, archimedes_memc_w) diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c index 0b1d28a2d18..470aa6ae9c6 100644 --- a/src/mess/drivers/x1twin.c +++ b/src/mess/drivers/x1twin.c @@ -53,7 +53,7 @@ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( pce_mem , AS_PROGRAM, 8, x1twin_state ) AM_RANGE( 0x000000, 0x09FFFF) AM_ROM - AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE(&pce_user_ram ) + AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w ) AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w ) AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( "c6280", c6280_r, c6280_w ) |