diff options
Diffstat (limited to 'src/mame/drivers/silkroad.c')
-rw-r--r-- | src/mame/drivers/silkroad.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index a53e09ec0d9..b71cbc1d937 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -127,10 +127,10 @@ ROM15.BIN MX29F1610, SOP44 Surface Mounted Mask ROM / */ -static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) +WRITE32_MEMBER(silkroad_state::paletteram32_xRRRRRGGGGGBBBBB_dword_w) { - COMBINE_DATA(&space->machine().generic.paletteram.u32[offset]); - palette_set_color_rgb(space->machine(),offset,pal5bit(space->machine().generic.paletteram.u32[offset] >> (10+16)),pal5bit(space->machine().generic.paletteram.u32[offset] >> (5+16)),pal5bit(space->machine().generic.paletteram.u32[offset] >> (0+16))); + COMBINE_DATA(&machine().generic.paletteram.u32[offset]); + palette_set_color_rgb(machine(),offset,pal5bit(machine().generic.paletteram.u32[offset] >> (10+16)),pal5bit(machine().generic.paletteram.u32[offset] >> (5+16)),pal5bit(machine().generic.paletteram.u32[offset] >> (0+16))); } static WRITE32_DEVICE_HANDLER(silk_6295_bank_w) @@ -143,19 +143,19 @@ static WRITE32_DEVICE_HANDLER(silk_6295_bank_w) } } -static WRITE32_HANDLER(silk_coin_counter_w) +WRITE32_MEMBER(silkroad_state::silk_coin_counter_w) { if (ACCESSING_BITS_16_23) { - coin_counter_w(space->machine(), 0, data & 0x10000); - coin_counter_w(space->machine(), 1, data & 0x80000); + coin_counter_w(machine(), 0, data & 0x10000); + coin_counter_w(machine(), 1, data & 0x80000); } } static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32, silkroad_state ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x40c000, 0x40cfff) AM_RAM AM_BASE(m_sprram) // sprites - AM_RANGE(0x600000, 0x603fff) AM_RAM_WRITE_LEGACY(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE_GENERIC(paletteram) // palette + AM_RANGE(0x600000, 0x603fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE_GENERIC(paletteram) // palette AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(silkroad_fgram_w) AM_BASE(m_vidram) // lower Layer AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE_LEGACY(silkroad_fgram2_w) AM_BASE(m_vidram2) // mid layer AM_RANGE(0x808000, 0x80bfff) AM_RAM_WRITE_LEGACY(silkroad_fgram3_w) AM_BASE(m_vidram3) // higher layer @@ -165,7 +165,7 @@ static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32, silkroad_state ) AM_RANGE(0xc00028, 0xc0002f) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2151_r, ym2151_w, 0x00ff0000) AM_RANGE(0xc00030, 0xc00033) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff0000) AM_RANGE(0xc00034, 0xc00037) AM_DEVWRITE_LEGACY("oki1", silk_6295_bank_w) - AM_RANGE(0xc00038, 0xc0003b) AM_WRITE_LEGACY(silk_coin_counter_w) + AM_RANGE(0xc00038, 0xc0003b) AM_WRITE(silk_coin_counter_w) AM_RANGE(0xc0010c, 0xc00123) AM_WRITEONLY AM_BASE(m_regs) AM_RANGE(0xfe0000, 0xffffff) AM_RAM ADDRESS_MAP_END |