diff options
Diffstat (limited to 'src/mame/drivers/mz2500.cpp')
-rw-r--r-- | src/mame/drivers/mz2500.cpp | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index 9ec57559e98..73bbf18b4d4 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -42,7 +42,7 @@ #define WRAM_RESET 0 #define IPL_RESET 1 -static const uint8_t bank_reset_val[2][8] = +static constexpr uint8_t bank_reset_val[2][8] = { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, { 0x34, 0x35, 0x36, 0x37, 0x04, 0x05, 0x06, 0x07 } @@ -1730,42 +1730,36 @@ WRITE8_MEMBER(mz2500_state::opn_porta_w) m_ym_porta = data; } -PALETTE_INIT_MEMBER(mz2500_state, mz2500) +void mz2500_state::mz2500_palette(palette_device &palette) const { - int i; - - for(i=0;i<0x200;i++) + for (int i = 0; i < 0x200; i++) palette.set_pen_color(i,pal1bit(0),pal1bit(0),pal1bit(0)); - /* set up 8 colors (PCG) */ - for(i=0;i<8;i++) - m_palette->set_pen_color(i+8,pal1bit((i & 2)>>1),pal1bit((i & 4)>>2),pal1bit((i & 1)>>0)); + // set up 8 colors (PCG) + for (int i = 0; i < 8; i++) + palette.set_pen_color(i+8,pal1bit((i & 2)>>1),pal1bit((i & 4)>>2),pal1bit((i & 1)>>0)); - /* set up 16 colors (PCG / CG) */ + // set up 16 colors (PCG / CG) - /* set up 256 colors (CG) */ + // set up 256 colors (CG) + for (int i = 0; i < 0x100; i++) { - int r,g,b; - - for(i = 0;i < 0x100;i++) - { - int bit0,bit1,bit2; - - bit0 = pal_256_param(i,0) ? 1 : 0; - bit1 = i & 0x01 ? 2 : 0; - bit2 = i & 0x10 ? 4 : 0; - b = bit0|bit1|bit2; - bit0 = pal_256_param(i,0) ? 1 : 0; - bit1 = i & 0x02 ? 2 : 0; - bit2 = i & 0x20 ? 4 : 0; - r = bit0|bit1|bit2; - bit0 = pal_256_param(i,0) ? 1 : 0; - bit1 = i & 0x04 ? 2 : 0; - bit2 = i & 0x40 ? 4 : 0; - g = bit0|bit1|bit2; - - m_palette->set_pen_color(i+0x100,pal3bit(r),pal3bit(g),pal3bit(b)); - } + int bit0, bit1, bit2; + + bit0 = pal_256_param(i,0) ? 1 : 0; + bit1 = i & 0x01 ? 2 : 0; + bit2 = i & 0x10 ? 4 : 0; + int const b = bit0|bit1|bit2; + bit0 = pal_256_param(i,0) ? 1 : 0; + bit1 = i & 0x02 ? 2 : 0; + bit2 = i & 0x20 ? 4 : 0; + int const r = bit0|bit1|bit2; + bit0 = pal_256_param(i,0) ? 1 : 0; + bit1 = i & 0x04 ? 2 : 0; + bit2 = i & 0x40 ? 4 : 0; + int const g = bit0|bit1|bit2; + + palette.set_pen_color(i + 0x100, pal3bit(r), pal3bit(g), pal3bit(b)); } } @@ -1845,12 +1839,11 @@ MACHINE_CONFIG_START(mz2500_state::mz2500) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(21'477'272, 640+108, 0, 640, 480, 0, 200) //unknown clock / divider MCFG_SCREEN_UPDATE_DRIVER(mz2500_state, screen_update_mz2500) - MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_PALETTE(m_palette) - MCFG_PALETTE_ADD("palette", 0x200) - MCFG_PALETTE_INIT_OWNER(mz2500_state, mz2500) + PALETTE(config, m_palette, FUNC(mz2500_state::mz2500_palette), 0x200); - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz2500) + GFXDECODE(config, m_gfxdecode, m_palette, gfx_mz2500); SPEAKER(config, "mono").front_center(); |