From 41f1661876f163c0cb01d678b19920edd0b86358 Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 6 Feb 2016 21:42:36 +0100 Subject: [PATCH] Revert "New NOT_WORKING machine added" This reverts commit 5b0fcf599756c93a64539b5e2d048273a42b9f92. --- scripts/target/mame/mess.lua | 1 - src/mame/drivers/ctteach.cpp | 116 ---------------------------------- src/mame/drivers/hh_tms1k.cpp | 2 +- src/mame/mess.lst | 9 ++- 4 files changed, 5 insertions(+), 123 deletions(-) delete mode 100644 src/mame/drivers/ctteach.cpp diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 453b01028b8..f89b2b0557e 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1464,7 +1464,6 @@ files { MAME_DIR .. "src/mame/includes/coleco.h", MAME_DIR .. "src/mame/machine/coleco.cpp", MAME_DIR .. "src/mame/machine/coleco.h", - MAME_DIR .. "src/mame/drivers/ctteach.cpp", } createMESSProjects(_target, _subtarget, "cromemco") diff --git a/src/mame/drivers/ctteach.cpp b/src/mame/drivers/ctteach.cpp deleted file mode 100644 index 027269f0b7c..00000000000 --- a/src/mame/drivers/ctteach.cpp +++ /dev/null @@ -1,116 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:hap -/*************************************************************************** - - ** subclass of hh_tms1k_state (includes/hh_tms1k.h, drivers/hh_tms1k.cpp) ** - - Coleco Talking Teacher - * - -***************************************************************************/ - -#include "includes/hh_tms1k.h" - - -class ctteach_state : public hh_tms1k_state -{ -public: - ctteach_state(const machine_config &mconfig, device_type type, const char *tag) - : hh_tms1k_state(mconfig, type, tag) - { } - - DECLARE_WRITE16_MEMBER(write_r); - DECLARE_WRITE16_MEMBER(write_o); - DECLARE_READ8_MEMBER(read_k); - -protected: - virtual void machine_start() override; -}; - - -/*************************************************************************** - - I/O - -***************************************************************************/ - -WRITE16_MEMBER(ctteach_state::write_r) -{ -} - -WRITE16_MEMBER(ctteach_state::write_o) -{ -} - -READ8_MEMBER(ctteach_state::read_k) -{ - return 0; -} - - - -/*************************************************************************** - - Inputs - -***************************************************************************/ - -static INPUT_PORTS_START( ctteach ) - -INPUT_PORTS_END - - - -/*************************************************************************** - - Machine Config - -***************************************************************************/ - -void ctteach_state::machine_start() -{ - hh_tms1k_state::machine_start(); - - // zerofill - - // register for savestates -} - - -static MACHINE_CONFIG_START( ctteach, ctteach_state ) - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", TMS1400, 400000) // approximation - MCFG_TMS1XXX_READ_K_CB(READ8(ctteach_state, read_k)) - MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ctteach_state, write_r)) - MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ctteach_state, write_o)) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) -MACHINE_CONFIG_END - - - -/*************************************************************************** - - Game driver(s) - -***************************************************************************/ - -ROM_START( ctteach ) - ROM_REGION( 0x1000, "maincpu", 0 ) - ROM_LOAD( "mp7324", 0x0000, 0x1000, CRC(08d15ab6) SHA1(5b0f6c53e6732a362c4bb25d966d4072fdd33db8) ) - - ROM_REGION( 867, "maincpu:mpla", 0 ) - ROM_LOAD( "tms1100_common1_micro.pla", 0, 867, CRC(62445fc9) SHA1(d6297f2a4bc7a870b76cc498d19dbb0ce7d69fec) ) - ROM_REGION( 557, "maincpu:opla", 0 ) - ROM_LOAD( "tms1400_ctteach_output.pla", 0, 557, CRC(3a5c7005) SHA1(3fe5819c138a90e7fc12817415f2622ca81b40b2) ) - - ROM_REGION( 0x8000, "tms6100", ROMREGION_ERASEFF ) - ROM_LOAD( "cm62084.vsm", 0x0000, 0x4000, CRC(cd1376f7) SHA1(96fa484c392c451599bc083b8376cad9c998df7d) ) -ROM_END - - -COMP( 1987, ctteach, 0, 0, ctteach, ctteach, driver_device, 0, "Coleco", "Talking Teacher", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 6a35b0fe09a..9b30fd89b66 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -74,7 +74,7 @@ *MP7303 TMS1400? 19??, Tiger 7-in-1 Sports Stadium @MP7313 TMS1400 1980, Parker Brothers Bank Shot @MP7314 TMS1400 1980, Parker Brothers Split Second - MP7324 TMS1400 1987, Coleco Talking Teacher -> ctteach.cpp + *MP7324 TMS1400? 1985, Coleco Talking Teacher MP7332 TMS1400 1981, Milton Bradley Dark Tower -> mbdtower.cpp @MP7334 TMS1400 1981, Coleco Total Control 4 @MP7351 TMS1400CR 1982, Parker Brothers Master Merlin diff --git a/src/mame/mess.lst b/src/mame/mess.lst index 48e094ace26..9f41ab0709e 100644 --- a/src/mame/mess.lst +++ b/src/mame/mess.lst @@ -2314,7 +2314,6 @@ tbreakup // Tomy phpball // Tomy // hh_tms1k derivatives -ctteach // Coleco elecbowl // Marx mbdtower // Milton Bradley @@ -2333,10 +2332,6 @@ lilprof lilprof78 dataman -// hh_tms1k tispellb.cpp -spellb -mrchalgr - // hh_tms1k tispeak.cpp snspell snspellp @@ -2361,6 +2356,10 @@ tntellfr tntellp vocaid +// hh_tms1k tispellb.cpp +spellb +mrchalgr + // hh_ucom4 ufombs // Bambino ssfball // Bambino