summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/tk2000.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/tk2000.cpp')
-rw-r--r--src/mame/drivers/tk2000.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index 0c2d0b1bd40..19727c5a6d8 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -41,8 +41,8 @@
class tk2000_state : public driver_device
{
public:
- tk2000_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ tk2000_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, A2_CPU_TAG),
m_ram(*this, RAM_TAG),
m_screen(*this, "screen"),
@@ -60,7 +60,7 @@ public:
m_speaker(*this, A2_SPEAKER_TAG),
m_cassette(*this, A2_CASSETTE_TAG),
m_upperbank(*this, A2_UPPERBANK_TAG)
- { }
+ { }
void tk2000(machine_config &config);
@@ -92,7 +92,6 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(apple2_interrupt);
- DECLARE_PALETTE_INIT(tk2000);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER(ram_r);
@@ -162,11 +161,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(tk2000_state::apple2_interrupt)
}
}
-PALETTE_INIT_MEMBER(tk2000_state, tk2000)
-{
- m_video->palette_init_apple2(palette);
-}
-
uint32_t tk2000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_video->hgr_update(screen, bitmap, cliprect, 0, 191);
@@ -579,7 +573,7 @@ MACHINE_CONFIG_START(tk2000_state::tk2000)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tk2000_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL(14'318'181))
+ APPLE2_VIDEO(config, m_video, XTAL(14'318'181));
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -587,10 +581,7 @@ MACHINE_CONFIG_START(tk2000_state::tk2000)
MCFG_SCREEN_SIZE(280*2, 262)
MCFG_SCREEN_VISIBLE_AREA(0, (280*2)-1,0,192-1)
MCFG_SCREEN_UPDATE_DRIVER(tk2000_state, screen_update)
- MCFG_SCREEN_PALETTE("palette")
-
- MCFG_PALETTE_ADD("palette", 16)
- MCFG_PALETTE_INIT_OWNER(tk2000_state, tk2000)
+ MCFG_SCREEN_PALETTE(m_video)
/* sound hardware */
SPEAKER(config, "mono").front_center();