summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Dirk Best <mail@dirk-best.de>2015-08-02 23:00:32 +0200
committer Dirk Best <mail@dirk-best.de>2015-08-02 23:57:40 +0200
commitd0886d180ec7798e67cfd0dceee22704b81b217c (patch)
tree2b504c04984fe7a617af9b14bec8cdbbb0828083
parente7415c85a84d9f257d3c0486eec2cb2c478c8495 (diff)
djmain: use standard palette device ram
-rw-r--r--src/mame/drivers/djmain.c21
-rw-r--r--src/mame/includes/djmain.h5
2 files changed, 3 insertions, 23 deletions
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 2bbdf3750a2..600fa4a4011 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -86,23 +86,6 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB
*
*************************************/
-WRITE32_MEMBER(djmain_state::paletteram32_w)
-{
- int r,g,b;
-
- COMBINE_DATA(&m_generic_paletteram_32[offset]);
- data = m_generic_paletteram_32[offset];
-
- r = (data >> 0) & 0xff;
- g = (data >> 8) & 0xff;
- b = (data >> 16) & 0xff;
-
- m_palette->set_pen_color(offset, rgb_t(r, g, b));
-}
-
-
-//---------
-
void djmain_state::sndram_set_bank()
{
m_sndram = memregion("shared")->base() + 0x80000 * m_sndram_bank;
@@ -396,8 +379,7 @@ WRITE_LINE_MEMBER( djmain_state::ide_interrupt )
static ADDRESS_MAP_START( maincpu_djmain, AS_PROGRAM, 32, djmain_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // PRG ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // WORK RAM
- AM_RANGE(0x480000, 0x48443f) AM_RAM_WRITE(paletteram32_w) // COLOR RAM
- AM_SHARE("paletteram")
+ AM_RANGE(0x480000, 0x48443f) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") // COLOR RAM
AM_RANGE(0x500000, 0x57ffff) AM_READWRITE(sndram_r, sndram_w) // SOUND RAM
AM_RANGE(0x580000, 0x58003f) AM_DEVREADWRITE("k056832", k056832_device, long_r, long_w) // VIDEO REG (tilemap)
AM_RANGE(0x590000, 0x590007) AM_WRITE(unknown590000_w) // ??
@@ -1416,6 +1398,7 @@ static MACHINE_CONFIG_START( djmainj, djmain_state )
MCFG_SCREEN_UPDATE_DRIVER(djmain_state, screen_update_djmain)
MCFG_PALETTE_ADD("palette", 0x4440/4)
+ MCFG_PALETTE_FORMAT(XBGR)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", djmain)
MCFG_DEVICE_ADD("k056832", K056832, 0)
diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h
index 975b2f34dae..9b1bb3a0b97 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -16,8 +16,7 @@ public:
m_k055555(*this, "k055555"),
m_ata(*this, "ata"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette"),
- m_generic_paletteram_32(*this, "paletteram")
+ m_palette(*this, "palette")
{
}
@@ -32,7 +31,6 @@ public:
const UINT8 *m_ata_user_password;
const UINT8 *m_ata_master_password;
required_shared_ptr<UINT32> m_obj_ram;
- DECLARE_WRITE32_MEMBER(paletteram32_w);
DECLARE_WRITE32_MEMBER(sndram_bank_w);
DECLARE_READ32_MEMBER(sndram_r);
DECLARE_WRITE32_MEMBER(sndram_w);
@@ -76,6 +74,5 @@ public:
required_device<ata_interface_device> m_ata;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- required_shared_ptr<UINT32> m_generic_paletteram_32;
K056832_CB_MEMBER(tile_callback);
};