diff options
author | Dirk Best <mail@dirk-best.de> | 2015-08-03 16:24:48 +0200 |
---|---|---|
committer | Dirk Best <mail@dirk-best.de> | 2015-08-03 16:24:48 +0200 |
commit | a05b184d18717ae8119abf2085b24e3ca2c74fe8 (patch) | |
tree | 01267833c510dda6fa5a2287725e355b5017b7ac | |
parent | 4350a977797b5c3993409b4c6bd21dff52ba7f96 (diff) |
konamigx: use standard palette device ram for type 1 and 2
-rw-r--r-- | src/mame/drivers/konamigx.c | 13 | ||||
-rw-r--r-- | src/mame/drivers/tasman.c | 5 | ||||
-rw-r--r-- | src/mame/includes/konamigx.h | 2 | ||||
-rw-r--r-- | src/mame/video/konamigx.c | 32 |
4 files changed, 10 insertions, 42 deletions
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index f34515a1f65..cb1b3116baf 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -982,7 +982,7 @@ static ADDRESS_MAP_START( gx_base_memmap, AS_PROGRAM, 32, konamigx_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( gx_type1_map, AS_PROGRAM, 32, konamigx_state ) - AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_SHARE("paletteram") + AM_RANGE(0xd90000, 0xd97fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0xdc0000, 0xdc1fff) AM_RAM // LAN RAM? (Racin' Force has, Open Golf doesn't) AM_RANGE(0xdd0000, 0xdd00ff) AM_READNOP AM_WRITENOP // LAN board AM_RANGE(0xdda000, 0xddafff) AM_WRITE_PORT("ADC-WRPORT") @@ -1002,7 +1002,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gx_type2_map, AS_PROGRAM, 32, konamigx_state ) AM_RANGE(0xcc0000, 0xcc0003) AM_WRITE(esc_w) - AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_SHARE("paletteram") + AM_RANGE(0xd90000, 0xd97fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_IMPORT_FROM(gx_base_memmap) ADDRESS_MAP_END @@ -1587,6 +1587,7 @@ static MACHINE_CONFIG_START( konamigx, konamigx_state ) MCFG_SCREEN_UPDATE_DRIVER(konamigx_state, screen_update_konamigx) MCFG_PALETTE_ADD("palette", 8192) + MCFG_PALETTE_FORMAT(XRGB) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() @@ -1754,8 +1755,8 @@ static MACHINE_CONFIG_DERIVED( gxtype3, konamigx ) MCFG_DEVICE_MODIFY("k055673") MCFG_K055673_CONFIG("gfx2", 0, K055673_LAYOUT_GX6, -132, -23) - MCFG_PALETTE_MODIFY("palette") - MCFG_PALETTE_ENTRIES(16384) + MCFG_DEVICE_REMOVE("palette") + MCFG_PALETTE_ADD("palette", 16384) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() @@ -1796,8 +1797,8 @@ static MACHINE_CONFIG_DERIVED( gxtype4, konamigx ) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16) MCFG_SCREEN_UPDATE_DRIVER(konamigx_state, screen_update_konamigx_right) - MCFG_PALETTE_MODIFY("palette") - MCFG_PALETTE_ENTRIES(8192) + MCFG_DEVICE_REMOVE("palette") + MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() diff --git a/src/mame/drivers/tasman.c b/src/mame/drivers/tasman.c index 8bf2c876674..bf46c41665e 100644 --- a/src/mame/drivers/tasman.c +++ b/src/mame/drivers/tasman.c @@ -183,7 +183,7 @@ static ADDRESS_MAP_START( kongambl_map, AS_PROGRAM, 32, kongambl_state ) AM_RANGE(0x440000, 0x443fff) AM_RAM // OBJ RAM - AM_RANGE(0x460000, 0x47ffff) AM_RAM_WRITE(konamigx_palette_w) AM_SHARE("paletteram") + AM_RANGE(0x460000, 0x47ffff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x4b001c, 0x4b001f) AM_WRITENOP @@ -590,7 +590,8 @@ static MACHINE_CONFIG_START( kongambl, kongambl_state ) MCFG_SCREEN_UPDATE_DRIVER(kongambl_state, screen_update_kongambl) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD("palette", 0x8000) + MCFG_PALETTE_ADD("palette", 32768) + MCFG_PALETTE_FORMAT(XRGB) MCFG_VIDEO_START_OVERRIDE(kongambl_state,kongambl) diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 705d809b497..61bf5a11037 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -96,8 +96,6 @@ public: DECLARE_WRITE16_MEMBER(K053990_martchmp_word_w); DECLARE_WRITE32_MEMBER(fantjour_dma_w); DECLARE_WRITE32_MEMBER(konamigx_type3_psac2_bank_w); - DECLARE_WRITE32_MEMBER(konamigx_palette_w); - DECLARE_WRITE32_MEMBER(konamigx_palette2_w); DECLARE_WRITE32_MEMBER(konamigx_555_palette_w); DECLARE_WRITE32_MEMBER(konamigx_555_palette2_w); DECLARE_WRITE32_MEMBER(konamigx_tilebank_w); diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 2897a11a62a..f87156e3b01 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -1557,37 +1557,6 @@ UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitma return 0; } - -WRITE32_MEMBER(konamigx_state::konamigx_palette_w) -{ - int r,g,b; - - COMBINE_DATA(&m_generic_paletteram_32[offset]); - - r = (m_generic_paletteram_32[offset] >>16) & 0xff; - g = (m_generic_paletteram_32[offset] >> 8) & 0xff; - b = (m_generic_paletteram_32[offset] >> 0) & 0xff; - - m_palette->set_pen_color(offset,rgb_t(r,g,b)); -} - -#ifdef UNUSED_FUNCTION -WRITE32_MEMBER(konamigx_state::konamigx_palette2_w) -{ - int r,g,b; - - COMBINE_DATA(&m_subpaletteram32[offset]); - - r = (m_subpaletteram32[offset] >>16) & 0xff; - g = (m_subpaletteram32[offset] >> 8) & 0xff; - b = (m_subpaletteram32[offset] >> 0) & 0xff; - - offset += (0x8000/4); - - m_palette->set_pen_color(offset,rgb_t(r,g,b)); -} -#endif - INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data) { palette.set_pen_color(color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift)); @@ -1620,7 +1589,6 @@ WRITE32_MEMBER(konamigx_state::konamigx_555_palette2_w) } #endif - WRITE32_MEMBER(konamigx_state::konamigx_tilebank_w) { if (ACCESSING_BITS_24_31) |