From f5b8f67d17d3ccf64d41261e7547492cef09e918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Fri, 11 May 2012 21:15:45 +0000 Subject: [PATCH] fixed atarivc_eof tag and shortened playfield_upper(15 chars) tag to playfield_up --- src/mame/drivers/batman.c | 2 +- src/mame/drivers/eprom.c | 4 ++-- src/mame/drivers/klax.c | 2 +- src/mame/drivers/offtwall.c | 2 +- src/mame/drivers/relief.c | 2 +- src/mame/drivers/shuuz.c | 2 +- src/mame/drivers/skullxbo.c | 2 +- src/mame/drivers/thunderj.c | 2 +- src/mame/machine/atarigen.h | 17 +++++++++-------- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 17f8c25e1e3..2b24f2d61aa 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, batman_state ) AM_RANGE(0x3effc0, 0x3effff) AM_MIRROR(0x100000) AM_READWRITE(batman_atarivc_r, batman_atarivc_w) AM_SHARE("atarivc_data") AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x100000) AM_WRITE_LEGACY(atarigen_playfield2_latched_msb_w) AM_SHARE("playfield2") AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x100000) AM_WRITE_LEGACY(atarigen_playfield_latched_lsb_w) AM_SHARE("playfield") - AM_RANGE(0x3f4000, 0x3f5fff) AM_MIRROR(0x100000) AM_WRITE_LEGACY(atarigen_playfield_dual_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f4000, 0x3f5fff) AM_MIRROR(0x100000) AM_WRITE_LEGACY(atarigen_playfield_dual_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f6000, 0x3f7fff) AM_MIRROR(0x100000) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3f8000, 0x3f8eff) AM_MIRROR(0x100000) AM_WRITE_LEGACY(atarigen_alpha_w) AM_SHARE("alpha") AM_RANGE(0x3f8f00, 0x3f8f7f) AM_MIRROR(0x100000) AM_SHARE("atarivc_eof") diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index f6d23f59c70..2f5bcdccc86 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -175,7 +175,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, eprom_state ) AM_RANGE(0x3f2000, 0x3f3fff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3f4000, 0x3f4f7f) AM_WRITE_LEGACY(atarigen_alpha_w) AM_SHARE("alpha") AM_RANGE(0x3f4f80, 0x3f4fff) AM_READWRITE_LEGACY(atarimo_0_slipram_r, atarimo_0_slipram_w) - AM_RANGE(0x3f8000, 0x3f9fff) AM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f8000, 0x3f9fff) AM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f0000, 0x3f9fff) AM_RAM ADDRESS_MAP_END @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( guts_map, AS_PROGRAM, 16, eprom_state ) AM_RANGE(0x360020, 0x360021) AM_WRITE_LEGACY(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE_LEGACY(atarigen_sound_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM AM_SHARE("paletteram") - AM_RANGE(0xff0000, 0xff1fff) AM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0xff0000, 0xff1fff) AM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_up") AM_RANGE(0xff8000, 0xff9fff) AM_WRITE_LEGACY(atarigen_playfield_w) AM_SHARE("playfield") AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0xffc000, 0xffcf7f) AM_WRITE_LEGACY(atarigen_alpha_w) AM_SHARE("alpha") diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index 0287f12bfd7..3af83da4099 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -95,7 +95,7 @@ static ADDRESS_MAP_START( klax_map, AS_PROGRAM, 16, klax_state ) AM_RANGE(0x3e0000, 0x3e07ff) AM_RAM_WRITE_LEGACY(atarigen_expanded_666_paletteram_w) AM_SHARE("paletteram") AM_RANGE(0x3f0000, 0x3f0f7f) AM_RAM_WRITE_LEGACY(atarigen_playfield_w) AM_SHARE("playfield") AM_RANGE(0x3f0f80, 0x3f0fff) AM_READWRITE_LEGACY(atarimo_0_slipram_r, atarimo_0_slipram_w) - AM_RANGE(0x3f1000, 0x3f1fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f1000, 0x3f1fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f2000, 0x3f27ff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3f2800, 0x3f3fff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index e7150d0cf37..1e1ec563497 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -292,7 +292,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, offtwall_state ) AM_RANGE(0x3f4000, 0x3f5eff) AM_RAM_WRITE_LEGACY(atarigen_playfield_latched_msb_w) AM_SHARE("playfield") AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_SHARE("atarivc_eof") AM_RANGE(0x3f5f80, 0x3f5fff) AM_READWRITE_LEGACY(atarimo_0_slipram_r, atarimo_0_slipram_w) - AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f8000, 0x3fcfff) AM_RAM AM_RANGE(0x3fd000, 0x3fd7ff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3fd800, 0x3fffff) AM_RAM diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index 9ebd1b84ceb..42b94e7f18c 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -162,7 +162,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, relief_state ) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(relief_atarivc_r, relief_atarivc_w) AM_SHARE("atarivc_data") AM_RANGE(0x3f0000, 0x3f1fff) AM_RAM_WRITE_LEGACY(atarigen_playfield2_latched_msb_w) AM_SHARE("playfield2") AM_RANGE(0x3f2000, 0x3f3fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_latched_lsb_w) AM_SHARE("playfield") - AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_dual_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_dual_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f6000, 0x3f67ff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3f6800, 0x3f8eff) AM_RAM AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_SHARE("atarivc_eof") diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 85208553bde..7a76e75af43 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -152,7 +152,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, shuuz_state ) AM_RANGE(0x3f4000, 0x3f5eff) AM_RAM_WRITE_LEGACY(atarigen_playfield_latched_msb_w) AM_SHARE("playfield") AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_SHARE("atarivc_eof") AM_RANGE(0x3f5f80, 0x3f5fff) AM_READWRITE_LEGACY(atarimo_0_slipram_r, atarimo_0_slipram_w) - AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f8000, 0x3fcfff) AM_RAM AM_RANGE(0x3fd000, 0x3fd3ff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3fd400, 0x3fffff) AM_RAM diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index 87266f866cd..1eed4ca115b 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -149,7 +149,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, skullxbo_state ) AM_RANGE(0xff5802, 0xff5803) AM_READ(special_port1_r) AM_RANGE(0xff6000, 0xff6fff) AM_READ_LEGACY(atarigen_eeprom_r) AM_RANGE(0xff8000, 0xff9fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_latched_lsb_w) AM_SHARE("playfield") - AM_RANGE(0xffa000, 0xffbfff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0xffa000, 0xffbfff) AM_RAM_WRITE_LEGACY(atarigen_playfield_upper_w) AM_SHARE("playfield_up") AM_RANGE(0xffc000, 0xffcf7f) AM_RAM_WRITE_LEGACY(atarigen_alpha_w) AM_SHARE("alpha") AM_RANGE(0xffcf80, 0xffcfff) AM_READWRITE_LEGACY(atarimo_0_slipram_r, atarimo_0_slipram_w) AM_RANGE(0xffd000, 0xffdfff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 8894bbe64f6..9f0989ce66a 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -166,7 +166,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, thunderj_state ) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(thunderj_atarivc_r, thunderj_atarivc_w) AM_SHARE("atarivc_data") AM_RANGE(0x3f0000, 0x3f1fff) AM_RAM_WRITE_LEGACY(atarigen_playfield2_latched_msb_w) AM_SHARE("playfield2") AM_RANGE(0x3f2000, 0x3f3fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_latched_lsb_w) AM_SHARE("playfield") - AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_dual_upper_w) AM_SHARE("playfield_upper") + AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_dual_upper_w) AM_SHARE("playfield_up") AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w) AM_RANGE(0x3f8000, 0x3f8eff) AM_RAM_WRITE_LEGACY(atarigen_alpha_w) AM_SHARE("alpha") AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_SHARE("atarivc_eof") diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 41c0cdde964..da119208c36 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -66,18 +66,18 @@ typedef void (*atarigen_scanline_func)(screen_device &screen, int scanline); typedef struct _atarivc_state_desc atarivc_state_desc; struct _atarivc_state_desc { - UINT32 latch1; /* latch #1 value (-1 means disabled) */ - UINT32 latch2; /* latch #2 value (-1 means disabled) */ - UINT32 rowscroll_enable; /* true if row-scrolling is enabled */ - UINT32 palette_bank; /* which palette bank is enabled */ + UINT32 latch1; /* latch #1 value (-1 means disabled) */ + UINT32 latch2; /* latch #2 value (-1 means disabled) */ + UINT32 rowscroll_enable; /* true if row-scrolling is enabled */ + UINT32 palette_bank; /* which palette bank is enabled */ UINT32 pf0_xscroll; /* playfield 1 xscroll */ UINT32 pf0_xscroll_raw; /* playfield 1 xscroll raw value */ UINT32 pf0_yscroll; /* playfield 1 yscroll */ UINT32 pf1_xscroll; /* playfield 2 xscroll */ UINT32 pf1_xscroll_raw; /* playfield 2 xscroll raw value */ UINT32 pf1_yscroll; /* playfield 2 yscroll */ - UINT32 mo_xscroll; /* sprite xscroll */ - UINT32 mo_yscroll; /* sprite xscroll */ + UINT32 mo_xscroll; /* sprite xscroll */ + UINT32 mo_yscroll; /* sprite xscroll */ }; @@ -101,7 +101,7 @@ public: m_eeprom32(*this, "eeprom"), m_playfield(*this, "playfield"), m_playfield2(*this, "playfield2"), - m_playfield_upper(*this, "playfield_upper"), + m_playfield_upper(*this, "playfield_up"), m_alpha(*this, "alpha"), m_alpha2(*this, "alpha2"), m_xscroll(*this, "xscroll"), @@ -109,7 +109,8 @@ public: m_playfield32(*this, "playfield32"), m_alpha32(*this, "alpha32"), m_atarivc_data(*this, "atarivc_data"), - m_atarivc_eof_data(*this, "atarivc_eof_data") { } + m_atarivc_eof_data(*this, "atarivc_eof") + { } // users must call through to these virtual void machine_start();