From d571db2a30cf29e736e9fac4e9654a7ba448952d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 28 Feb 2014 14:53:01 +0000 Subject: [PATCH] this is for today (nw) --- src/mame/drivers/m92.c | 4 ++-- src/mame/drivers/srmp6.c | 8 ++++---- src/mame/drivers/xxmissio.c | 4 ++-- src/mame/video/m92.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index e19a17e3bd1..ad5ac7291a2 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -343,7 +343,7 @@ static ADDRESS_MAP_START( lethalth_map, AS_PROGRAM, 16, m92_state ) AM_RANGE(0x80000, 0x8ffff) AM_RAM_WRITE(m92_vram_w) AM_SHARE("vram_data") AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w) + AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w) AM_SHARE("palette") AM_RANGE(0xf9000, 0xf900f) AM_WRITE(m92_spritecontrol_w) AM_SHARE("spritecontrol") AM_RANGE(0xf9800, 0xf9801) AM_WRITE(m92_videocontrol_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x7fff0) @@ -356,7 +356,7 @@ static ADDRESS_MAP_START( m92_map, AS_PROGRAM, 16, m92_state ) AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m92_vram_w) AM_SHARE("vram_data") AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w) + AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w) AM_SHARE("palette") AM_RANGE(0xf9000, 0xf900f) AM_WRITE(m92_spritecontrol_w) AM_SHARE("spritecontrol") AM_RANGE(0xf9800, 0xf9801) AM_WRITE(m92_videocontrol_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x7fff0) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index ade067146d8..f12de9570a9 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -136,9 +136,9 @@ void srmp6_state::update_palette() for(i = 0; i < 0x800; i++) { - r = m_generic_paletteram_16[i] >> 0 & 0x1F; - g = m_generic_paletteram_16[i] >> 5 & 0x1F; - b = m_generic_paletteram_16[i] >> 10 & 0x1F; + r = m_palette->basemem().read16(i) >> 0 & 0x1F; + g = m_palette->basemem().read16(i) >> 5 & 0x1F; + b = m_palette->basemem().read16(i) >> 10 & 0x1F; if(brg < 0) { r += (r * brg) >> 5; @@ -546,7 +546,7 @@ static ADDRESS_MAP_START( srmp6_map, AS_PROGRAM, 16, srmp6_state ) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("user1", 0) AM_RANGE(0x300000, 0x300005) AM_READWRITE(srmp6_inputs_r, srmp6_input_select_w) // inputs - AM_RANGE(0x480000, 0x480fff) AM_RAM_WRITE(paletteram_w) AM_SHARE("paletteram") + AM_RANGE(0x480000, 0x480fff) AM_RAM_WRITE(paletteram_w) AM_SHARE("palette") AM_RANGE(0x4d0000, 0x4d0001) AM_READ(srmp6_irq_ack_r) // OBJ RAM: checked [$400000-$47dfff] diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index 2d0a537a1cb..33909bd6e1e 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -99,7 +99,7 @@ static ADDRESS_MAP_START( map1, AS_PROGRAM, 8, xxmissio_state ) AM_RANGE(0xc800, 0xcfff) AM_READWRITE(xxmissio_bgram_r, xxmissio_bgram_w) AM_SHARE("bgram") AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0xd800, 0xdaff) AM_SHARE("paletteram") AM_RAM_WRITE(xxmissio_paletteram_w) + AM_RANGE(0xd800, 0xdaff) AM_SHARE("palette") AM_RAM_WRITE(xxmissio_paletteram_w) AM_RANGE(0xe000, 0xefff) AM_SHARE("share5") AM_RAM AM_RANGE(0xf000, 0xffff) AM_SHARE("share6") AM_RAM @@ -124,7 +124,7 @@ static ADDRESS_MAP_START( map2, AS_PROGRAM, 8, xxmissio_state ) AM_RANGE(0xc800, 0xcfff) AM_SHARE("bgram") AM_READWRITE(xxmissio_bgram_r, xxmissio_bgram_w) AM_RANGE(0xd000, 0xd7ff) AM_SHARE("spriteram") AM_RAM - AM_RANGE(0xd800, 0xdaff) AM_SHARE("paletteram") AM_RAM_WRITE(xxmissio_paletteram_w) + AM_RANGE(0xd800, 0xdaff) AM_SHARE("palette") AM_RAM_WRITE(xxmissio_paletteram_w) AM_RANGE(0xe000, 0xefff) AM_SHARE("share6") AM_RAM AM_RANGE(0xf000, 0xffff) AM_SHARE("share5") AM_RAM diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 2cb48b31693..af73bccf421 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -133,7 +133,7 @@ WRITE16_MEMBER(m92_state::m92_videocontrol_w) READ16_MEMBER(m92_state::m92_paletteram_r) { - return m_generic_paletteram_16[offset + 0x400 * m_palette_bank]; + return m_palette->basemem().read16(offset + 0x400 * m_palette_bank); } WRITE16_MEMBER(m92_state::m92_paletteram_w)