From ebb519f8b3250161cefbbc72b45f35027eb280bb Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 24 Jul 2022 19:38:16 +1000 Subject: [PATCH] Clean up whitespace with srcclean --- hash/apple2gs_flop_orig.xml | 16 +-- hash/ekara_japan.xml | 2 +- hash/ekara_japan_d.xml | 2 +- hash/ekara_japan_g.xml | 4 +- hash/ekara_japan_m.xml | 4 +- hash/ekara_japan_s.xml | 6 +- hash/vgmplay.xml | 2 +- src/devices/bus/vcs/rom.cpp | 14 +- src/devices/bus/vcs/scharger.cpp | 2 +- src/devices/machine/k056230.cpp | 13 +- src/emu/rendlay.cpp | 4 +- src/lib/formats/fs_cbmdos.cpp | 40 +++--- src/lib/formats/fs_cbmdos.h | 4 +- src/lib/formats/fs_coco_os9.cpp | 2 +- src/lib/formats/fs_coco_rsdos.cpp | 4 +- src/lib/formats/fs_oric_jasmin.cpp | 4 +- src/lib/formats/fs_prodos.cpp | 8 +- src/lib/formats/fs_vtech.cpp | 2 +- src/mame/atari/nl_stuntcyc.cpp | 2 +- src/mame/barcrest/mpu4.cpp | 14 +- src/mame/barcrest/mpu4_characteriser_pal.h | 62 ++++----- src/mame/barcrest/mpu4mod4oki.cpp | 72 +++++----- src/mame/barcrest/mpu4mod4yam.cpp | 2 +- src/mame/fairlight/cmi_mkbd.cpp | 146 ++++++++++----------- src/mame/jpm/jpmsru.cpp | 2 +- src/mame/konami/zr107.cpp | 8 +- 26 files changed, 221 insertions(+), 220 deletions(-) diff --git a/hash/apple2gs_flop_orig.xml b/hash/apple2gs_flop_orig.xml index 3e0bbe27724..afd304cd322 100644 --- a/hash/apple2gs_flop_orig.xml +++ b/hash/apple2gs_flop_orig.xml @@ -3607,10 +3607,10 @@ license:CC0 - + - + @@ -3653,7 +3653,7 @@ license:CC0 - + Dragon's Lair: Escape from Singe's Castle @@ -3663,10 +3663,10 @@ license:CC0 - + - + @@ -3715,7 +3715,7 @@ license:CC0 - + Dragon's Lair II: Time Warp @@ -3728,7 +3728,7 @@ license:CC0 - + @@ -3790,7 +3790,7 @@ license:CC0 - + diff --git a/hash/ekara_japan.xml b/hash/ekara_japan.xml index bd9353253be..ba72e0ff4c7 100644 --- a/hash/ekara_japan.xml +++ b/hash/ekara_japan.xml @@ -48,7 +48,7 @@ license:CC0 D (D-x on case, DCxxxx-xxx part numbers) (see ekara_japan_d.xml) (for e-kara, Popira / 2, Taiko de Popira) SP (SP-x on case, no part numbers) (see ekara_japan_sp.xml) (for e-kara, Popira / 2, Taiko de Popira, Jumping Popira) A (A-x on case, Pichi Pichi Pitch series)(see ekara_japan_a.xml) (for e-kara / e-pitch) - AC (KR-xx on cart, maybe part of A series) + AC (KR-xx on cart, maybe part of A series) JP (JP-x on case) (see ekara_japan_jp.xml) (for Jumping Popira Only) these exist but haven't got any diff --git a/hash/ekara_japan_d.xml b/hash/ekara_japan_d.xml index f3cfac11691..1d7f3d50ff8 100644 --- a/hash/ekara_japan_d.xml +++ b/hash/ekara_japan_d.xml @@ -35,7 +35,7 @@ license:CC0 --> - + Dream Cartridge: Best Hit Vol.8 (Japan) (DC0001-BHT) 2003 Takara diff --git a/hash/ekara_japan_g.xml b/hash/ekara_japan_g.xml index 0e2e0f7d51d..a55e99ebc6b 100644 --- a/hash/ekara_japan_g.xml +++ b/hash/ekara_japan_g.xml @@ -172,7 +172,7 @@ license:CC0 - + mini-moni Volume 2 (GC0014-MIN) @@ -233,7 +233,7 @@ license:CC0 Takara - + diff --git a/hash/ekara_japan_m.xml b/hash/ekara_japan_m.xml index 9aa16dfadbd..811f31c87a0 100644 --- a/hash/ekara_japan_m.xml +++ b/hash/ekara_japan_m.xml @@ -49,7 +49,7 @@ license:CC0 - + Artist Mini Volume 4 (w-inds) (Japan) (MC0004-ATM) 2003 @@ -97,7 +97,7 @@ license:CC0 - + Artist Mini Volume 7 (Hamasaki Ayumi) (Japan) (MC0012-ATM) diff --git a/hash/ekara_japan_s.xml b/hash/ekara_japan_s.xml index 7d6de8cbec1..42588ac9467 100644 --- a/hash/ekara_japan_s.xml +++ b/hash/ekara_japan_s.xml @@ -117,7 +117,7 @@ license:CC0 - + Saiten Cartridge: Nesshō vol. 3 (Japan) (SC0009-SAI) 2001 @@ -154,7 +154,7 @@ license:CC0 - + Saiten Cartridge: Detective Conan Vol.2 (Japan) (SC0015-DCS) 2002 @@ -167,7 +167,7 @@ license:CC0 - + Saiten Cartridge: Challenge Artist Vol.1 (Morning Musume, Tanpopo, Petit Moni, Gotō Maki) (Japan) (SC0018-SAI) 2002 diff --git a/hash/vgmplay.xml b/hash/vgmplay.xml index d35182ceadc..cb25ca94c38 100644 --- a/hash/vgmplay.xml +++ b/hash/vgmplay.xml @@ -298822,7 +298822,7 @@ license:CC0 - + diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp index 0cde536dbea..6e04fcb0727 100644 --- a/src/devices/bus/vcs/rom.cpp +++ b/src/devices/bus/vcs/rom.cpp @@ -426,10 +426,10 @@ void a26_rom_fe_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_fe_device::read))); space->install_write_handler(0x1000, 0x1fff, write8sm_delegate(*this, FUNC(a26_rom_fe_device::write))); - space->install_readwrite_tap(0x1fe, 0x1fe, "trigger_bank", + space->install_readwrite_tap(0x1fe, 0x1fe, "trigger_bank", [this] (offs_t, u8 &, u8) { if (!machine().side_effects_disabled()) trigger_bank(); }, [this] (offs_t, u8 &, u8) { if (!machine().side_effects_disabled()) trigger_bank(); }); - space->install_read_tap(0x1ff, 0x1ff, "bank", + space->install_read_tap(0x1ff, 0x1ff, "bank", [this] (offs_t, u8 &data, u8) { if (!machine().side_effects_disabled()) switch_bank(data); }); } @@ -529,7 +529,7 @@ void a26_rom_3e_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_3e_device::read))); space->install_write_handler(0x1000, 0x1fff, write8sm_delegate(*this, FUNC(a26_rom_3e_device::write))); - space->install_write_tap(0x00, 0x3f, "bank", + space->install_write_tap(0x00, 0x3f, "bank", [this] (offs_t offset, u8 &data, u8) { if (!machine().side_effects_disabled()) write_bank(offset, data); }); } @@ -593,7 +593,7 @@ void a26_rom_3f_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_3f_device::read))); space->install_write_handler(0x1000, 0x1fff, write8sm_delegate(*this, FUNC(a26_rom_3f_device::write))); - space->install_write_tap(0x00, 0x3f, "bank", + space->install_write_tap(0x00, 0x3f, "bank", [this] (offs_t offset, u8 &data, u8) { if (!machine().side_effects_disabled()) write_bank(offset, data); }); } @@ -786,7 +786,7 @@ void a26_rom_ua_device::device_reset() void a26_rom_ua_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_ua_device::read))); - space->install_readwrite_tap(0x200, 0x27f, "bank", + space->install_readwrite_tap(0x200, 0x27f, "bank", [this] (offs_t offset, u8 &data, u8) { if (!machine().side_effects_disabled()) change_bank(offset); }, [this] (offs_t offset, u8 &data, u8) { if (!machine().side_effects_disabled()) change_bank(offset); }); } @@ -972,7 +972,7 @@ a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char void a26_rom_jvp_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_jvp_device::read))); - space->install_readwrite_tap(0xfa0, 0xfc0, "bank", + space->install_readwrite_tap(0xfa0, 0xfc0, "bank", [this] (offs_t offset, u8 &data, u8) { if (!machine().side_effects_disabled()) change_bank(offset); }, [this] (offs_t offset, u8 &data, u8) { if (!machine().side_effects_disabled()) change_bank(offset); }); } @@ -1140,7 +1140,7 @@ a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char void a26_rom_x07_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_x07_device::read))); - space->install_readwrite_tap(0x0000, 0x0fff, "bank", + space->install_readwrite_tap(0x0000, 0x0fff, "bank", [this] (offs_t offset, u8 &, u8) { if (!machine().side_effects_disabled()) change_bank(offset); }, [this] (offs_t offset, u8 &, u8) { if (!machine().side_effects_disabled()) change_bank(offset); }); } diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp index 7b7f5883cb8..4383bc9b8f0 100644 --- a/src/devices/bus/vcs/scharger.cpp +++ b/src/devices/bus/vcs/scharger.cpp @@ -110,7 +110,7 @@ inline uint8_t a26_rom_ss_device::read_byte(uint32_t offset) void a26_rom_ss_device::install_memory_handlers(address_space *space) { space->install_read_handler(0x1000, 0x1fff, read8sm_delegate(*this, FUNC(a26_rom_ss_device::read))); - space->install_readwrite_tap(0x0000, 0x1fff, "bank", + space->install_readwrite_tap(0x0000, 0x1fff, "bank", [this] (offs_t offset, u8 &, u8) { if (!machine().side_effects_disabled()) tap(offset); }, [this] (offs_t offset, u8 &, u8) { if (!machine().side_effects_disabled()) tap(offset); }); } diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp index c2f1c8c0eea..7a401c83def 100644 --- a/src/devices/machine/k056230.cpp +++ b/src/devices/machine/k056230.cpp @@ -20,11 +20,11 @@ TODO: nearly everything #include "k056230.h" -#define LOG_REG_READS (1 << 1U) -#define LOG_REG_WRITES (1 << 2U) -#define LOG_RAM_READS (1 << 3U) -#define LOG_RAM_WRITES (1 << 4U) -#define LOG_UNKNOWNS (1 << 5U) +#define LOG_REG_READS (1 << 1U) +#define LOG_REG_WRITES (1 << 2U) +#define LOG_RAM_READS (1 << 3U) +#define LOG_RAM_WRITES (1 << 4U) +#define LOG_UNKNOWNS (1 << 5U) #define LOG_ALL (LOG_REG_READS | LOG_REG_WRITES | LOG_RAM_READS | LOG_RAM_WRITES | LOG_UNKNOWNS) #define VERBOSE (0) @@ -99,7 +99,8 @@ void k056230_device::regs_w(offs_t offset, u8 data) { m_irq_cb(m_irq_state); } - } break; + break; + } case 2: // Sub ID register LOGMASKED(LOG_REG_WRITES, "%s: regs_w: Sub ID Register = %02x\n", machine().describe_context(), data); diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index 896ff2618e3..2e54112f269 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -2477,8 +2477,8 @@ protected: virtual void draw_aligned(running_machine &machine, bitmap_argb32 &dest, const rectangle &bounds, int state) override { - rgb_t const onpen = rgb_t(m_invert ? 0x20 : 0xff, 0xff, 0xff, 0xff); - rgb_t const offpen = rgb_t(m_invert ? 0xff : 0x20, 0xff, 0xff, 0xff); + rgb_t const onpen = rgb_t(m_invert ? 0x20 : 0xff, 0xff, 0xff, 0xff); + rgb_t const offpen = rgb_t(m_invert ? 0xff : 0x20, 0xff, 0xff, 0xff); // sizes for computation int const bmwidth = 250; diff --git a/src/lib/formats/fs_cbmdos.cpp b/src/lib/formats/fs_cbmdos.cpp index bf51766ad6b..1801c0b269a 100644 --- a/src/lib/formats/fs_cbmdos.cpp +++ b/src/lib/formats/fs_cbmdos.cpp @@ -2,11 +2,11 @@ // copyright-holders:Nathan Woods /*************************************************************************** - fs_cbmdos.cpp + fs_cbmdos.cpp - Management of CBM (Commodore) DOS disk images + Management of CBM (Commodore) DOS disk images - http://fileformats.archiveteam.org/wiki/CBMFS + http://fileformats.archiveteam.org/wiki/CBMFS ***************************************************************************/ @@ -32,18 +32,18 @@ class impl : public filesystem_t { public: struct cbmdos_dirent { - u8 m_next_directory_track; - u8 m_next_directory_sector; - u8 m_file_type; - u8 m_file_first_track; - u8 m_file_first_sector; - char m_file_name[16]; - u8 m_first_side_sector_block_track; - u8 m_first_side_sector_block_sector; - u8 m_rel_file_record_length; - u8 m_unused[6]; - u8 m_sector_count_low; - u8 m_sector_count_high; + u8 m_next_directory_track; + u8 m_next_directory_sector; + u8 m_file_type; + u8 m_file_first_track; + u8 m_file_first_sector; + char m_file_name[16]; + u8 m_first_side_sector_block_track; + u8 m_first_side_sector_block_sector; + u8 m_rel_file_record_length; + u8 m_unused[6]; + u8 m_sector_count_low; + u8 m_sector_count_high; }; class block_iterator @@ -56,11 +56,11 @@ public: u8 size() const; private: - const impl & m_fs; - fsblk_t::block_t m_block; - std::set> m_visited_set; - u8 m_track; - u8 m_sector; + const impl & m_fs; + fsblk_t::block_t m_block; + std::set> m_visited_set; + u8 m_track; + u8 m_sector; }; impl(fsblk_t &blockdev); diff --git a/src/lib/formats/fs_cbmdos.h b/src/lib/formats/fs_cbmdos.h index bbc2a1c8a82..9732eb6b162 100644 --- a/src/lib/formats/fs_cbmdos.h +++ b/src/lib/formats/fs_cbmdos.h @@ -2,9 +2,9 @@ // copyright-holders:Nathan Woods /*************************************************************************** - fs_cbmdos.h + fs_cbmdos.h - Management of CBM (Commodore) DOS disk images + Management of CBM (Commodore) DOS disk images ***************************************************************************/ diff --git a/src/lib/formats/fs_coco_os9.cpp b/src/lib/formats/fs_coco_os9.cpp index 89e41175de7..84ee3622a3a 100644 --- a/src/lib/formats/fs_coco_os9.cpp +++ b/src/lib/formats/fs_coco_os9.cpp @@ -95,7 +95,7 @@ public: private: fsblk_t::block_t m_block; - std::string m_filename; + std::string m_filename; }; // ctor/dtor diff --git a/src/lib/formats/fs_coco_rsdos.cpp b/src/lib/formats/fs_coco_rsdos.cpp index 8c23b09362e..0bcf600db2b 100644 --- a/src/lib/formats/fs_coco_rsdos.cpp +++ b/src/lib/formats/fs_coco_rsdos.cpp @@ -25,8 +25,8 @@ namespace { class coco_rsdos_impl : public filesystem_t { public: - coco_rsdos_impl(fsblk_t &blockdev); - virtual ~coco_rsdos_impl() = default; + coco_rsdos_impl(fsblk_t &blockdev); + virtual ~coco_rsdos_impl() = default; struct rsdos_dirent { diff --git a/src/lib/formats/fs_oric_jasmin.cpp b/src/lib/formats/fs_oric_jasmin.cpp index 147e49e123e..d33c9dc8fe1 100644 --- a/src/lib/formats/fs_oric_jasmin.cpp +++ b/src/lib/formats/fs_oric_jasmin.cpp @@ -331,7 +331,7 @@ std::tuple oric_jasmin_impl::file_find(std::string if(ref_valid(fref) || file_is_system(bdir.rodata()+off)) { if(memcmp(bdir.rodata() + off + 3, name.data(), 12)) { bool sys = file_is_system(bdir.rodata() + off); - return std::make_tuple(bdir, off, sys); + return std::make_tuple(bdir, off, sys); } } } @@ -352,7 +352,7 @@ std::pair oric_jasmin_impl::metadata(const std::vector &path, const meta_data &meta) diff --git a/src/lib/formats/fs_prodos.cpp b/src/lib/formats/fs_prodos.cpp index 5350c20024a..c7e7e47532f 100644 --- a/src/lib/formats/fs_prodos.cpp +++ b/src/lib/formats/fs_prodos.cpp @@ -292,10 +292,10 @@ std::pair> prodos_impl::directory_contents(const s auto rootblk = m_blockdev.get(blk.r16l(off+0x11)); meta.set(meta_name::length, rootblk.r24l(0x005)); meta.set(meta_name::rsrc_length, rootblk.r24l(0x105)); - + } else if(type >= 1 && type <= 3) meta.set(meta_name::length, blk.r24l(off + 0x15)); - + res.emplace_back(dir_entry(type == 0xd ? dir_entry_type::dir : dir_entry_type::file, meta)); off += 39; } @@ -373,10 +373,10 @@ std::pair prodos_impl::metadata(const std::vector auto rootblk = m_blockdev.get(r16l(entry+0x11)); res.set(meta_name::length, rootblk.r24l(0x005)); res.set(meta_name::rsrc_length, rootblk.r24l(0x105)); - + } else if(type >= 1 && type <= 3) res.set(meta_name::length, r24l(entry + 0x15)); - + else return std::make_pair(ERR_UNSUPPORTED, meta_data()); } diff --git a/src/lib/formats/fs_vtech.cpp b/src/lib/formats/fs_vtech.cpp index f3a9b7d091f..f8126c2d58d 100644 --- a/src/lib/formats/fs_vtech.cpp +++ b/src/lib/formats/fs_vtech.cpp @@ -176,7 +176,7 @@ std::pair vtech_impl::metadata(const std::vector if(off == 0xffffffff) return std::make_pair(ERR_NOT_FOUND, meta_data()); - return std::make_pair(ERR_OK, file_metadata(bdir.rodata() + off)); + return std::make_pair(ERR_OK, file_metadata(bdir.rodata() + off)); } err_t vtech_impl::metadata_change(const std::vector &path, const meta_data &meta) diff --git a/src/mame/atari/nl_stuntcyc.cpp b/src/mame/atari/nl_stuntcyc.cpp index f1aff4ad52f..335726b8aa0 100644 --- a/src/mame/atari/nl_stuntcyc.cpp +++ b/src/mame/atari/nl_stuntcyc.cpp @@ -643,7 +643,7 @@ NETLIST_START(stuntcyc) ALIAS(R2, M8.QB) ALIAS(R3, M8.QC) -// TTL_74193(L8, FIXED_RAMP_ZONE_Q, FIXED_RAMP_ZONE, P, P, JUMP_Q, LOAD_Q, P, GRAVITY) // Schematics say C and D should be to VCC - maybe ground instead? +// TTL_74193(L8, FIXED_RAMP_ZONE_Q, FIXED_RAMP_ZONE, P, P, JUMP_Q, LOAD_Q, P, GRAVITY) // Schematics say C and D should be to VCC - maybe ground instead? // changed C,D to GROUND and bike will jump, so maybe schematics incorrect TTL_74193(L8, FIXED_RAMP_ZONE_Q, FIXED_RAMP_ZONE, GROUND, GROUND, JUMP_Q, LOAD_Q, P, GRAVITY) // Schematics say C and D should be to VCC - maybe ground instead? diff --git a/src/mame/barcrest/mpu4.cpp b/src/mame/barcrest/mpu4.cpp index 2f9f7fb1fe7..7c86bd62749 100644 --- a/src/mame/barcrest/mpu4.cpp +++ b/src/mame/barcrest/mpu4.cpp @@ -288,7 +288,7 @@ void mpu4_state::lamp_extend_large(int data,int column,int active) { for (int i = 0; i < 8; i++) { - // this includes bit 7, so you don't get a true 128 extra lamps as the last row is always 0 or 1 depending on which set of 64 we're dealing with + // this includes bit 7, so you don't get a true 128 extra lamps as the last row is always 0 or 1 depending on which set of 64 we're dealing with m_lamps[(8*column)+i+128+lampbase] = BIT(data, i); } m_lamp_strobe_ext[bit7] = column; @@ -528,8 +528,8 @@ void mpu4_state::pia_ic3_porta_w(uint8_t data) { m_overcurrent = true; } - - if (m_undercurrent_detect) + + if (m_undercurrent_detect) { m_undercurrent = true; } @@ -556,8 +556,8 @@ void mpu4_state::pia_ic3_portb_w(uint8_t data) { m_overcurrent = true; } - - if (m_undercurrent_detect) + + if (m_undercurrent_detect) { m_undercurrent = true; } @@ -747,7 +747,7 @@ uint8_t mpu4_state::pia_ic4_portb_r() { m_ic4_input_b |= 0x02; } - + if ( m_undercurrent ) { m_ic4_input_b |= 0x01; @@ -830,7 +830,7 @@ void mpu4_state::pia_ic5_porta_w(uint8_t data) { m_mpu4leds[((m_input_strobe | 8) << 3) | i] = BIT(data, i); } - // m_digits[m_input_strobe | 8] = data; + // m_digits[m_input_strobe | 8] = data; } break; diff --git a/src/mame/barcrest/mpu4_characteriser_pal.h b/src/mame/barcrest/mpu4_characteriser_pal.h index d1294bb3497..f0570d0c92d 100644 --- a/src/mame/barcrest/mpu4_characteriser_pal.h +++ b/src/mame/barcrest/mpu4_characteriser_pal.h @@ -1013,7 +1013,7 @@ public: // games with sequence starting // 00 e0 a8 38 90 68 30 60 e4 e8 18 d0 6c 10 60 c4 // Cloud 999 "SC9 5.0" - // Hit The Top "H4T 2.0" + // Hit The Top "H4T 2.0" static constexpr uint8_t hittop_characteriser_prot[8] = { 0x00, 0x60, 0x00, 0x40, 0x40, 0x20, 0x00, 0x40 }; // good? @@ -1303,11 +1303,11 @@ public: // games with sequence starting // 00 e0 8c 58 b0 68 30 64 e4 cc 58 f0 2c 50 64 c4 88 5c f4 0c - // Dutch Liberty "DLI 1.0" - // Crackpot 100 Club "C1P 1.2" - // " CP 3.8" - // " CP 3.1" - // Dutch High Roller " HR 3.0" + // Dutch Liberty "DLI 1.0" + // Crackpot 100 Club "C1P 1.2" + // " CP 3.8" + // " CP 3.1" + // Dutch High Roller " HR 3.0" static constexpr uint8_t crkpot_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -1318,80 +1318,80 @@ public: static constexpr uint8_t bluediamond_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 24 24 a4 68 14 c4 28 d4 8c d8 f0 0c d0 8c - // Dutch Wild Timer "DWT 1.3" + // Dutch Wild Timer "DWT 1.3" static constexpr uint8_t wildtime_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 a0 a8 58 f4 8c d8 70 c4 e8 58 74 80 2c 94 4c - // Dutch Happy Joker "DHJ 1.2" - // Dutch Red Heat "DRH 1.2" + // Dutch Happy Joker "DHJ 1.2" + // Dutch Red Heat "DRH 1.2" static constexpr uint8_t redheat_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 60 60 c0 4c 10 84 48 b4 a8 98 d4 2c 90 - // Dutch Lucky Devil "DLD 1.3" - // Hungarian Jolly Joker "HJJ 1.4" - // Dutch Ceptor "DCE 1.0" - // Dutch Salsa "DSA 1.5" + // Dutch Lucky Devil "DLD 1.3" + // Hungarian Jolly Joker "HJJ 1.4" + // Dutch Ceptor "DCE 1.0" + // Dutch Salsa "DSA 1.5" static constexpr uint8_t salsa_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 a0 a8 1c f4 c8 1c b4 cc 5c 74 44 e0 28 - // Dutch 21 Club "DTW 2.7" - // Dutch Black & White "DBW 1.1" + // Dutch 21 Club "DTW 2.7" + // Dutch Black & White "DBW 1.1" static constexpr uint8_t blackwhite_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 c0 d0 1c ec 78 ac 30 4c 2c 24 cc 7c a4 d8 - // Magic Turbo "XST 0.4" - // Dutch Tricolor "DTC 2.5" + // Magic Turbo "XST 0.4" + // Dutch Tricolor "DTC 2.5" static constexpr uint8_t tricolor_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 84 8c 3c f4 4c 34 14 54 14 40 d4 4c 70 04 d0 58 f4 - // Dutch Turbo Reel "DTR 3.1" - // Grandstand Club "G2D 4.0" - // Grandstand Club " GD 1.1" + // Dutch Turbo Reel "DTR 3.1" + // Grandstand Club "G2D 4.0" + // Grandstand Club " GD 1.1" static constexpr uint8_t grandclub_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 30 10 0c 98 a8 c4 60 3c ac c4 7c b4 - // Dutch Taj Mahal "DTM 1.0" + // Dutch Taj Mahal "DTM 1.0" static constexpr uint8_t tajmahal_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 24 24 64 a4 ac 78 74 e0 6c 50 c0 ac 58 74 00 a4 ec f8 94 c8 - // Dutch Giant "DGI 2.1" + // Dutch Giant "DGI 2.1" static constexpr uint8_t giant_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 30 10 84 e0 f0 c4 60 b4 54 80 f4 50 80 f4 40 b0 d4 - // Dutch Random Roulette "DRR 2.2" + // Dutch Random Roulette "DRR 2.2" static constexpr uint8_t randroul_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 c0 c8 38 f4 8c b8 70 a4 e8 38 74 80 4c b0 0c 94 - // Dutch Red White & Blue "DRW 1.4" + // Dutch Red White & Blue "DRW 1.4" static constexpr uint8_t redwhite_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 50 10 a0 c4 c4 74 30 b0 34 00 f0 14 80 f4 04 - // Dutch Techno Reel "DTE 1.3" + // Dutch Techno Reel "DTE 1.3" static constexpr uint8_t techno_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 60 68 38 d0 2c 90 24 e4 e8 3c f0 88 34 20 40 e8 bc f4 28 - // Super Way In "WS 1.0" + // Super Way In "WS 1.0" static constexpr uint8_t wayin_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 60 60 a0 2c 50 84 28 d4 c8 9c b4 48 94 - // Dutch Black Cat "DBL 1.4" - // Dutch Rio Tropico "DRT 1.0" + // Dutch Black Cat "DBL 1.4" + // Dutch Rio Tropico "DRT 1.0" static constexpr uint8_t blkcat_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 24 24 64 2c 30 48 30 68 58 5c 5c - // Dutch Golden Joker "DGJ 1.2" + // Dutch Golden Joker "DGJ 1.2" static constexpr uint8_t goljok_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 44 44 c4 1c 24 c4 14 c8 b8 a4 dc ec b0 58 a4 - // Dutch Stars And Bars "DSB 2.8" + // Dutch Stars And Bars "DSB 2.8" static constexpr uint8_t starsbars_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // games with sequence starting 00 a0 88 18 b0 48 50 60 e4 c8 58 90 - // Top Gear (Barcrest) (MPU4) (TG4 1.1) + // Top Gear (Barcrest) (MPU4) (TG4 1.1) static constexpr uint8_t topgear_characteriser_prot[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; protected: diff --git a/src/mame/barcrest/mpu4mod4oki.cpp b/src/mame/barcrest/mpu4mod4oki.cpp index 1597fca59c9..0294a2be756 100644 --- a/src/mame/barcrest/mpu4mod4oki.cpp +++ b/src/mame/barcrest/mpu4mod4oki.cpp @@ -137,33 +137,33 @@ the code looks more complex, so there could be other pitfalls with payout etc? - --------------------- + --------------------- - Escalera Tobogan use the "Barcrest Sampled Sound" game PCB: + Escalera Tobogan use the "Barcrest Sampled Sound" game PCB: - BARCREST SAMPLED SOUND - _________________________ - | · | - | · | - | · | - | · |_____________ - | · _________ _________ |_| - | SN74LS139N |_A880440| |_| - | _____________________ |_| - | | ST EF68B21P | |_| - | |____________________| |_| - | _______ _______________ |_| - | | OKI | | PROG EPROM | |_| - | | M6376 | |_______________| |_| - | |_______| ______________ |_| - | | ST EF68B40P | |_| - | _______________ |______________| |_| - | | SOUND 2 | __ ___________|_| - | |______________| | | | - | _______________ | | | - | | SOUND 1 | | |<-PAL16L8D - | |______________| |_| | - |________________________| + BARCREST SAMPLED SOUND + _________________________ + | · | + | · | + | · | + | · |_____________ + | · _________ _________ |_| + | SN74LS139N |_A880440| |_| + | _____________________ |_| + | | ST EF68B21P | |_| + | |____________________| |_| + | _______ _______________ |_| + | | OKI | | PROG EPROM | |_| + | | M6376 | |_______________| |_| + | |_______| ______________ |_| + | | ST EF68B40P | |_| + | _______________ |______________| |_| + | | SOUND 2 | __ ___________|_| + | |______________| | | | + | _______________ | | | + | | SOUND 1 | | |<-PAL16L8D + | |______________| |_| | + |________________________| */ @@ -6753,7 +6753,7 @@ INPUT_PORTS_START( m4andybt ) PORT_DIPSETTING( 0x04, "20p / 250 GBP" ) PORT_DIPSETTING( 0x05, "25p / 250 GBP" ) PORT_DIPSETTING( 0x06, "25p / 250 GBP (duplicate 1)" ) - PORT_DIPSETTING( 0x07, "25p / 250 GBP (duplicate 2)" ) + PORT_DIPSETTING( 0x07, "25p / 250 GBP (duplicate 2)" ) INPUT_PORTS_END void mpu4mod4oki_machines_state::init_m4andybt() @@ -8610,8 +8610,8 @@ ROM_START( m4blkcat ) ROM_REGION( 0x080000, "msm6376", 0 ) ROM_LOAD( "dblcsnd.bin", 0x0000, 0x080000, CRC(c90fa8ad) SHA1(a98f03d4b6f5892333279bff7537d4d6d887da62) ) -// ROM_REGION( 0x200000, "msm6376_alt", 0 ) // bad dump of some sound rom? - just dblcsnd.bin in hex format! -// ROM_LOAD( "sdbl_1.snd", 0x0000, 0x18008e, CRC(e36f71ae) SHA1(ebb643cfa02d28550f2bef135ceefc902baf0df6) ) +// ROM_REGION( 0x200000, "msm6376_alt", 0 ) // bad dump of some sound rom? - just dblcsnd.bin in hex format! +// ROM_LOAD( "sdbl_1.snd", 0x0000, 0x18008e, CRC(e36f71ae) SHA1(ebb643cfa02d28550f2bef135ceefc902baf0df6) ) ROM_END // similar to m4gldjok, only accepts a single credit with '8' (coin lock issues?) @@ -8696,7 +8696,7 @@ GAME(199?, m4nile, 0, mod4oki_cheatchr_pal