From dc9a1dbbabd5ae854107025c4bc1a62cb2ebb649 Mon Sep 17 00:00:00 2001 From: hap Date: Thu, 19 Jan 2023 19:24:57 +0100 Subject: k28m2: move module notes to hash file --- hash/k28m2.xml | 18 ++++++++++++++ src/mame/handheld/hh_cop400.cpp | 4 ++-- src/mame/handheld/hh_cops1.cpp | 4 ++-- src/mame/handheld/hh_hmcs40.cpp | 4 ++-- src/mame/handheld/hh_melps4.cpp | 4 ++-- src/mame/handheld/hh_pic16.cpp | 4 ++-- src/mame/handheld/hh_pps41.cpp | 4 ++-- src/mame/handheld/hh_rw5000.cpp | 4 ++-- src/mame/handheld/hh_ucom4.cpp | 4 ++-- src/mame/ti/spellb.cpp | 32 ++++++++++++------------- src/mame/tiger/k28.cpp | 41 ++++++++++++++++--------------- src/mame/tiger/k28m2.cpp | 53 ++++++++++++++++------------------------- 12 files changed, 92 insertions(+), 84 deletions(-) diff --git a/hash/k28m2.xml b/hash/k28m2.xml index 31208a3a0ef..c176906ebf3 100644 --- a/hash/k28m2.xml +++ b/hash/k28m2.xml @@ -4,6 +4,24 @@ license:CC0-1.0 --> + + diff --git a/src/mame/handheld/hh_cop400.cpp b/src/mame/handheld/hh_cop400.cpp index 1094cd6a473..498cf2f05b7 100644 --- a/src/mame/handheld/hh_cop400.cpp +++ b/src/mame/handheld/hh_cop400.cpp @@ -53,6 +53,8 @@ TODO: //#include "hh_cop400_test.lh" // common test-layout - use external artwork +namespace { + class hh_cop400_state : public driver_device { public: @@ -142,8 +144,6 @@ INPUT_CHANGED_MEMBER(hh_cop400_state::reset_button) ***************************************************************************/ -namespace { - /*************************************************************************** Castle Toy Einstein diff --git a/src/mame/handheld/hh_cops1.cpp b/src/mame/handheld/hh_cops1.cpp index 22bacc2a7fe..89241fd902e 100644 --- a/src/mame/handheld/hh_cops1.cpp +++ b/src/mame/handheld/hh_cops1.cpp @@ -39,6 +39,8 @@ TODO: //#include "hh_cops1_test.lh" // common test-layout - use external artwork +namespace { + class hh_cops1_state : public driver_device { public: @@ -120,8 +122,6 @@ u8 hh_cops1_state::read_inputs(int columns) ***************************************************************************/ -namespace { - /*************************************************************************** Mattel Basketball (model 2437) diff --git a/src/mame/handheld/hh_hmcs40.cpp b/src/mame/handheld/hh_hmcs40.cpp index 12c4c222019..a6ea777bc27 100644 --- a/src/mame/handheld/hh_hmcs40.cpp +++ b/src/mame/handheld/hh_hmcs40.cpp @@ -148,6 +148,8 @@ TODO: #include "hh_hmcs40_test.lh" // common test-layout - no svg artwork(yet), use external artwork +namespace { + class hh_hmcs40_state : public driver_device { public: @@ -261,8 +263,6 @@ INPUT_CHANGED_MEMBER(hh_hmcs40_state::single_interrupt_line) ***************************************************************************/ -namespace { - /*************************************************************************** Actronics / Hanzawa Wanted G-Man diff --git a/src/mame/handheld/hh_melps4.cpp b/src/mame/handheld/hh_melps4.cpp index 51f7741d6c6..b6f77b43373 100644 --- a/src/mame/handheld/hh_melps4.cpp +++ b/src/mame/handheld/hh_melps4.cpp @@ -23,6 +23,8 @@ TODO: //#include "hh_melps4_test.lh" // common test-layout - no svg artwork(yet), use external artwork +namespace { + class hh_melps4_state : public driver_device { public: @@ -106,8 +108,6 @@ INPUT_CHANGED_MEMBER(hh_melps4_state::reset_button) ***************************************************************************/ -namespace { - /*************************************************************************** Coleco Frogger (manufactured in Japan, licensed from Sega) diff --git a/src/mame/handheld/hh_pic16.cpp b/src/mame/handheld/hh_pic16.cpp index 1a49dacecde..f08846807f6 100644 --- a/src/mame/handheld/hh_pic16.cpp +++ b/src/mame/handheld/hh_pic16.cpp @@ -87,6 +87,8 @@ TODO: #include "hh_pic16_test.lh" // common test-layout - use external artwork +namespace { + class hh_pic16_state : public driver_device { public: @@ -205,8 +207,6 @@ void hh_pic16_state::set_power(bool state) ***************************************************************************/ -namespace { - /*************************************************************************** Atari Touch Me diff --git a/src/mame/handheld/hh_pps41.cpp b/src/mame/handheld/hh_pps41.cpp index 21603912d52..85f1f226671 100644 --- a/src/mame/handheld/hh_pps41.cpp +++ b/src/mame/handheld/hh_pps41.cpp @@ -39,6 +39,8 @@ ROM source notes when dumped from another title, but confident it's the same: //#include "hh_pps41_test.lh" // common test-layout - use external artwork +namespace { + class hh_pps41_state : public driver_device { public: @@ -124,8 +126,6 @@ INPUT_CHANGED_MEMBER(hh_pps41_state::reset_button) ***************************************************************************/ -namespace { - /*************************************************************************** Fonas Tri-1 diff --git a/src/mame/handheld/hh_rw5000.cpp b/src/mame/handheld/hh_rw5000.cpp index fc91dd9165c..0833632e1a7 100644 --- a/src/mame/handheld/hh_rw5000.cpp +++ b/src/mame/handheld/hh_rw5000.cpp @@ -42,6 +42,8 @@ ROM source notes when dumped from another title, but confident it's the same: //#include "hh_rw5000_test.lh" // common test-layout - use external artwork +namespace { + class hh_rw5000_state : public driver_device { public: @@ -143,8 +145,6 @@ INPUT_CHANGED_MEMBER(hh_rw5000_state::power_button) ***************************************************************************/ -namespace { - /*************************************************************************** Mattel Auto Race (model 9879) diff --git a/src/mame/handheld/hh_ucom4.cpp b/src/mame/handheld/hh_ucom4.cpp index 033a9cc596c..139ba8e91a3 100644 --- a/src/mame/handheld/hh_ucom4.cpp +++ b/src/mame/handheld/hh_ucom4.cpp @@ -116,6 +116,8 @@ ROM source notes when dumped from another title, but confident it's the same: //#include "hh_ucom4_test.lh" // common test-layout - no svg artwork(yet), use external artwork +namespace { + class hh_ucom4_state : public driver_device { public: @@ -238,8 +240,6 @@ INPUT_CHANGED_MEMBER(hh_ucom4_state::single_interrupt_line) ***************************************************************************/ -namespace { - /*************************************************************************** Bambino UFO Master-Blaster Station (manufactured in Japan) diff --git a/src/mame/ti/spellb.cpp b/src/mame/ti/spellb.cpp index 750c8bb0ba6..0aa42c374c5 100644 --- a/src/mame/ti/spellb.cpp +++ b/src/mame/ti/spellb.cpp @@ -1,12 +1,12 @@ // license:BSD-3-Clause // copyright-holders:hap // thanks-to:Sean Riddle -/*************************************************************************** +/******************************************************************************* Texas Instruments Spelling B hardware -The Spelling B was introduced together with the Speak & Spell. It is a -handheld educational toy with booklet. Two revisions of the hardware exist. +The Spelling B was introduced together with the Speak & Spell. It is a handheld +educational toy with booklet. Two revisions of the hardware exist. 1st version: @@ -46,7 +46,7 @@ Letterlogic (France), 1980: different VSM Letterlogic (Germany), 1980: different VSM - TMC0355 4KB VSM ROM CD2604 -***************************************************************************/ +*******************************************************************************/ #include "emu.h" @@ -88,8 +88,8 @@ protected: private: // devices - required_device m_maincpu; - optional_device m_subcpu; + required_device m_maincpu; + optional_device m_subcpu; optional_device m_tms6100; required_device m_display; optional_device m_speaker; @@ -135,9 +135,9 @@ void spellb_state::machine_start() -/****************************************************************************** +/******************************************************************************* Power -******************************************************************************/ +*******************************************************************************/ void spellb_state::machine_reset() { @@ -169,9 +169,9 @@ void spellb_state::power_subcpu() -/****************************************************************************** +/******************************************************************************* I/O -******************************************************************************/ +*******************************************************************************/ // common @@ -282,9 +282,9 @@ void spellb_state::rev2_write_r(u32 data) -/****************************************************************************** +/******************************************************************************* Input Ports -******************************************************************************/ +*******************************************************************************/ static INPUT_PORTS_START( spellb ) PORT_START("IN.0") // R0 @@ -476,9 +476,9 @@ void spellb_state::rev2(machine_config &config) -/****************************************************************************** +/******************************************************************************* ROM Definitions -******************************************************************************/ +*******************************************************************************/ ROM_START( spellb ) ROM_REGION( 0x1000, "maincpu", 0 ) @@ -582,9 +582,9 @@ ROM_END -/****************************************************************************** +/******************************************************************************* Drivers -******************************************************************************/ +*******************************************************************************/ // YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS COMP( 1980, spellb, 0, 0, rev2, spellb, spellb_state, empty_init, "Texas Instruments", "Spelling B (US, 1980 version)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/tiger/k28.cpp b/src/mame/tiger/k28.cpp index 8b8835a3b69..3ff96675e83 100644 --- a/src/mame/tiger/k28.cpp +++ b/src/mame/tiger/k28.cpp @@ -1,24 +1,27 @@ // license:BSD-3-Clause // copyright-holders:hap // thanks-to:Kevin Horton -/****************************************************************************** +/******************************************************************************* Tiger Electronics K28: Talking Learning Computer (model 7-230/7-231) -* PCB marked PB-123 WIZARD, TIGER -* Intel P8021 MCU with 1KB internal ROM -* MM5445N VFD driver, 9-digit alphanumeric display same as snmath -* 2*TMS6100 (32KB VSM) -* SC-01-A speech chip 3 models exist: - 7-230: darkblue case, toy-ish looks - 7-231: gray case, hardware is the same - 7-232: this one is completely different hw --> driver k28m2.cpp +Hardware notes: +- PCB marked PB-123 WIZARD, TIGER +- Intel P8021 MCU with 1KB internal ROM +- MM5445N VFD driver, 9-digit alphanumeric display same as snmath +- 2*TMS6100 (32KB VSM) +- SC-01-A speech chip +- module slot + TODO: - external module support (no dumps yet) -******************************************************************************/ +*******************************************************************************/ #include "emu.h" @@ -96,9 +99,9 @@ void k28_state::machine_start() -/****************************************************************************** +/******************************************************************************* Power -******************************************************************************/ +*******************************************************************************/ void k28_state::machine_reset() { @@ -123,9 +126,9 @@ void k28_state::power_off() -/****************************************************************************** +/******************************************************************************* I/O -******************************************************************************/ +*******************************************************************************/ // MM5445 VFD @@ -208,9 +211,9 @@ void k28_state::mcu_p2_w(u8 data) -/****************************************************************************** +/******************************************************************************* Input Ports -******************************************************************************/ +*******************************************************************************/ static INPUT_PORTS_START( k28 ) PORT_START("IN.0") @@ -286,9 +289,9 @@ INPUT_PORTS_END -/****************************************************************************** +/******************************************************************************* Machine Configs -******************************************************************************/ +*******************************************************************************/ void k28_state::k28(machine_config &config) { @@ -318,9 +321,9 @@ void k28_state::k28(machine_config &config) -/****************************************************************************** +/******************************************************************************* ROM Definitions -******************************************************************************/ +*******************************************************************************/ ROM_START( k28 ) ROM_REGION( 0x1000, "maincpu", 0 ) @@ -335,9 +338,9 @@ ROM_END -/****************************************************************************** +/******************************************************************************* Drivers -******************************************************************************/ +*******************************************************************************/ // YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS COMP( 1981, k28, 0, 0, k28, k28, k28_state, empty_init, "Tiger Electronics", "K28: Talking Learning Computer (model 7-230)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/tiger/k28m2.cpp b/src/mame/tiger/k28m2.cpp index 5bcb04f7fa7..3b009fb3bf7 100644 --- a/src/mame/tiger/k28m2.cpp +++ b/src/mame/tiger/k28m2.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:hap // thanks-to:Sean Riddle, David Viens, Kevin Horton -/****************************************************************************** +/******************************************************************************* Tiger Electronics K28 (model 7-232) Sold in Hong Kong, distributed in US as: - Coleco: Talking Teacher @@ -10,31 +10,18 @@ Tiger Electronics K28 (model 7-232) Sold in Hong Kong, distributed in US as: 1981 K28 models 7-230 and 7-231 are on different hardware, showing a different keyboard, VFD, and use the SC-01 speech chip. --> driver k28.cpp -TODO: -- emulate LCD - -------------------------------------------------------------------------------- - Hardware notes: - MCU: TMS1400 MP7324 (die label: TMS1400, MP7324, 28L 01D D000 R100) - TMS51xx: TMS5110A - VSM: 16KB CM62084 - LCD: SMOS SMC1112 MCU to 8*14-seg display +- module slot (not compatible with the 1981 version(s)) -K28 modules: (* denotes not dumped) -- Spelling I: VSM: 16KB CM62086 -- Spelling II: VSM: 16KB CM62085? -- Spelling III: VSM: 16KB CM62087 -- Expansion Module 1: VSM: 16KB CM62214? - assumed same VSM as CM62086 -- Expansion Module 2: VSM: 16KB CM62216 - assumed same VSM as the one in Spelling II -- Expansion Module 3: VSM: 16KB CM62215 - same VSM as CM62087 -- Expansion Module 4: VSM: 16KB CM62217 -- Expansion Module 5: VSM: 16KB CM62218* -- Expansion Module 6: VSM: 16KB CM62219 - -note: these won't work on the 1981 version(s) +TODO: +- emulate LCD +- dump/add module #5 -******************************************************************************/ +*******************************************************************************/ #include "emu.h" @@ -103,9 +90,9 @@ void k28m2_state::machine_start() -/****************************************************************************** +/******************************************************************************* Power -******************************************************************************/ +*******************************************************************************/ void k28m2_state::machine_reset() { @@ -127,9 +114,9 @@ void k28m2_state::power_off() -/****************************************************************************** +/******************************************************************************* Cartridge -******************************************************************************/ +*******************************************************************************/ DEVICE_IMAGE_LOAD_MEMBER(k28m2_state::cart_load) { @@ -149,9 +136,9 @@ DEVICE_IMAGE_LOAD_MEMBER(k28m2_state::cart_load) -/****************************************************************************** +/******************************************************************************* I/O -******************************************************************************/ +*******************************************************************************/ void k28m2_state::write_r(u32 data) { @@ -196,9 +183,9 @@ u8 k28m2_state::read_k() -/****************************************************************************** +/******************************************************************************* Input Ports -******************************************************************************/ +*******************************************************************************/ static INPUT_PORTS_START( k28m2 ) PORT_START("IN.0") // O0 @@ -258,9 +245,9 @@ INPUT_PORTS_END -/****************************************************************************** +/******************************************************************************* Machine Configs -******************************************************************************/ +*******************************************************************************/ void k28m2_state::k28m2(machine_config &config) { @@ -295,9 +282,9 @@ void k28m2_state::k28m2(machine_config &config) -/****************************************************************************** +/******************************************************************************* ROM Definitions -******************************************************************************/ +*******************************************************************************/ ROM_START( k28m2 ) ROM_REGION( 0x1000, "maincpu", 0 ) @@ -316,9 +303,9 @@ ROM_END -/****************************************************************************** +/******************************************************************************* Drivers -******************************************************************************/ +*******************************************************************************/ // YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS COMP( 1985, k28m2, 0, 0, k28m2, k28m2, k28m2_state, empty_init, "Tiger Electronics", "K28: Talking Learning Computer (model 7-232)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) -- cgit v1.2.3