mirror of
https://github.com/holub/mame
synced 2025-04-24 01:11:11 +03:00
Remove some AM_LEGACY_BASE stuff.
This commit is contained in:
parent
d3dc6db3f8
commit
3dd78d1ddb
@ -249,7 +249,7 @@ static ADDRESS_MAP_START( asteroid_map, AS_PROGRAM, 8, asteroid_state )
|
||||
AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE_LEGACY("discrete", asteroid_thump_w)
|
||||
AM_RANGE(0x3c00, 0x3c05) AM_DEVWRITE_LEGACY("discrete", asteroid_sounds_w)
|
||||
AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE_LEGACY("discrete", asteroid_noise_reset_w)
|
||||
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x4000)
|
||||
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x4000)
|
||||
AM_RANGE(0x5000, 0x57ff) AM_ROM /* vector rom */
|
||||
AM_RANGE(0x6800, 0x7fff) AM_ROM
|
||||
ADDRESS_MAP_END
|
||||
@ -275,7 +275,7 @@ static ADDRESS_MAP_START( astdelux_map, AS_PROGRAM, 8, asteroid_state )
|
||||
AM_RANGE(0x3c04, 0x3c04) AM_WRITE(astdelux_bank_switch_w)
|
||||
AM_RANGE(0x3c05, 0x3c07) AM_WRITE(astdelux_coin_counter_w)
|
||||
AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE_LEGACY("discrete", asteroid_noise_reset_w)
|
||||
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x4000)
|
||||
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x4000)
|
||||
AM_RANGE(0x4800, 0x57ff) AM_ROM /* vector rom */
|
||||
AM_RANGE(0x6000, 0x7fff) AM_ROM
|
||||
ADDRESS_MAP_END
|
||||
@ -293,7 +293,7 @@ static ADDRESS_MAP_START( llander_map, AS_PROGRAM, 8, asteroid_state )
|
||||
AM_RANGE(0x3400, 0x3400) AM_WRITE(watchdog_reset_w)
|
||||
AM_RANGE(0x3c00, 0x3c00) AM_DEVWRITE_LEGACY("discrete", llander_sounds_w)
|
||||
AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE_LEGACY("discrete", llander_snd_reset_w)
|
||||
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x4000)
|
||||
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x4000)
|
||||
AM_RANGE(0x4800, 0x5fff) AM_ROM /* vector rom */
|
||||
AM_RANGE(0x6000, 0x7fff) AM_ROM
|
||||
ADDRESS_MAP_END
|
||||
|
@ -355,7 +355,7 @@ WRITE8_MEMBER(bwidow_state::irq_ack_w)
|
||||
|
||||
static ADDRESS_MAP_START( bwidow_map, AS_PROGRAM, 8, bwidow_state )
|
||||
AM_RANGE(0x0000, 0x07ff) AM_RAM
|
||||
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2800, 0x5fff) AM_ROM
|
||||
AM_RANGE(0x6000, 0x67ff) AM_DEVREADWRITE("pokey1", pokey_device, read, write)
|
||||
AM_RANGE(0x6800, 0x6fff) AM_DEVREADWRITE("pokey2", pokey_device, read, write)
|
||||
@ -389,7 +389,7 @@ static ADDRESS_MAP_START( spacduel_map, AS_PROGRAM, 8, bwidow_state )
|
||||
AM_RANGE(0x0f00, 0x0f3f) AM_DEVWRITE("earom", atari_vg_earom_device, write)
|
||||
AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("pokey1", pokey_device, read, write)
|
||||
AM_RANGE(0x1400, 0x140f) AM_DEVREADWRITE("pokey2", pokey_device, read, write)
|
||||
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2800, 0x3fff) AM_ROM
|
||||
AM_RANGE(0x4000, 0xffff) AM_ROM
|
||||
ADDRESS_MAP_END
|
||||
|
@ -315,7 +315,7 @@ static ADDRESS_MAP_START( bzone_map, AS_PROGRAM, 8, bzone_state )
|
||||
AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE("pokey", pokey_device, read, write)
|
||||
AM_RANGE(0x1840, 0x1840) AM_DEVWRITE_LEGACY("discrete", bzone_sounds_w)
|
||||
AM_RANGE(0x1860, 0x187f) AM_DEVWRITE_LEGACY("mathbox", mathbox_go_w)
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x3000, 0x7fff) AM_ROM
|
||||
ADDRESS_MAP_END
|
||||
|
||||
@ -339,7 +339,7 @@ static ADDRESS_MAP_START( redbaron_map, AS_PROGRAM, 8, bzone_state )
|
||||
AM_RANGE(0x1810, 0x181f) AM_DEVREADWRITE("pokey", pokey_device, read, write)
|
||||
AM_RANGE(0x1820, 0x185f) AM_DEVREADWRITE("earom", atari_vg_earom_device, read, write)
|
||||
AM_RANGE(0x1860, 0x187f) AM_DEVWRITE_LEGACY("mathbox", mathbox_go_w)
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x3000, 0x7fff) AM_ROM
|
||||
ADDRESS_MAP_END
|
||||
|
||||
|
@ -238,7 +238,7 @@ static ADDRESS_MAP_START( alpha_map, AS_PROGRAM, 8, mhavoc_state )
|
||||
AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK("bank1") AM_SHARE("zram1")
|
||||
AM_RANGE(0x1000, 0x1000) AM_READ(mhavoc_gamma_r) /* Gamma Read Port */
|
||||
AM_RANGE(0x1200, 0x1200) AM_READ_PORT("IN0") AM_WRITENOP /* Alpha Input Port 0 */
|
||||
AM_RANGE(0x1400, 0x141f) AM_RAM AM_BASE_LEGACY(&avgdvg_colorram) /* ColorRAM */
|
||||
AM_RANGE(0x1400, 0x141f) AM_RAM AM_SHARE("colorram") /* ColorRAM */
|
||||
AM_RANGE(0x1600, 0x1600) AM_WRITE(mhavoc_out_0_w) /* Control Signals */
|
||||
AM_RANGE(0x1640, 0x1640) AM_WRITE_LEGACY(avgdvg_go_w) /* Vector Generator GO */
|
||||
AM_RANGE(0x1680, 0x1680) AM_WRITE(watchdog_reset_w) /* Watchdog Clear */
|
||||
@ -249,7 +249,7 @@ static ADDRESS_MAP_START( alpha_map, AS_PROGRAM, 8, mhavoc_state )
|
||||
AM_RANGE(0x17c0, 0x17c0) AM_WRITE(mhavoc_gamma_w) /* Gamma Communication Write Port */
|
||||
AM_RANGE(0x1800, 0x1fff) AM_RAM /* Shared Beta Ram */
|
||||
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank2") /* Paged Program ROM (32K) */
|
||||
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("alpha", 0x4000) /* Vector Generator RAM */
|
||||
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_SHARE("vectorram") AM_REGION("alpha", 0x4000) /* Vector Generator RAM */
|
||||
AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */
|
||||
AM_RANGE(0x8000, 0xffff) AM_ROM /* Program ROM (32K) */
|
||||
ADDRESS_MAP_END
|
||||
@ -301,10 +301,10 @@ static ADDRESS_MAP_START( alphaone_map, AS_PROGRAM, 8, mhavoc_state )
|
||||
AM_RANGE(0x10b0, 0x10b0) AM_WRITE(mhavoc_alpha_irq_ack_w) /* IRQ ack */
|
||||
AM_RANGE(0x10b4, 0x10b4) AM_WRITE(mhavoc_rom_banksel_w)
|
||||
AM_RANGE(0x10b8, 0x10b8) AM_WRITE(mhavoc_ram_banksel_w)
|
||||
AM_RANGE(0x10e0, 0x10ff) AM_WRITEONLY AM_BASE_LEGACY(&avgdvg_colorram) /* ColorRAM */
|
||||
AM_RANGE(0x10e0, 0x10ff) AM_WRITEONLY AM_SHARE("colorram") /* ColorRAM */
|
||||
AM_RANGE(0x1800, 0x18ff) AM_RAM AM_SHARE("nvram") /* EEROM */
|
||||
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank2") /* Paged Program ROM (32K) */
|
||||
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("alpha", 0x4000) /* Vector Generator RAM */
|
||||
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_SHARE("vectorram") AM_REGION("alpha", 0x4000) /* Vector Generator RAM */
|
||||
AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */
|
||||
AM_RANGE(0x8000, 0xffff) AM_ROM /* Program ROM (32K) */
|
||||
ADDRESS_MAP_END
|
||||
|
@ -343,7 +343,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, omegrace_state )
|
||||
AM_RANGE(0x0000, 0x3fff) AM_ROM
|
||||
AM_RANGE(0x4000, 0x4bff) AM_RAM
|
||||
AM_RANGE(0x5c00, 0x5cff) AM_RAM AM_SHARE("nvram") /* NVRAM */
|
||||
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x8000) /* vector ram */
|
||||
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x8000) /* vector ram */
|
||||
AM_RANGE(0x9000, 0x9fff) AM_ROM /* vector rom */
|
||||
ADDRESS_MAP_END
|
||||
|
||||
|
@ -131,13 +131,13 @@ WRITE16_MEMBER(quantum_state::led_w)
|
||||
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, quantum_state )
|
||||
AM_RANGE(0x000000, 0x013fff) AM_ROM
|
||||
AM_RANGE(0x018000, 0x01cfff) AM_RAM
|
||||
AM_RANGE(0x800000, 0x801fff) AM_RAM AM_BASE_LEGACY((UINT16 **)&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size)
|
||||
AM_RANGE(0x800000, 0x801fff) AM_RAM AM_SHARE("vectorram")
|
||||
AM_RANGE(0x840000, 0x84001f) AM_DEVREADWRITE8("pokey1", pokey_device, read, write, 0x00ff)
|
||||
AM_RANGE(0x840020, 0x84003f) AM_DEVREADWRITE8("pokey2", pokey_device, read, write, 0x00ff)
|
||||
AM_RANGE(0x900000, 0x9001ff) AM_RAM AM_SHARE("nvram")
|
||||
AM_RANGE(0x940000, 0x940001) AM_READ(trackball_r) /* trackball */
|
||||
AM_RANGE(0x948000, 0x948001) AM_READ_PORT("SYSTEM")
|
||||
AM_RANGE(0x950000, 0x95001f) AM_WRITEONLY AM_BASE_LEGACY((UINT16**)&avgdvg_colorram)
|
||||
AM_RANGE(0x950000, 0x95001f) AM_WRITEONLY AM_SHARE("colorram")
|
||||
AM_RANGE(0x958000, 0x958001) AM_WRITE(led_w)
|
||||
AM_RANGE(0x960000, 0x960001) AM_WRITENOP
|
||||
AM_RANGE(0x968000, 0x968001) AM_WRITE_LEGACY(avgdvg_reset_word_w)
|
||||
|
@ -152,7 +152,7 @@ DIRECT_UPDATE_MEMBER(starwars_state::esb_setdirect)
|
||||
*************************************/
|
||||
|
||||
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, starwars_state )
|
||||
AM_RANGE(0x0000, 0x2fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0)
|
||||
AM_RANGE(0x0000, 0x2fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0)
|
||||
AM_RANGE(0x3000, 0x3fff) AM_ROM /* vector_rom */
|
||||
AM_RANGE(0x4300, 0x431f) AM_READ_PORT("IN0")
|
||||
AM_RANGE(0x4320, 0x433f) AM_READ_PORT("IN1")
|
||||
|
@ -399,11 +399,11 @@ WRITE8_MEMBER(tempest_state::tempest_coin_w)
|
||||
|
||||
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tempest_state )
|
||||
AM_RANGE(0x0000, 0x07ff) AM_RAM
|
||||
AM_RANGE(0x0800, 0x080f) AM_WRITEONLY AM_BASE_LEGACY(&avgdvg_colorram)
|
||||
AM_RANGE(0x0800, 0x080f) AM_WRITEONLY AM_SHARE("colorram")
|
||||
AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("IN0")
|
||||
AM_RANGE(0x0d00, 0x0d00) AM_READ_PORT("DSW1")
|
||||
AM_RANGE(0x0e00, 0x0e00) AM_READ_PORT("DSW2")
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000)
|
||||
AM_RANGE(0x3000, 0x3fff) AM_ROM
|
||||
AM_RANGE(0x4000, 0x4000) AM_WRITE(tempest_coin_w)
|
||||
AM_RANGE(0x4800, 0x4800) AM_WRITE_LEGACY(avgdvg_go_w)
|
||||
|
@ -296,7 +296,7 @@ static ADDRESS_MAP_START( tomcat_map, AS_PROGRAM, 16, tomcat_state )
|
||||
AM_RANGE(0x40e01a, 0x40e01b) AM_WRITE(tomcat_errh_w)
|
||||
AM_RANGE(0x40e01c, 0x40e01d) AM_WRITE(tomcat_ackh_w)
|
||||
AM_RANGE(0x40e01e, 0x40e01f) AM_WRITE(tomcat_txbuffh_w)
|
||||
AM_RANGE(0x800000, 0x803fff) AM_RAM AM_BASE_LEGACY((UINT16**)&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size)
|
||||
AM_RANGE(0x800000, 0x803fff) AM_RAM AM_SHARE("vectorram")
|
||||
AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE(tomcat_shared_ram_r, tomcat_shared_ram_w)
|
||||
AM_RANGE(0xffc000, 0xffcfff) AM_RAM
|
||||
AM_RANGE(0xffd000, 0xffdfff) AM_DEVREADWRITE8_LEGACY("m48t02", timekeeper_r, timekeeper_w, 0xff00)
|
||||
|
@ -22,10 +22,10 @@
|
||||
*
|
||||
*************************************/
|
||||
|
||||
UINT8 *avgdvg_vectorram;
|
||||
size_t avgdvg_vectorram_size;
|
||||
static UINT8 *avgdvg_vectorram;
|
||||
static size_t avgdvg_vectorram_size;
|
||||
|
||||
UINT8 *avgdvg_colorram;
|
||||
static UINT8 *avgdvg_colorram;
|
||||
|
||||
|
||||
|
||||
@ -1493,6 +1493,11 @@ static VIDEO_START( avg_common )
|
||||
{
|
||||
const rectangle &visarea = machine.primary_screen->visible_area();
|
||||
|
||||
avgdvg_vectorram = reinterpret_cast<UINT8 *>(machine.root_device().memshare("vectorram")->ptr());
|
||||
avgdvg_vectorram_size = machine.root_device().memshare("vectorram")->bytes();
|
||||
|
||||
avgdvg_colorram = reinterpret_cast<UINT8 *>(machine.root_device().memshare("colorram")->ptr());
|
||||
|
||||
vg = &vgd;
|
||||
vg->set_machine(machine);
|
||||
|
||||
@ -1525,6 +1530,11 @@ VIDEO_START( dvg )
|
||||
{
|
||||
const rectangle &visarea = machine.primary_screen->visible_area();
|
||||
|
||||
avgdvg_vectorram = reinterpret_cast<UINT8 *>(machine.root_device().memshare("vectorram")->ptr());
|
||||
avgdvg_vectorram_size = machine.root_device().memshare("vectorram")->bytes();
|
||||
|
||||
avgdvg_colorram = reinterpret_cast<UINT8 *>(machine.root_device().memshare("colorram")->ptr());
|
||||
|
||||
vgc = &dvg_default;
|
||||
vg = &vgd;
|
||||
vg->set_machine(machine);
|
||||
|
@ -1,10 +1,6 @@
|
||||
#ifndef __AVGDVG__
|
||||
#define __AVGDVG__
|
||||
|
||||
extern UINT8 *avgdvg_vectorram;
|
||||
extern size_t avgdvg_vectorram_size;
|
||||
extern UINT8 *avgdvg_colorram;
|
||||
|
||||
CUSTOM_INPUT( avgdvg_done_r );
|
||||
WRITE8_HANDLER( avgdvg_go_w );
|
||||
WRITE8_HANDLER( avgdvg_reset_w );
|
||||
|
Loading…
Reference in New Issue
Block a user