diff options
| author | 2025-10-31 07:47:35 +1100 | |
|---|---|---|
| committer | 2025-10-31 07:50:51 +1100 | |
| commit | 53137914d20158052b72e4202f2b1ff46d0dc610 (patch) | |
| tree | 38d1b7f934b327b4b2160652f789dd2c8b6fbe99 | |
| parent | cf68fd5e3efa33a3a39b660cd9c977e34a8c749b (diff) | |
Fixed up a pile of stuff and commented out games added without credits.
* You actually need to add copyright notices when adding stuff in
3rdparty.
* bus/bk: Fixed bad exposed class.
* Metadata fixes.
* Got rid of non-const function statics.
| -rw-r--r-- | 3rdparty/README.md | 2 | ||||
| -rw-r--r-- | 3rdparty/aes256cbc/README.md | 1 | ||||
| -rw-r--r-- | COPYING | 3 | ||||
| -rw-r--r-- | docs/source/usingmame/frontends.rst | 5 | ||||
| -rw-r--r-- | hash/megadriv.xml | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/ay.cpp | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/ay.h | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/covox.cpp | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/covox.h | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/joystick.cpp | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/joystick.h | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/loopback.cpp | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/loopback.h | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/printer.cpp | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/printer.h | 2 | ||||
| -rw-r--r-- | src/mame/igs/goldstar.cpp | 14 | ||||
| -rw-r--r-- | src/mame/mame.lst | 3 | ||||
| -rw-r--r-- | src/mame/misc/daphor32.cpp | 2 | ||||
| -rw-r--r-- | src/mame/tms/vet3000.cpp | 112 | ||||
| -rw-r--r-- | src/mame/tvgames/generalplus_gpl32612.cpp | 2 | ||||
| -rw-r--r-- | src/mame/tvgames/xavix_a.cpp | 6 |
21 files changed, 88 insertions, 84 deletions
diff --git a/3rdparty/README.md b/3rdparty/README.md index 3ed8c22e456..16676ecb686 100644 --- a/3rdparty/README.md +++ b/3rdparty/README.md @@ -1,5 +1,7 @@ # **3rdparty** # +aescbc - [The MIT License (MIT)](http://opensource.org/licenses/MIT) + asio - [Boost Software License](http://www.boost.org/LICENSE_1_0.txt) asmjit - [zlib license](http://opensource.org/licenses/Zlib) diff --git a/3rdparty/aes256cbc/README.md b/3rdparty/aes256cbc/README.md index 9a99b62bce1..d3825e64a99 100644 --- a/3rdparty/aes256cbc/README.md +++ b/3rdparty/aes256cbc/README.md @@ -229,4 +229,3 @@ Contributions and feedback are welcome! If you find issues or have ideas for imp ## License This standard AES-256 CBC implementation is provided under the [MIT License](./LICENSE). - @@ -55,6 +55,9 @@ Other Information the author or the affirmer. +AES-256-CBC +Copyright (c) 2024 Hallo Weeks + Asio C++ Library Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) diff --git a/docs/source/usingmame/frontends.rst b/docs/source/usingmame/frontends.rst index 100873878d0..b9f9ea04ddc 100644 --- a/docs/source/usingmame/frontends.rst +++ b/docs/source/usingmame/frontends.rst @@ -29,9 +29,8 @@ starting point. many useful features for home computer emulation. Written in C++, the `source code is on GitHub <https://github.com/npwoods/bletchmame>`__. `IV/Play <https://john-iv.github.io/iv-play/>`__ (Microsoft Windows) - A fast, keyboard-driven, DirectX-accelerated launcher for MAME. IV/Play - features a flexible filtering system, integrated browsing and launching - for software lists, and a highly customizable interface. Written in C#. + IV/Play has a customisable interface designed to be navigated with a + keyboard. It supports software lists and has flexible filtering. `Emu Loader <http://emuloader.mameworld.info/>`__ (Microsoft Windows) Emu Loader provides a Windows interface for launching systems in multiple emulators, including MAME, Supermodel and DEMUL. Written in Delphi Pascal, diff --git a/hash/megadriv.xml b/hash/megadriv.xml index 4e5ec23d188..d2cf1209d01 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -36826,7 +36826,7 @@ Crashes during attract or in character select, copy protection </software> <software name="13mahjnv"> - <description>Shísān Zhāng Májiàng - Zhong Guo Měi Nv Pian (Taiwan)</description> + <description>Shísān Zhāng Májiàng - Zhōngguó Měinǚ Piān (Taiwan)</description> <year>1993</year> <publisher><unlicensed></publisher> <!-- Gamtec? --> diff --git a/src/devices/bus/bk/ay.cpp b/src/devices/bus/bk/ay.cpp index 993ecf5dbf5..7eb9f119c0e 100644 --- a/src/devices/bus/bk/ay.cpp +++ b/src/devices/bus/bk/ay.cpp @@ -102,4 +102,4 @@ void bk_ay_device::io_w(uint16_t data, bool word) // DEVICE DEFINITIONS //************************************************************************** -DEFINE_DEVICE_TYPE_PRIVATE(BK_AY, device_qbus_card_interface, bk_ay_device, "bk_ay", "BK Single AY Interface") +DEFINE_DEVICE_TYPE_PRIVATE(BK_AY, device_bk_parallel_interface, bk_ay_device, "bk_ay", "BK Single AY Interface") diff --git a/src/devices/bus/bk/ay.h b/src/devices/bus/bk/ay.h index 50aca4f1562..f4cded20353 100644 --- a/src/devices/bus/bk/ay.h +++ b/src/devices/bus/bk/ay.h @@ -14,6 +14,6 @@ #include "parallel.h" -DECLARE_DEVICE_TYPE(BK_AY, device_qbus_card_interface) +DECLARE_DEVICE_TYPE(BK_AY, device_bk_parallel_interface) #endif diff --git a/src/devices/bus/bk/covox.cpp b/src/devices/bus/bk/covox.cpp index 142b1461673..6e23cdf299c 100644 --- a/src/devices/bus/bk/covox.cpp +++ b/src/devices/bus/bk/covox.cpp @@ -88,4 +88,4 @@ void bk_covox_device::io_w(uint16_t data, bool word) // DEVICE DEFINITIONS //************************************************************************** -DEFINE_DEVICE_TYPE_PRIVATE(BK_COVOX, device_qbus_card_interface, bk_covox_device, "bk_covox", "BK Mono Covox Interface") +DEFINE_DEVICE_TYPE_PRIVATE(BK_COVOX, device_bk_parallel_interface, bk_covox_device, "bk_covox", "BK Mono Covox Interface") diff --git a/src/devices/bus/bk/covox.h b/src/devices/bus/bk/covox.h index 80d81503390..7ddcf3dec31 100644 --- a/src/devices/bus/bk/covox.h +++ b/src/devices/bus/bk/covox.h @@ -14,6 +14,6 @@ #include "parallel.h" -DECLARE_DEVICE_TYPE(BK_COVOX, device_qbus_card_interface) +DECLARE_DEVICE_TYPE(BK_COVOX, device_bk_parallel_interface) #endif diff --git a/src/devices/bus/bk/joystick.cpp b/src/devices/bus/bk/joystick.cpp index 75268ee826e..1e570d39e2a 100644 --- a/src/devices/bus/bk/joystick.cpp +++ b/src/devices/bus/bk/joystick.cpp @@ -96,4 +96,4 @@ uint16_t bk_joystick_device::io_r() // DEVICE DEFINITIONS //************************************************************************** -DEFINE_DEVICE_TYPE_PRIVATE(BK_JOYSTICK, device_qbus_card_interface, bk_joystick_device, "bk_joystick", "BK Joystick Interface") +DEFINE_DEVICE_TYPE_PRIVATE(BK_JOYSTICK, device_bk_parallel_interface, bk_joystick_device, "bk_joystick", "BK Joystick Interface") diff --git a/src/devices/bus/bk/joystick.h b/src/devices/bus/bk/joystick.h index 71190540e81..5d0f705bb28 100644 --- a/src/devices/bus/bk/joystick.h +++ b/src/devices/bus/bk/joystick.h @@ -14,6 +14,6 @@ #include "parallel.h" -DECLARE_DEVICE_TYPE(BK_JOYSTICK, device_qbus_card_interface) +DECLARE_DEVICE_TYPE(BK_JOYSTICK, device_bk_parallel_interface) #endif diff --git a/src/devices/bus/bk/loopback.cpp b/src/devices/bus/bk/loopback.cpp index 96885322f0c..1f6c56b0805 100644 --- a/src/devices/bus/bk/loopback.cpp +++ b/src/devices/bus/bk/loopback.cpp @@ -76,4 +76,4 @@ void bk_loopback_device::io_w(uint16_t data, bool word) // DEVICE DEFINITIONS //************************************************************************** -DEFINE_DEVICE_TYPE_PRIVATE(BK_LOOPBACK, device_qbus_card_interface, bk_loopback_device, "bk_loopback", "BK Loopback") +DEFINE_DEVICE_TYPE_PRIVATE(BK_LOOPBACK, device_bk_parallel_interface, bk_loopback_device, "bk_loopback", "BK Loopback") diff --git a/src/devices/bus/bk/loopback.h b/src/devices/bus/bk/loopback.h index 33b0df32e68..36b1166c5e2 100644 --- a/src/devices/bus/bk/loopback.h +++ b/src/devices/bus/bk/loopback.h @@ -14,6 +14,6 @@ #include "parallel.h" -DECLARE_DEVICE_TYPE(BK_LOOPBACK, device_qbus_card_interface) +DECLARE_DEVICE_TYPE(BK_LOOPBACK, device_bk_parallel_interface) #endif diff --git a/src/devices/bus/bk/printer.cpp b/src/devices/bus/bk/printer.cpp index 9e38c900338..548c374572b 100644 --- a/src/devices/bus/bk/printer.cpp +++ b/src/devices/bus/bk/printer.cpp @@ -98,4 +98,4 @@ void bk_printer_device::io_w(uint16_t data, bool word) // DEVICE DEFINITIONS //************************************************************************** -DEFINE_DEVICE_TYPE_PRIVATE(BK_PRINTER, device_qbus_card_interface, bk_printer_device, "bk_printer", "BK Printer Interface") +DEFINE_DEVICE_TYPE_PRIVATE(BK_PRINTER, device_bk_parallel_interface, bk_printer_device, "bk_printer", "BK Printer Interface") diff --git a/src/devices/bus/bk/printer.h b/src/devices/bus/bk/printer.h index 6eead39cba8..ad75862d3b8 100644 --- a/src/devices/bus/bk/printer.h +++ b/src/devices/bus/bk/printer.h @@ -14,6 +14,6 @@ #include "parallel.h" -DECLARE_DEVICE_TYPE(BK_PRINTER, device_qbus_card_interface) +DECLARE_DEVICE_TYPE(BK_PRINTER, device_bk_parallel_interface) #endif diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index b3ab381088e..ec0d93ba3b3 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -8324,6 +8324,7 @@ static INPUT_PORTS_START( lucky8t ) INPUT_PORTS_END +#if 0 static INPUT_PORTS_START( cbonus ) PORT_INCLUDE( lucky8b ) @@ -8431,6 +8432,7 @@ static INPUT_PORTS_START( cbonus ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END +#endif // no manual - best guesses static INPUT_PORTS_START( cbaai ) @@ -17560,6 +17562,7 @@ ROM_START( cmasterl ) // most similar to cmasterbv but without the extra ROM ROM_LOAD( "82s129.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) ) ROM_END +#if 0 // MB1 NHOLD // BET is the STOP ALL ROM_START( cmasterm ) @@ -17629,6 +17632,7 @@ ROM_START( cmastern ) ROM_REGION( 0x100, "proms2", 0 ) ROM_LOAD( "82s129.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) ) ROM_END +#endif /* @@ -21025,6 +21029,7 @@ ROM_START( cb2 ) // W4 base board + Dyna D8905 CPU board ROM_END +#if 0 /* Cherry Bonus チェリーボーナス (Cherī Bōnasu) @@ -21062,6 +21067,7 @@ ROM_START( cbonus ) ROM_REGION( 0x20, "unkprom2", 0 ) ROM_LOAD( "u1.bin", 0x0000, 0x0020, CRC(267004c8) SHA1(2c790e71b1c21961c5ced7b0ce8fbbb9fa5d806b) ) ROM_END +#endif /* W4 base board + CPU board. @@ -29708,8 +29714,8 @@ GAMEL( 1991, cmasteri, cmaster, cm, cmasterb, cmaster_state, init_cmv4 GAMEL( 1991, cmasterj, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 10, BET stops all)", 0, layout_cmasterb ) GAMEL( 1991, cmasterk, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 11, TAKE stops all)", 0, layout_cmasterb ) GAMEL( 1991, cmasterl, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 12)", 0, layout_cmasterb ) -GAMEL( 1991, cmasterm, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 13, BET stops all)", 0, layout_cmasterb ) -GAMEL( 1991, cmastern, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 14, TAKE stops all)", 0, layout_cmasterb ) +//GAMEL( 1991, cmasterm, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 13, BET stops all)", 0, layout_cmasterb ) +//GAMEL( 1991, cmastern, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 14, TAKE stops all)", 0, layout_cmasterb ) GAMEL( 1991, skillmst, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (ver.fst v5.0)", 0, layout_cmasterb ) GAMEL( 1991, skillmsta, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (ver.fst v3.0)", 0, layout_cmasterb ) GAMEL( 1991, cutyline, 0, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cuty Line (LC-88, ver.1.01)", 0, layout_cmasterb ) @@ -29826,8 +29832,8 @@ GAMEL( 1995, wcat3, 0, wcat3, wcat3, wingco_state, init_wcat GAMEL( 199?, animalw, 0, animalw, lucky8t, wingco_state, empty_init, ROT0, "GPS", "Animal Wonders (ver A900 66)", 0, layout_lucky8p1 ) // DIPs need to be checked GAMEL( 199?, animalwbl, animalw, lucky8t, lucky8t, wingco_state, empty_init, ROT0, "bootleg", "Animal Wonders (ver A900, bootleg)", 0, layout_lucky8p1 ) // DIPs need to be checked GAMEL( 1989, cb2, 0, lucky8, lucky8, wingco_state, init_cb2, ROT0, "Dyna", "Cherry Bonus II (V2.00 06/01)", 0, layout_lucky8 ) -GAMEL( 1988, cbonus, 0, lucky8, cbonus, wingco_state, empty_init, ROT0, "Dyna", "Cherry Bonus (Dyna v1.01 20fev)", 0, layout_lucky8p1 ) // original dyna on wing board -GAMEL( 1990, cbaai, cbonus, cbaai, cbaai, wingco_state, init_cbaai, ROT0, "bootleg (A.A.I.)", "Cherry Bonus (A.A.I. bootleg)", 0, layout_lucky8p1 ) // jumps to 0xf430 where expects code +//GAMEL( 1988, cbonus, 0, lucky8, cbonus, wingco_state, empty_init, ROT0, "Dyna", "Cherry Bonus (Dyna v1.01 20fev)", 0, layout_lucky8p1 ) // original dyna on wing board +GAMEL( 1990, cbaai, 0/*cbonus*/, cbaai, cbaai, wingco_state, init_cbaai, ROT0, "bootleg (A.A.I.)", "Cherry Bonus (A.A.I. bootleg)", 0, layout_lucky8p1 ) // jumps to 0xf430 where expects code GAMEL( 199?, ttactoe, 0, lucky8t, ttactoe, wingco_state, empty_init, ROT0, "bootleg (Sundance)","Tic Tac Toe (Sundance bootleg of New Lucky 8 Lines)", 0, layout_lucky8 ) // needs more DSW figured out GAME( 1995, superdrg, 0, superdrg, superdrg, wingco_state, empty_init, ROT0, "OCT", "Super Dragon (Ver 211)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) // " - SUPER DROGON 950828 211 (sic) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 14a7f8202d6..058cf92144e 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -20590,7 +20590,6 @@ cb3h cb3micro cb3s51 cbaai -cbonus cherry96 chry10 chryangl @@ -20625,8 +20624,6 @@ cmasteri cmasterj cmasterk cmasterl -cmasterm -cmastern cmezspin cmezspina cmezspinb diff --git a/src/mame/misc/daphor32.cpp b/src/mame/misc/daphor32.cpp index 2c4057c2555..022f652ad1c 100644 --- a/src/mame/misc/daphor32.cpp +++ b/src/mame/misc/daphor32.cpp @@ -254,4 +254,4 @@ ROM_END // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1983, daphor32, 0, 0, daphor32, 0, daphor_state, empty_init, "Dasit S.P.A.", "Daphor 32", MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING ) +COMP( 1983, daphor32, 0, 0, daphor32, 0, daphor_state, empty_init, "Dasit S.p.A.", "Daphor 32", MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING ) diff --git a/src/mame/tms/vet3000.cpp b/src/mame/tms/vet3000.cpp index 6d01f6364f1..533257efb23 100644 --- a/src/mame/tms/vet3000.cpp +++ b/src/mame/tms/vet3000.cpp @@ -30,11 +30,14 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/m6809/m6809.h" #include "machine/nvram.h" #include "video/tms9928a.h" + #include "vet3000.lh" + namespace { class vet3000_state : public driver_device @@ -47,13 +50,14 @@ public: , m_scan(0xff) { } - void vet3000(machine_config &config); + void vet3000(machine_config &config) ATTR_COLD; protected: virtual void machine_start() override ATTR_COLD; private: void program_map(address_map &map) ATTR_COLD; + u8 keyboard_r(); void keyboard_w(u8 data); @@ -97,80 +101,80 @@ void vet3000_state::program_map(address_map &map) static INPUT_PORTS_START( vet3000 ) PORT_START("ROW1") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_1) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Q) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_A) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_7) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_U) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_J) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_N) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_START("ROW2") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_2) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_W) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_S) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_LCONTROL) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_8) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_I) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_K) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_M) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_START("ROW3") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_3) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_E) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_D) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("EXT/MODE") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CODE(KEYCODE_TAB) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_9) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_O) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_L) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_SPACE) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("EXT/MODE") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CODE(KEYCODE_TAB) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_START("ROW4") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_4) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_R) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_F) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_0) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_P) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_ENTER) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BORDER BLK") PORT_CODE(KEYCODE_COMMA) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BORDER BLK") PORT_CODE(KEYCODE_COMMA) PORT_START("ROW5") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_5) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_T) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_G) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME(":") PORT_CODE(KEYCODE_COLON) PORT_CODE(KEYCODE_MINUS) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("CURSOR") PORT_CODE(KEYCODE_OPENBRACE) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("AUTO CENTER") PORT_CODE(KEYCODE_QUOTE) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("COLOR") PORT_CODE(KEYCODE_STOP) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(":") PORT_CODE(KEYCODE_COLON) PORT_CODE(KEYCODE_MINUS) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CURSOR") PORT_CODE(KEYCODE_OPENBRACE) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("AUTO CENTER") PORT_CODE(KEYCODE_QUOTE) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("COLOR") PORT_CODE(KEYCODE_STOP) PORT_START("ROW6") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_6) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Y) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_H) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("C") PORT_CODE(KEYCODE_BACKSLASH) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("DOWN/UP") PORT_CODE(KEYCODE_DOWN) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("OBJ") PORT_CODE(KEYCODE_CLOSEBRACE) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_BACKSLASH) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("DOWN/UP") PORT_CODE(KEYCODE_DOWN) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("OBJ") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("PAGE") PORT_CODE(KEYCODE_SLASH) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PAGE") PORT_CODE(KEYCODE_SLASH) PORT_START("ROW7") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Z) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_X) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_C) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("LEFT/RIGHT") PORT_CODE(KEYCODE_LEFT) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("CLEAR") PORT_CODE(KEYCODE_BACKSPACE) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_V) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_B) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("LEFT/RIGHT") PORT_CODE(KEYCODE_LEFT) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CLEAR") PORT_CODE(KEYCODE_BACKSPACE) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) INPUT_PORTS_END void vet3000_state::vet3000(machine_config &config) { - static constexpr XTAL MAIN_CLOCK = 3.579545_MHz_XTAL; + constexpr XTAL MAIN_CLOCK = 3.579545_MHz_XTAL; /* basic machine hardware */ MC6809(config, m_maincpu, MAIN_CLOCK); diff --git a/src/mame/tvgames/generalplus_gpl32612.cpp b/src/mame/tvgames/generalplus_gpl32612.cpp index bf926acb813..2c4ded760e3 100644 --- a/src/mame/tvgames/generalplus_gpl32612.cpp +++ b/src/mame/tvgames/generalplus_gpl32612.cpp @@ -617,7 +617,7 @@ CONS( 2020, tmydistb, 0, 0, gpl32612, gpl32612, generalplu // uses GPL32610 // カメラでリンク! ポケモン図鑑 スマホロトム -CONS( 201?, rotom2, 0, 0, gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init880, "Takara Tomy", "Camera de Link! Pokemon Zukan - Sumaho Rotom (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING) +CONS( 201?, rotom2, 0, 0, gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init880, "Takara Tomy", "Camera de Link! Pokemon Zukan - SmaFo Rotom (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // uses GPL32611 // 小学館の図鑑 NEO Pad - 生きもの編 (this is the standard green version) diff --git a/src/mame/tvgames/xavix_a.cpp b/src/mame/tvgames/xavix_a.cpp index 38fb25aa8f3..7d218640d0e 100644 --- a/src/mame/tvgames/xavix_a.cpp +++ b/src/mame/tvgames/xavix_a.cpp @@ -685,12 +685,6 @@ uint8_t xavix_sound_device::fetch_env_byte_direct(int voice, int channel, uint16 const uint32_t rom = (uint32_t(bank) << 16) | uint32_t(addr); const uint8_t val = m_readsamples_cb(rom); - // One-shot “first fetch” debug per voice & side to verify addressing. - static bool first_seen[16][2] = { { false } }; - const int side = channel ? 1 : 0; - if (!first_seen[voice][side]) - first_seen[voice][side] = true; - return val; } |
