From 412a9b47830c5091e0ab876d9e03229dae641609 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 6 Nov 2017 15:57:57 +0100 Subject: zx: ts1000 display circuitry is identical to zx81, not cyan [Barry Nelson] --- src/mame/drivers/zx.cpp | 16 ++++++---------- src/mame/includes/zx.h | 6 +++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index b68e33bdb3d..521dcaa6356 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -1,7 +1,8 @@ // license:GPL-2.0+ // copyright-holders: Olivier Galibert, Juergen Buchmueller, Krzysztof Strzecha, Robbbert /*************************************************************************** - zx.c + + ZX-80/ZX-81 and derivatives Original driver by: Juergen Buchmueller, Dec 1999 @@ -81,6 +82,7 @@ static ADDRESS_MAP_START( pow3000_io_map, AS_IO, 8, zx_state ) AM_RANGE(0x0000, 0xffff) AM_READWRITE(pow3000_io_r, zx81_io_w) ADDRESS_MAP_END + /* Input Ports */ static INPUT_PORTS_START( zx80 ) @@ -307,18 +309,14 @@ INPUT_PORTS_END /* Palette Initialization */ - PALETTE_INIT_MEMBER(zx_state, zx) { palette.set_pen_color(0, rgb_t::white()); palette.set_pen_color(1, rgb_t::black()); } -PALETTE_INIT_MEMBER(zx_state,ts1000) -{ - palette.set_pen_color(0, rgb_t(64, 244, 244)); /* cyan */ - palette.set_pen_color(1, rgb_t::black()); -} + +/* Machine Configs */ static MACHINE_CONFIG_START( zx80 ) /* basic machine hardware */ @@ -383,9 +381,6 @@ static MACHINE_CONFIG_DERIVED( zx81_spk, zx81 ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ts1000, zx81 ) - MCFG_PALETTE_MODIFY("palette") - MCFG_PALETTE_INIT_OWNER(zx_state, ts1000) - /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2K") @@ -492,6 +487,7 @@ ROM_START( zx97 ) ROM_LOAD( "zx97.rom", 0x0000, 0x8000, CRC(5cf49744) SHA1(b2a486efdc7b2bc3dc8e5a441ea5532bfa3207bd) ) ROM_END + /* Game Drivers */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index 46a18196e4b..0d31dbbb4fa 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -2,7 +2,7 @@ // copyright-holders:Juergen Buchmueller, Krzysztof Strzecha, Robbbert /***************************************************************************** * - * includes/zx.h + * ZX-80/ZX-81 and derivatives * ****************************************************************************/ @@ -43,7 +43,8 @@ public: m_io_row6(*this, "ROW6"), m_io_row7(*this, "ROW7"), m_io_config(*this, "CONFIG"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -60,7 +61,6 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(zx); - DECLARE_PALETTE_INIT(ts1000); void zx_tape_input(); void zx_ula_hsync(); -- cgit v1.2.3