diff options
Diffstat (limited to 'src/mame/drivers/atari400.cpp')
-rw-r--r-- | src/mame/drivers/atari400.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index e5867a55297..03a5c7ba990 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -42,6 +42,7 @@ #include "emu.h" #include "includes/atari400.h" + #include "cpu/m6502/m6502.h" #include "machine/6821pia.h" #include "machine/ram.h" @@ -50,9 +51,11 @@ #include "sound/dac.h" #include "sound/pokey.h" #include "sound/volt_reg.h" + #include "bus/a800/a800_slot.h" #include "bus/a800/a800_carts.h" #include "bus/a800/a8sio.h" + #include "screen.h" #include "softlist.h" #include "speaker.h" @@ -278,7 +281,7 @@ private: DECLARE_MACHINE_START(a800); DECLARE_MACHINE_START(a800xl); DECLARE_MACHINE_START(a5200); - DECLARE_PALETTE_INIT(a400); + void a400_palette(palette_device &palette) const; DECLARE_MACHINE_RESET(a400); @@ -1032,7 +1035,7 @@ dependent upon display type. * **************************************************************/ -static const uint8_t atari_palette[256*3] = +static const uint8_t atari_colors[256*3] = { /* Grey */ 0x00,0x00,0x00, 0x11,0x11,0x11, 0x22,0x22,0x22, 0x33,0x33,0x33, @@ -1118,12 +1121,10 @@ static const uint8_t atari_palette[256*3] = /* Initialise the palette */ -PALETTE_INIT_MEMBER(a400_state, a400) +void a400_state::a400_palette(palette_device &palette) const { - for (int i = 0; i < sizeof(atari_palette) / 3; i++ ) - { - palette.set_pen_color(i, atari_palette[i*3], atari_palette[i*3+1], atari_palette[i*3+2]); - } + for (unsigned i = 0; i < ARRAY_LENGTH(atari_colors) / 3; i++) + palette.set_pen_color(i, atari_colors[i * 3], atari_colors[i * 3 + 1], atari_colors[i * 3 + 2]); } /****************************************************************** PALETTE - PHASE 24.7 SHIFT @@ -2123,7 +2124,7 @@ void a400_state::atari_common_nodac(machine_config &config) m_screen->set_screen_update("antic", FUNC(antic_device::screen_update)); m_screen->set_palette("palette"); - PALETTE(config, "palette", sizeof(atari_palette) / 3).set_init(FUNC(a400_state::palette_init_a400)); + PALETTE(config, "palette", FUNC(a400_state::a400_palette), ARRAY_LENGTH(atari_colors) / 3); PIA6821(config, m_pia, 0); m_pia->readpa_handler().set_ioport("djoy_0_1"); @@ -2155,10 +2156,9 @@ void a400_state::atari_common_nodac(machine_config &config) void a400_state::atari_common(machine_config &config) { atari_common_nodac(config); + DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.03); - voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); - vref.set_output(5.0); - vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); + VOLTAGE_REGULATOR(config, "vref", 0).set_output(5.0).add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); /* internal ram */ RAM(config, m_ram).set_default_size("48K"); |