From 9ab890331a53e13b1a29c23b17bf211d0e35306f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 21 May 2024 07:34:47 +1000 Subject: [PATCH] -brankp_cart.xml, ekara_cart.xml, hikara.xml: Fixed up metadata. * Fixed titles. * Added details from cartridge labels. * Added track list for Hi-kara user cartridge. -formats/fs_cbmdos.cpp: More const --- hash/bkrankp_cart.xml | 14 +++++++++++++- hash/ekara_cart.xml | 34 ++++++++++++++++++++-------------- hash/hikara.xml | 21 ++++++++++++++------- src/devices/bus/kim1/kim1bus.h | 6 +++--- src/lib/formats/fs_cbmdos.cpp | 26 +++++++++++++++----------- src/mame/tvgames/xavix.cpp | 2 +- 6 files changed, 66 insertions(+), 37 deletions(-) diff --git a/hash/bkrankp_cart.xml b/hash/bkrankp_cart.xml index 9c83969a014..a9d29a56db3 100644 --- a/hash/bkrankp_cart.xml +++ b/hash/bkrankp_cart.xml @@ -37,6 +37,7 @@ Known carts: J-Pop Blue 2015 Bandai + @@ -46,9 +47,10 @@ Known carts: - Aikatsu Ver. Best + Aikatsu! Idol Katsudō! 2015 Bandai + @@ -61,6 +63,7 @@ Known carts: J-Pop - Strawberry 2015 Bandai + @@ -73,6 +76,7 @@ Known carts: J-Pop - Green 2015 Bandai + @@ -85,6 +89,7 @@ Known carts: J-Pop - Pink 2015 Bandai + @@ -97,6 +102,7 @@ Known carts: Kid's Pop - Lemon Yellow 2015 Bandai + @@ -160,6 +166,7 @@ Known carts: Kid's Pop - Red 2015 Bandai + @@ -184,6 +191,7 @@ Known carts: Kid's Pop - Apple Green 2015 Bandai + @@ -196,6 +204,7 @@ Known carts: J-Pop - Grapefruit 2015 Bandai + @@ -209,6 +218,7 @@ Known carts: 2015 Bandai + @@ -220,6 +230,7 @@ Known carts: J-Pop - Mint 2015 Bandai + @@ -232,6 +243,7 @@ Known carts: Best Hit Song 2015 Bandai + diff --git a/hash/ekara_cart.xml b/hash/ekara_cart.xml index 956f14031ce..6db750e0b76 100644 --- a/hash/ekara_cart.xml +++ b/hash/ekara_cart.xml @@ -315,7 +315,7 @@ license:CC0-1.0 Japanese cart listing (by M code) (M-x on cartridge / box, MC in cart identifier code) M-1 *MC0001-ATM Artist Mini Volume 1 (Aya Matsuura) - M-2 *MC0002-ATM Artist Mini Volume 2 (PIKA☆NCHI, A・RA・SHI／他) + M-2 *MC0002-ATM Artist Mini Volume 2 (PIKA☆NCHI, A·RA·SHI, etc.) M-3 *MC0003-ATM Artist Mini Volume 3 (Morning Musume) M-4 *MC0004-ATM Artist Mini Volume 4 (w-inds) M-5 *MC0005-KSM Kids Song Mini Volume 1 (TV Song) @@ -324,7 +324,7 @@ license:CC0-1.0 M-8 *MC0008-KSM Kids Song Mini Volume 3 M-9 *MC0009-JPM J-Pop Mix Mini Volume 1 M-10 *MC0010-ATM Artist Mini Volume 6 (Utada Hikaru) - M-11 *MC0011-KSM Kids Song Mini Volume 4 (Fantastic) + M-11 *MC0011-KSM Kids Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai O, etc.) M-12 *MC0012-ATM Artist Mini Volume 7 (Ayumi Hamasaki) M-13 *MC0013-KSM Kids Song Mini Volume 5 M-14 *MC0014-ATM Artist Mini Volume 8 (BoA) @@ -371,7 +371,7 @@ license:CC0-1.0 S-14 *SC0014-SAI Saiten Cartridge Challenge Idol vol.4 S-15 *SC0015-DCS Saiten Cartridge Detective Conan Vol.2 S-16 *SC0016-SAI Saiten Cartridge Nesshō vol. 5 - S-17 *SC0017-SAI Kids' Challenge Vol.2 + S-17 *SC0017-SAI Kids' Challenge Vol.2 (Te o Tsunagō, Anpanman no March, etc.) S-18 *SC0018-SAI Saiten Cartridge Challenge Artist Vol.1 (Morning Musume, Tanpopo, Petit Moni, Gotō Maki) S-19 *SC0019-SAI Saiten Cartridge Nesshō vol. 6 S-20 *SC0020-SAI Saiten Cartridge Challenge Idol vol.5 @@ -419,7 +419,7 @@ license:CC0-1.0 *KR-1 Kirarin Revolution (comes in kira kara Starter Set bundled with Kirarin Revolution microphone) (inside cart is marked AC0009-KIR) *BX01-MOR Morning Musume Special (sticker inside cart is marked CS019-004A) - *PR-01 MNG (c)2002 Morning Musume - I'm Here! (single song 'not for sale' cartridge) + *PR-01 MNG (c)2002 Premium Cartridge Koko ni Iru Zee! Morning Musume (single song 'not for sale' cartridge) PR-02 AYY (c)2003 Aya Matsuura - Prairies Man (single song 'not for sale' cartridge) *PR-06 Misora Hibari (inside cart is marked AC0009) @@ -1791,9 +1791,10 @@ license:CC0-1.0 - Dream Cartridge: TV Pop Junior Vol.8 (Japan) (DC0004-TPJ) + Dream Cartridge: TV Pop Junior Vol.8 (Happy Lucky - Onegai Mirmo, mini-moni - Telephone! Ring Ring Ring, etc.) (Japan) (DC0004-TPJ) 2004 Takara + @@ -1849,10 +1850,10 @@ license:CC0-1.0 - Dream Cartridge: TV Pop Junior Vol.10 (Japan) (DC0009-TPJ) + Dream Cartridge: TV Pop Junior Vol.10 (Bon Voyage!, Kimi to Yakusoku Shita Yasashī Ano Basho Made, etc.) (Japan) (DC0009-TPJ) 2004 Takara - + @@ -2297,9 +2298,10 @@ license:CC0-1.0 - Artist Mini Volume 2 (PIKA☆NCHI, A・RA・SHI／他) (Japan) (MC0002-ATM) + Artist Mini Volume 2 (PIKA☆NCHI, A·RA·SHI, etc.) (Japan) (MC0002-ATM) 2003 Takara + @@ -2413,9 +2415,10 @@ license:CC0-1.0 - Kids Song Mini Volume 4 (Fantastic) (Japan) (MC0011-KSM) + Kids Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai O, etc.) (Japan) (MC0011-KSM) 2003 Takara + @@ -2722,9 +2725,10 @@ license:CC0-1.0 - Saiten Cartridge Nesshō vol. 4 (Japan) (SC0013-SAI) + Saiten Cartridge Nesshō vol. 4 (Naminori Johnny, Kanashimi wa Yuki no Yō Ni, etc.) (Japan) (SC0013-SAI) 2001 Takara + @@ -2773,9 +2777,10 @@ license:CC0-1.0 - Kids' Challenge Vol.2 (Japan) (SC0017-SAI) + Kids' Challenge Vol.2 (Te o Tsunagō, Anpanman no March, etc.) (Japan) (SC0017-SAI) 2001 Takara + @@ -2952,9 +2957,10 @@ license:CC0-1.0 - PR-01 Morning Musume - I'm Here! (Not for Sale, Japan) + PR-01 Premium Cartridge Koko ni Iru Zee! Morning Musume (Not for Sale, Japan) 2002 Takara + @@ -2993,10 +2999,10 @@ license:CC0-1.0 - Natsukashi no Meikyoku-shū (Japan) + Natsukashi no Meikyoku-shū (Akatonbo, Haru ga Kita, etc.) (Japan) 2002 Takara - + diff --git a/hash/hikara.xml b/hash/hikara.xml index 1c3e155a25b..2f898f2374b 100644 --- a/hash/hikara.xml +++ b/hash/hikara.xml @@ -64,11 +64,11 @@ license:CC0-1.0 --> + キューティーハニー 倖田來未 Cutie Honey Kōda Kumi + KissHug aiko KissHug aiko + さくらんぼ 大塚愛 Sakuranbo Ōtsuka Ai + Dream Fighter Perfume Dream Fighter Perfume + ポリリズム Perfume Polyrhythm Perfume --> Hi-kara 5-song capacity user cartridge (used, with 5 songs) (Japan) 2008 @@ -80,6 +80,11 @@ license:CC0-1.0 + Hi-kara 5-song capacity user cartridge (used, with 4 songs) (Japan) 2008 @@ -232,9 +237,10 @@ license:CC0-1.0 - Pocket Monsters Special + Utatte Asonde! Best Hit Pokémon 2008 Takara Tomy + @@ -243,9 +249,10 @@ license:CC0-1.0 - Ciao Special + Ciao Best Hit Cartridge 2009 Takara Tomy + diff --git a/src/devices/bus/kim1/kim1bus.h b/src/devices/bus/kim1/kim1bus.h index 2fa57a2096d..7465a2e7441 100644 --- a/src/devices/bus/kim1/kim1bus.h +++ b/src/devices/bus/kim1/kim1bus.h @@ -42,9 +42,9 @@ /CS9 19 /CSA 20 - Comelta DRAC-1 expansion modules use a 64-pin edge connector with an - external manual reset input and more power rails, but without some - control signals: + Comelta DRAC-1 expansion modules use a 96-pin Eurocard connector with row + b unused. Has an external manual reset input and more power rails, but + omits some control signals: +25V a 1 c +25V external manual reset a 2 c reserved diff --git a/src/lib/formats/fs_cbmdos.cpp b/src/lib/formats/fs_cbmdos.cpp index bf0da5511bc..0654f740685 100644 --- a/src/lib/formats/fs_cbmdos.cpp +++ b/src/lib/formats/fs_cbmdos.cpp @@ -16,6 +16,7 @@ Current limitations: ***************************************************************************/ #include "fs_cbmdos.h" + #include "d64_dsk.h" #include "fsblk.h" @@ -30,6 +31,7 @@ Current limitations: #include #include + namespace fs { const cbmdos_image CBMDOS; }; @@ -390,7 +392,7 @@ err_t impl::file_create(const std::vector &path, const meta_data &m if (!result) { // Claim a next directory sector - auto [err, new_sector] = claim_track_sector(DIRECTORY_TRACK); + auto const [err, new_sector] = claim_track_sector(DIRECTORY_TRACK); if (err != ERR_OK) return err; auto new_block = read_sector(DIRECTORY_TRACK, new_sector); @@ -409,7 +411,7 @@ err_t impl::file_create(const std::vector &path, const meta_data &m sector = new_sector; } - auto [err, file_track, file_sector] = claim_sector(); + auto const [err, file_track, file_sector] = claim_sector(); if (err != ERR_OK) return err; @@ -441,7 +443,7 @@ err_t impl::file_write(const std::vector &path, const std::vector &path, const std::vector impl::claim_sector() const { for (int track = 0; track < m_max_track - 1; track++) { - auto [err, sector] = claim_track_sector(s_data_track_order[track]); + auto const [err, sector] = claim_track_sector(s_data_track_order[track]); if (err == ERR_OK) return std::make_tuple(ERR_OK, s_data_track_order[track], sector); if (err != ERR_NO_SPACE) @@ -643,13 +645,13 @@ fsblk_t::block_t impl::read_sector(int track, int sector) const std::optional impl::dirent_from_path(const std::vector &path) const { if (path.size() != 1) - return { }; + return std::nullopt; std::string_view path_part = path[0]; std::optional result; - auto callback = [&result, path_part](u8 track, u8 sector, u8 file_index, const cbmdos_dirent &dirent) + auto const callback = [&result, path_part] (u8 track, u8 sector, u8 file_index, const cbmdos_dirent &dirent) { - bool found = strtrimright_cbm(dirent.m_file_name) == path_part; + bool const found = strtrimright_cbm(dirent.m_file_name) == path_part; if (found) result = dirent; return found; @@ -670,7 +672,8 @@ void impl::iterate_directory_entries(const std::function &impl::block u8 impl::block_iterator::size() const { - return m_track != CHAIN_END ? SECTOR_DATA_BYTES : m_sector - 1; + return (m_track != CHAIN_END) ? SECTOR_DATA_BYTES : (m_sector - 1); } } // anonymous namespace diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index bfdb4499314..44c075381a1 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -1636,7 +1636,7 @@ void xavix_hikara_state::machine_reset() for (int j = 0; j < 5; j++) { - u8 searchfor[5] = { 0x29, 0x80, 0xd0, 0x14, 0xad }; + constexpr u8 searchfor[5] = { 0x29, 0x80, 0xd0, 0x14, 0xad }; if (ROM[i + j] == searchfor[j]) matchcount++;