diff options
Diffstat (limited to 'src/mame/drivers/supercrd.cpp')
-rw-r--r-- | src/mame/drivers/supercrd.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index c108b6033fe..ff3e1dd79d2 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -230,18 +230,18 @@ void supercrd_state::supercrd_palette(palette_device &palette) const bit0 = BIT(color_prom[i], 0); bit1 = BIT(color_prom[i], 1); bit2 = BIT(color_prom[i], 2); - int const r = combine_weights(weights_r, bit0, bit1, bit2); + int const r = combine_3_weights(weights_r, bit0, bit1, bit2); // blue component */ bit0 = BIT(color_prom[i], 3); bit1 = BIT(color_prom[i], 4); bit2 = BIT(color_prom[i], 5); - int const b = combine_weights(weights_b, bit0, bit1, bit2); + int const b = combine_3_weights(weights_b, bit0, bit1, bit2); // green component */ bit0 = BIT(color_prom[i], 6); bit1 = BIT(color_prom[i], 7); - int const g = combine_weights(weights_g, bit0, bit1); + int const g = combine_2_weights(weights_g, bit0, bit1); palette.set_pen_color(i, rgb_t(r, g, b)); } @@ -422,26 +422,25 @@ GFXDECODE_END * Machine Drivers * **************************/ -void supercrd_state::supercrd(machine_config &config) -{ +MACHINE_CONFIG_START(supercrd_state::supercrd) /* basic machine hardware */ - Z80(config, m_maincpu, MASTER_CLOCK/8); /* 2MHz, guess */ - m_maincpu->set_addrmap(AS_PROGRAM, &supercrd_state::supercrd_map); + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 2MHz, guess */ + MCFG_DEVICE_PROGRAM_MAP(supercrd_map) // NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); -// I8255(config, "ppi8255_0", 0); -// I8255(config, "ppi8255_1", 0); +// MCFG_DEVICE_ADD("ppi8255_0", I8255, 0) +// MCFG_DEVICE_ADD("ppi8255_1", I8255, 0) /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(60); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); - screen.set_size((124+1)*4, (30+1)*8); /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */ - screen.set_visarea(0*4, 96*4-1, 0*8, 29*8-1); /* Taken from MC6845 init, registers 01 & 06 */ - screen.set_screen_update(FUNC(supercrd_state::screen_update_supercrd)); - screen.set_palette("palette"); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE((124+1)*4, (30+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */ + MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06 */ + MCFG_SCREEN_UPDATE_DRIVER(supercrd_state, screen_update_supercrd) + MCFG_SCREEN_PALETTE("palette") GFXDECODE(config, m_gfxdecode, "palette", gfx_supercrd); PALETTE(config, "palette", FUNC(supercrd_state::supercrd_palette), 0x200); @@ -454,8 +453,8 @@ void supercrd_state::supercrd(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); -// .add_route(ALL_OUTPUTS, "mono", 0.75); -} +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) +MACHINE_CONFIG_END /************************* |