Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 01:18:59 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

zx: ts1000 display circuitry is identical to zx81, not cyan [Barry Nelson]

Browse Source
This commit is contained in:
hap 2017-11-06 15:57:57 +01:00
parent ad83fd8b3e
commit 412a9b4783
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mame/drivers/zx.cpp
View File

@ -1,7 +1,8 @@
// license:GPL-2.0+ // license:GPL-2.0+
// copyright-holders: Olivier Galibert, Juergen Buchmueller, Krzysztof Strzecha, Robbbert // copyright-holders: Olivier Galibert, Juergen Buchmueller, Krzysztof Strzecha, Robbbert
/*************************************************************************** /***************************************************************************
zx.c
ZX-80/ZX-81 and derivatives
Original driver by: Original driver by:
Juergen Buchmueller, Dec 1999 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) AM_RANGE(0x0000, 0xffff) AM_READWRITE(pow3000_io_r, zx81_io_w)
ADDRESS_MAP_END ADDRESS_MAP_END
/* Input Ports */ /* Input Ports */
static INPUT_PORTS_START( zx80 ) static INPUT_PORTS_START( zx80 )
@ -307,18 +309,14 @@ INPUT_PORTS_END
/* Palette Initialization */ /* Palette Initialization */
PALETTE_INIT_MEMBER(zx_state, zx) PALETTE_INIT_MEMBER(zx_state, zx)
{ {
palette.set_pen_color(0, rgb_t::white()); palette.set_pen_color(0, rgb_t::white());
palette.set_pen_color(1, rgb_t::black()); palette.set_pen_color(1, rgb_t::black());
} }
PALETTE_INIT_MEMBER(zx_state,ts1000)
{ /* Machine Configs */
palette.set_pen_color(0, rgb_t(64, 244, 244)); /* cyan */
palette.set_pen_color(1, rgb_t::black());
}
static MACHINE_CONFIG_START( zx80 ) static MACHINE_CONFIG_START( zx80 )
/* basic machine hardware */ /* basic machine hardware */
@ -383,9 +381,6 @@ static MACHINE_CONFIG_DERIVED( zx81_spk, zx81 )
MACHINE_CONFIG_END MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ts1000, zx81 ) static MACHINE_CONFIG_DERIVED( ts1000, zx81 )
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(zx_state, ts1000)
/* internal ram */ /* internal ram */
MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2K") MCFG_RAM_DEFAULT_SIZE("2K")
@ -492,6 +487,7 @@ ROM_START( zx97 )
ROM_LOAD( "zx97.rom", 0x0000, 0x8000, CRC(5cf49744) SHA1(b2a486efdc7b2bc3dc8e5a441ea5532bfa3207bd) ) ROM_LOAD( "zx97.rom", 0x0000, 0x8000, CRC(5cf49744) SHA1(b2a486efdc7b2bc3dc8e5a441ea5532bfa3207bd) )
ROM_END ROM_END
/* Game Drivers */ /* Game Drivers */
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS

6
src/mame/includes/zx.h
View File

@ -2,7 +2,7 @@
// copyright-holders:Juergen Buchmueller, Krzysztof Strzecha, Robbbert // 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_row6(*this, "ROW6"),
m_io_row7(*this, "ROW7"), m_io_row7(*this, "ROW7"),
m_io_config(*this, "CONFIG"), 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); 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 machine_reset() override;
virtual void video_start() override; virtual void video_start() override;
DECLARE_PALETTE_INIT(zx); DECLARE_PALETTE_INIT(zx);
DECLARE_PALETTE_INIT(ts1000);
void zx_tape_input(); void zx_tape_input();
void zx_ula_hsync(); void zx_ula_hsync();