From 53036dc1251347ed980e578ec86fcda89905802b Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 7 Sep 2021 19:11:36 +0200 Subject: unkhorse, tamag1: add anonymous namespace --- src/mame/drivers/kinst.cpp | 7 ++--- src/mame/drivers/tamag1.cpp | 51 +++++++++++++++++++----------------- src/mame/drivers/unkhorse.cpp | 60 ++++++++++++++++++++++--------------------- 3 files changed, 62 insertions(+), 56 deletions(-) diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp index b48418ac643..9fdb18c1bd3 100644 --- a/src/mame/drivers/kinst.cpp +++ b/src/mame/drivers/kinst.cpp @@ -858,6 +858,7 @@ void kinst_state::init_kinst2() // versions selectable by changing bioses -GAME( 1994, kinst, 0, kinst, kinst, kinst_state, init_kinst, ROT0, "Rare", "Killer Instinct", MACHINE_SUPPORTS_SAVE ) -GAME( 1995, kinst2, 0, kinst2, kinst2, kinst_state, init_kinst2, ROT0, "Rare", "Killer Instinct 2", MACHINE_SUPPORTS_SAVE ) -GAME( 1996, kinst2uk, kinst2, kinst2uk, kinst2, kinst2uk_state, init_kinst2, ROT0, "Rare", "Killer Instinct 2 (upgrade kit)", MACHINE_SUPPORTS_SAVE ) +// YEAR NAME PARENT MACHINE INPUT CLASS INIT SCREEN COMPANY FULLNAME FLAGS +GAME( 1994, kinst, 0, kinst, kinst, kinst_state, init_kinst, ROT0, "Rare", "Killer Instinct", MACHINE_SUPPORTS_SAVE ) +GAME( 1996, kinst2, 0, kinst2, kinst2, kinst_state, init_kinst2, ROT0, "Rare", "Killer Instinct 2", MACHINE_SUPPORTS_SAVE ) +GAME( 1996, kinst2uk, kinst2, kinst2uk, kinst2, kinst2uk_state, init_kinst2, ROT0, "Rare", "Killer Instinct 2 (upgrade kit)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp index a0f77f5df63..889871c014c 100644 --- a/src/mame/drivers/tamag1.cpp +++ b/src/mame/drivers/tamag1.cpp @@ -1,17 +1,19 @@ // license:BSD-3-Clause // copyright-holders:hap // thanks-to:digshadow, segher -/*************************************************************************** +/******************************************************************************* Bandai Tamagotchi generation 1 hardware * PCB label TMG-M1 * Seiko Epson E0C6S46 MCU under epoxy -***************************************************************************/ +*******************************************************************************/ #include "emu.h" + #include "cpu/e0c6200/e0c6s46.h" #include "sound/spkrdev.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" @@ -19,6 +21,8 @@ #include "tama.lh" +namespace { + class tamag1_state : public driver_device { public: @@ -48,11 +52,9 @@ void tamag1_state::machine_start() } -/*************************************************************************** - - Video - -***************************************************************************/ +/******************************************************************************* + Video +*******************************************************************************/ E0C6S46_PIXEL_UPDATE(tamag1_state::pixel_update) { @@ -88,11 +90,9 @@ void tamag1_state::tama_palette(palette_device &palette) const -/*************************************************************************** - - Inputs - -***************************************************************************/ +/******************************************************************************* + Input Ports +*******************************************************************************/ INPUT_CHANGED_MEMBER(tamag1_state::input_changed) { @@ -113,11 +113,9 @@ INPUT_PORTS_END -/*************************************************************************** - - Machine Config - -***************************************************************************/ +/******************************************************************************* + Machine Configs +*******************************************************************************/ void tamag1_state::tama(machine_config &config) { @@ -145,20 +143,25 @@ void tamag1_state::tama(machine_config &config) -/*************************************************************************** - - Game driver(s) - -***************************************************************************/ +/******************************************************************************* + ROM Definitions +*******************************************************************************/ ROM_START( tama ) ROM_REGION( 0x3000, "maincpu", 0 ) - ROM_LOAD( "tama.b", 0x0000, 0x3000, CRC(5c864cb1) SHA1(4b4979cf92dc9d2fb6d7295a38f209f3da144f72) ) + ROM_LOAD( "tama.bin", 0x0000, 0x3000, CRC(5c864cb1) SHA1(4b4979cf92dc9d2fb6d7295a38f209f3da144f72) ) ROM_REGION( 0x3000, "maincpu:test", 0 ) - ROM_LOAD( "test.b", 0x0000, 0x3000, CRC(4372220e) SHA1(6e13d015113e16198c0059b9d0c38d7027ae7324) ) // this rom is on the die too, test pin enables it? + ROM_LOAD( "test.bin", 0x0000, 0x3000, CRC(4372220e) SHA1(6e13d015113e16198c0059b9d0c38d7027ae7324) ) // this rom is on the die too, test pin enables it? ROM_END +} // anonymous namespace + + + +/******************************************************************************* + Drivers +*******************************************************************************/ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS CONS( 1997, tama, 0, 0, tama, tama, tamag1_state, empty_init, "Bandai", "Tamagotchi (USA)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index ddb9c514cb7..6b38223cbb8 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -1,6 +1,6 @@ // license:BSD-3-Clause // copyright-holders:hap, Tomasz Slanina -/*************************************************************************** +/******************************************************************************* unknown Japanese horse gambling game probably early 80s, manufacturer unknown @@ -17,17 +17,21 @@ TODO: * 6-pos dipswitch on the pcb, only 4 are known at the moment - confirm colors and sound pitch -***************************************************************************/ +*******************************************************************************/ #include "emu.h" + #include "cpu/i8085/i8085.h" #include "machine/i8155.h" #include "sound/spkrdev.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" +namespace { + class horse_state : public driver_device { public: @@ -48,7 +52,7 @@ private: required_shared_ptr m_vram; std::unique_ptr m_colorram; - uint8_t m_output; + uint8_t m_output = 0; uint8_t colorram_r(offs_t offset) { return m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] | 0x0f; } void colorram_w(offs_t offset, uint8_t data) { m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] = data & 0xf0; } @@ -70,11 +74,9 @@ void horse_state::machine_start() -/*************************************************************************** - - Video - -***************************************************************************/ +/******************************************************************************* + Video +*******************************************************************************/ uint32_t horse_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { @@ -95,11 +97,9 @@ uint32_t horse_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, -/*************************************************************************** - - I/O - -***************************************************************************/ +/******************************************************************************* + I/O +*******************************************************************************/ void horse_state::horse_map(address_map &map) { @@ -131,11 +131,9 @@ void horse_state::output_w(uint8_t data) -/*************************************************************************** - - Inputs - -***************************************************************************/ +/******************************************************************************* + Input Ports +*******************************************************************************/ static INPUT_PORTS_START( horse ) PORT_START("IN.0") @@ -186,11 +184,9 @@ INPUT_PORTS_END -/*************************************************************************** - - Machine Config - -***************************************************************************/ +/******************************************************************************* + Machine Configs +*******************************************************************************/ void horse_state::horse(machine_config &config) { @@ -222,11 +218,9 @@ void horse_state::horse(machine_config &config) -/*************************************************************************** - - Game drivers - -***************************************************************************/ +/******************************************************************************* + ROM Definitions +*******************************************************************************/ ROM_START( unkhorse ) ROM_REGION( 0x04000, "maincpu", 0 ) @@ -239,5 +233,13 @@ ROM_START( unkhorse ) ROM_LOAD( "h7.bin", 0x3000, 0x0800, CRC(db21fc82) SHA1(38cf58c4d33da3e919d058abb482566c8f70d276) ) ROM_END +} // anonymous namespace + + + +/******************************************************************************* + Drivers +*******************************************************************************/ -GAME( 1981?, unkhorse, 0, horse, horse, horse_state, empty_init, ROT270, "", "unknown Japanese horse gambling game", MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests early-1981 +// YEAR NAME PARENT MACHINE INPUT CLASS INIT SCREEN COMPANY FULLNAME FLAGS +GAME( 1981?, unkhorse, 0, horse, horse, horse_state, empty_init, ROT270, "", "unknown Japanese horse gambling game", MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests early-1981 -- cgit v1.2.3