From 3984f8f883ab30ecba97c9f9497445fe91aa00da Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 22 May 2022 09:36:01 +1000 Subject: [PATCH] srcclean in preparation for release --- hash/apple2_flop_clcracked.xml | 6 +- hash/apple2_flop_orig.xml | 10 +-- hash/gbcolor.xml | 4 +- hash/ibm5150.xml | 6 +- hash/megadriv.xml | 2 +- hash/specpls3_flop.xml | 22 +++--- hash/spectrum_cass.xml | 4 +- hash/timex_cass.xml | 20 ++--- scripts/src/3rdparty.lua | 2 +- scripts/target/mame/nl.lua | 6 +- src/devices/bus/mtx/cfx.cpp | 16 ++-- src/devices/cpu/hp2100/hp2100d.cpp | 2 +- src/devices/cpu/m68hc16/cpu16.cpp | 2 +- src/devices/machine/acorn_bmu.cpp | 2 +- src/devices/machine/i2cmem.cpp | 2 +- src/devices/machine/pcf8573.cpp | 2 +- src/devices/machine/pcf8583.cpp | 2 +- src/devices/machine/steppers.cpp | 2 +- src/lib/formats/acorn_dsk.cpp | 2 +- src/lib/formats/fs_coco_rsdos.cpp | 4 +- src/mame/audio/fruitsamples.cpp | 2 +- src/mame/audio/fruitsamples.h | 2 +- src/mame/audio/nl_jpmsru.cpp | 16 ++-- src/mame/drivers/aa310.cpp | 4 +- src/mame/drivers/hotchili.cpp | 32 ++++---- src/mame/drivers/jpmsru.cpp | 102 ++++++++++++------------ src/mame/drivers/magicard.cpp | 82 ++++++++++---------- src/mame/drivers/vic20.cpp | 18 ++--- src/mame/layout/hotchili.lay | 50 ++++++------ src/mame/layout/j_dud.lay | 120 ++++++++++++++--------------- src/mame/layout/j_ewn.lay | 120 ++++++++++++++--------------- src/mame/layout/j_lan.lay | 120 ++++++++++++++--------------- src/mame/layout/j_ndu.lay | 120 ++++++++++++++--------------- src/mame/layout/jpmsru.lay | 40 +++++----- 34 files changed, 473 insertions(+), 473 deletions(-) diff --git a/hash/apple2_flop_clcracked.xml b/hash/apple2_flop_clcracked.xml index cd4befc0e60..780ac47245a 100644 --- a/hash/apple2_flop_clcracked.xml +++ b/hash/apple2_flop_clcracked.xml @@ -48008,9 +48008,9 @@ license:CC0 Marshware - + diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index 0d983610e8f..0fb0741eb5e 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -22556,11 +22556,11 @@ license:CC0 Marshware - - - + + + diff --git a/hash/gbcolor.xml b/hash/gbcolor.xml index 44c23243ffd..65c90705576 100644 --- a/hash/gbcolor.xml +++ b/hash/gbcolor.xml @@ -7468,7 +7468,7 @@ license:CC0 - + Green Beret (prototype 1) 2000 Kak @@ -7486,7 +7486,7 @@ license:CC0 - + Green Beret (prototype 2) 2000 Kak diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml index 9bc8300087e..15344410031 100644 --- a/hash/ibm5150.xml +++ b/hash/ibm5150.xml @@ -8263,7 +8263,7 @@ has been replaced with an all-zero block. --> - + Ancient Land of Ys 1989 @@ -14332,7 +14332,7 @@ has been replaced with an all-zero block. --> - + Sex Vixens from Space 1989 @@ -16165,7 +16165,7 @@ has been replaced with an all-zero block. --> - + World Championship Soccer (5.25") 1991 diff --git a/hash/megadriv.xml b/hash/megadriv.xml index 4833dd32e7d..ee177e51e06 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -10351,7 +10351,7 @@ but dumps still have to be confirmed. The Adventures of Mighty Max (USA) 1994 Ocean - + diff --git a/hash/specpls3_flop.xml b/hash/specpls3_flop.xml index c864e811aca..1714ef4146c 100644 --- a/hash/specpls3_flop.xml +++ b/hash/specpls3_flop.xml @@ -10,21 +10,21 @@ license:CC0 @@ -7553,7 +7553,7 @@ license:CC0 - + Artura (alt) 1989 Gremlin Graphics Software diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index d2279fa2149..c8d0f5b97c2 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -8935,7 +8935,7 @@ license:CC0 - + Exolon (Erbe) 1987 @@ -23224,7 +23224,7 @@ license:CC0 - + Shock Megademo 1992 Sinclair User diff --git a/hash/timex_cass.xml b/hash/timex_cass.xml index 6198eacf4de..c4816654b28 100644 --- a/hash/timex_cass.xml +++ b/hash/timex_cass.xml @@ -1329,16 +1329,16 @@ license:CC0 Covertapes from "Byte Power, 1st Class Magazine" ################################################## --> Byte Power (February 1988) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 59c3f1b720b..1787fc09ad3 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -2239,7 +2239,7 @@ project "asmjit" buildoptions { "-Wno-maybe-uninitialized", } - end + end configuration { } diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index a53bb46e7c5..a14376befeb 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -400,12 +400,12 @@ files{ MAME_DIR .. "src/mame/drivers/starcrus.cpp", MAME_DIR .. "src/mame/includes/starcrus.h", MAME_DIR .. "src/mame/video/starcrus.cpp", - + MAME_DIR .. "src/mame/drivers/dragrace.cpp", MAME_DIR .. "src/mame/includes/dragrace.h", MAME_DIR .. "src/mame/audio/dragrace.cpp", MAME_DIR .. "src/mame/video/dragrace.cpp", - + -- Skeletons ... MAME_DIR .. "src/mame/drivers/a1supply.cpp", @@ -423,7 +423,7 @@ files{ MAME_DIR .. "src/mame/drivers/segattl.cpp", MAME_DIR .. "src/mame/drivers/taitottl.cpp", MAME_DIR .. "src/mame/drivers/usbilliards.cpp", - + MAME_DIR .. "src/mame/drivers/jpmsru.cpp", MAME_DIR .. "src/mame/audio/nl_jpmsru.cpp", diff --git a/src/devices/bus/mtx/cfx.cpp b/src/devices/bus/mtx/cfx.cpp index 1c5231595ca..d80290606c9 100644 --- a/src/devices/bus/mtx/cfx.cpp +++ b/src/devices/bus/mtx/cfx.cpp @@ -110,14 +110,14 @@ void mtx_cfx_device::device_reset() void mtx_cfx_device::portc_w(uint8_t data) { /* - b0 A0 - b1 A1 - b2 A2 - b3 CS0 - b4 CS1 - b5 WRITE - b6 READ - b7 RESET + b0 A0 + b1 A1 + b2 A2 + b3 CS0 + b4 CS1 + b5 WRITE + b6 READ + b7 RESET */ if (BIT(data, 7)) diff --git a/src/devices/cpu/hp2100/hp2100d.cpp b/src/devices/cpu/hp2100/hp2100d.cpp index 06463ea2b4a..eef32f84776 100644 --- a/src/devices/cpu/hp2100/hp2100d.cpp +++ b/src/devices/cpu/hp2100/hp2100d.cpp @@ -145,7 +145,7 @@ offs_t hp2100_disassembler::dasm_srg(std::ostream &stream, u16 inst) const stream << s_shift_ops[BIT(inst, 11)][BIT(inst, 0, 3)]; } } - + return 1 | flags; } diff --git a/src/devices/cpu/m68hc16/cpu16.cpp b/src/devices/cpu/m68hc16/cpu16.cpp index e0a1cbe6fb8..08f87783911 100644 --- a/src/devices/cpu/m68hc16/cpu16.cpp +++ b/src/devices/cpu/m68hc16/cpu16.cpp @@ -363,7 +363,7 @@ void cpu16_device::device_start() save_item(NAME(m_sl)); save_item(NAME(m_index_mask)); save_item(NAME(m_sequence)); - save_item(NAME(m_ea)); + save_item(NAME(m_ea)); save_item(NAME(m_tmp)); save_item(NAME(m_start)); } diff --git a/src/devices/machine/acorn_bmu.cpp b/src/devices/machine/acorn_bmu.cpp index 96e0759f200..ce3aacf8d2f 100644 --- a/src/devices/machine/acorn_bmu.cpp +++ b/src/devices/machine/acorn_bmu.cpp @@ -145,7 +145,7 @@ WRITE_LINE_MEMBER(acorn_bmu_device::scl_w) m_register++; break; } - + if( m_state != STATE_IDLE ) { m_sdar = 0 ; diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index 8b6358eceac..8c64c372358 100644 --- a/src/devices/machine/i2cmem.cpp +++ b/src/devices/machine/i2cmem.cpp @@ -470,7 +470,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_scl ) } break; } - + if( m_state != STATE_IDLE ) { m_sdar = 0 ; diff --git a/src/devices/machine/pcf8573.cpp b/src/devices/machine/pcf8573.cpp index 133fa5a5d7b..09cb4c340d3 100644 --- a/src/devices/machine/pcf8573.cpp +++ b/src/devices/machine/pcf8573.cpp @@ -250,7 +250,7 @@ WRITE_LINE_MEMBER(pcf8573_device::scl_w) } break; } - + if( m_state != STATE_IDLE ) { m_sdar = 0 ; diff --git a/src/devices/machine/pcf8583.cpp b/src/devices/machine/pcf8583.cpp index 4e5a81085d3..63a755d1077 100644 --- a/src/devices/machine/pcf8583.cpp +++ b/src/devices/machine/pcf8583.cpp @@ -314,7 +314,7 @@ WRITE_LINE_MEMBER(pcf8583_device::scl_w) m_register++; break; } - + if (m_state != STATE_IDLE) { m_sdar = 0 ; diff --git a/src/devices/machine/steppers.cpp b/src/devices/machine/steppers.cpp index 6f1e8cf8369..f59713e60b5 100644 --- a/src/devices/machine/steppers.cpp +++ b/src/devices/machine/steppers.cpp @@ -403,7 +403,7 @@ void reel_device::advance_phase() break; } break; - + case SRU_200STEP_REEL : //Standard drive table is 2,3,1,9,8,c,4,6 //Starpoint mechanism, custom for JPM? diff --git a/src/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp index 3b9df1a585d..aa6fc9f2e00 100644 --- a/src/lib/formats/acorn_dsk.cpp +++ b/src/lib/formats/acorn_dsk.cpp @@ -219,7 +219,7 @@ int acorn_dsd_format::find_size(util::random_read &io, uint32_t form_factor, con io.read_at(0x0226, cat, 2, actual); if ((memcmp(cat, "\x4f\x14", 2) == 0 || memcmp(cat, "\x4f\x0a", 2) == 0) && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) return i; - + // read sector count from side 0 catalogue io.read_at(0x100, cat, 8, actual); sectors0 = ((cat[6] & 3) << 8) + cat[7]; diff --git a/src/lib/formats/fs_coco_rsdos.cpp b/src/lib/formats/fs_coco_rsdos.cpp index c229257d624..3829159938f 100644 --- a/src/lib/formats/fs_coco_rsdos.cpp +++ b/src/lib/formats/fs_coco_rsdos.cpp @@ -71,7 +71,7 @@ public: std::optional m_current_granule; u8 m_maximum_granules; u16 m_last_sector_bytes; - std::bitset<256> m_visited_granules; + std::bitset<256> m_visited_granules; }; class file : public ifile_t { @@ -428,7 +428,7 @@ bool impl::granule_iterator::next(u8 &granule, u16 &byte_count) // check for cycles, which should only happen if the disk is corrupt (or not in RS-DOS format) if (m_visited_granules[*next_granule]) - next_granule = std::nullopt; // this is corrupt! + next_granule = std::nullopt; // this is corrupt! else m_visited_granules.set(*next_granule); } diff --git a/src/mame/audio/fruitsamples.cpp b/src/mame/audio/fruitsamples.cpp index 3cf044babce..9f2a2ac76a8 100644 --- a/src/mame/audio/fruitsamples.cpp +++ b/src/mame/audio/fruitsamples.cpp @@ -2,7 +2,7 @@ // copyright-holders:SomeRandomGuyIdk /*************************************************************************** - Fruit machine mechanical sound samples + Fruit machine mechanical sound samples ***************************************************************************/ diff --git a/src/mame/audio/fruitsamples.h b/src/mame/audio/fruitsamples.h index 69125984061..2b5f06092bb 100644 --- a/src/mame/audio/fruitsamples.h +++ b/src/mame/audio/fruitsamples.h @@ -2,7 +2,7 @@ // copyright-holders:SomeRandomGuyIdk /*************************************************************************** - Fruit machine mechanical sound samples + Fruit machine mechanical sound samples ***************************************************************************/ diff --git a/src/mame/audio/nl_jpmsru.cpp b/src/mame/audio/nl_jpmsru.cpp index 5560a6a8b9f..3e85ea08cea 100644 --- a/src/mame/audio/nl_jpmsru.cpp +++ b/src/mame/audio/nl_jpmsru.cpp @@ -29,12 +29,12 @@ NETLIST_START(jpmsru) NET_C(R8.3, GND) RES(R9, RES_K(6.8)) RES(R10, 270) - + CAP(C1, CAP_P(1000)) CAP(C2, CAP_U(0.22)) - + NE566_DIP(IC14) - + NET_C(IN1.Q, R1.1) NET_C(IN2.Q, R2.1) NET_C(IN3.Q, R3.1) @@ -45,20 +45,20 @@ NETLIST_START(jpmsru) NET_C(R7.2, V5, R8.1) NET_C(R8.2, R9.1) NET_C(R9.2, C1.2, IC14.6) - + NET_C(VM5, IC14.1, C2.1) NET_C(C2.2, IC14.7) - + NET_C(IC14.3, R10.1) ALIAS(OUT, R10.2) - + NET_C(V5, IC14.8) - + OPTIMIZE_FRONTIER(R1.1, RES_K(1.5), 50) OPTIMIZE_FRONTIER(R2.1, RES_K(1.5), 50) OPTIMIZE_FRONTIER(R3.1, RES_K(1.5), 50) OPTIMIZE_FRONTIER(R4.1, RES_K(1.5), 50) OPTIMIZE_FRONTIER(R5.1, RES_K(1.5), 50) OPTIMIZE_FRONTIER(R6.1, RES_K(1.5), 50) - + NETLIST_END() diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp index 3f4237471fe..a14cfe7ac2c 100644 --- a/src/mame/drivers/aa310.cpp +++ b/src/mame/drivers/aa310.cpp @@ -339,7 +339,7 @@ public: void aa3010(machine_config &config); void aa3020(machine_config &config); void aa4000(machine_config &config); - + required_device m_i2cmem; protected: @@ -396,7 +396,7 @@ protected: private: required_device m_lc; required_device m_bmu; - + }; diff --git a/src/mame/drivers/hotchili.cpp b/src/mame/drivers/hotchili.cpp index bcb2aac9081..edcf39766d0 100644 --- a/src/mame/drivers/hotchili.cpp +++ b/src/mame/drivers/hotchili.cpp @@ -130,7 +130,7 @@ 23 OVER 5000 CREDITS CALL ATT. 24 OVER 10000 CREDITS CALL ATT. 25 NO HAY MENSAJE - 26 1ST GAMBLE OVER + 26 1ST GAMBLE OVER 27 NO MESSAGE 28 FOR HAND PAY PRESS COLLECT 29 FREE GAME #1 @@ -187,12 +187,12 @@ public: void hotchili(machine_config &config); void init_hc(); - + protected: // driver_device overrides virtual void machine_start() override; - + private: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -200,7 +200,7 @@ private: void seta001_ctrl_write(offs_t offs, uint8_t data); uint8_t seta001_ctrl_read(offs_t offs); - + //external ram void extram_w(offs_t offset, uint8_t data); uint8_t extram_r(offs_t offset); @@ -213,11 +213,11 @@ private: //inports uint8_t inport0_r(); uint8_t inport3_r(); - + //outports void outp1_w(offs_t offset, uint8_t data); void outp2_w(offs_t offset, uint8_t data); - + // devices required_device m_maincpu; required_device m_seta001; @@ -295,7 +295,7 @@ void hotchili_state::hc_map(address_map &map) map(0xe000, 0xe2ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r8), FUNC(seta001_device::spriteylow_w8)); map(0xe300, 0xe303).ram().w(m_seta001, FUNC(seta001_device::spritectrl_w8)); map(0xe800, 0xe800).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); - map(0xf000, 0xf00c).rw( FUNC(hotchili_state::extram_r), FUNC(hotchili_state::extram_w)); + map(0xf000, 0xf00c).rw( FUNC(hotchili_state::extram_r), FUNC(hotchili_state::extram_w)); map(0xf200, 0xf200).w(FUNC(hotchili_state::outp2_w)); // outport (mem img ca85h) map(0xf300, 0xf300).w(FUNC(hotchili_state::bankswitch_w)); map(0xf400, 0xf40c).w(FUNC(hotchili_state::outp1_w)); // 4 outports 0,4,8,c (mem img ca81h - ca84h) @@ -317,10 +317,10 @@ static INPUT_PORTS_START( hotchili ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE ) PORT_NAME("All Clear / Configuration") // pressed on startup PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unknown - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) // active: enables RNG and read inputs on secondary buffer (inputs with special timing) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) // active: enables RNG and read inputs on secondary buffer (inputs with special timing) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meter Reading Key") PORT_TOGGLE - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_U) PORT_NAME("Jackpot Reset Key") - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_6) PORT_NAME("Clear Att. Key") //Next Page into Input or Output Test + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_U) PORT_NAME("Jackpot Reset Key") + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_6) PORT_NAME("Clear Att. Key") //Next Page into Input or Output Test PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE ) PORT_NAME("Collect") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8) PORT_NAME("Reserve / Next (Met.Read)") @@ -400,7 +400,7 @@ uint8_t hotchili_state::inport0_r() uint8_t hotchili_state::inport3_r() { - return m_meters; // meters signal feedback + return m_meters; // meters signal feedback } @@ -418,18 +418,18 @@ void hotchili_state::outp1_w(offs_t offset, uint8_t data) m_lamp[1] = BIT(data,1); // 2nd Start m_lamp[2] = BIT(data,2); // 3rd Start m_lamp[3] = BIT(data,3); // 4th Start - m_lamp[4] = BIT(data,4); // 5th Start - m_lamp[5] = BIT(data,5); + m_lamp[4] = BIT(data,4); // 5th Start + m_lamp[5] = BIT(data,5); m_lamp[6] = BIT(data,6); m_lamp[7] = BIT(data,7); // Motor Hopper break; case 1: m_lamp[8] = BIT(data,0); // 1st Start - Test Mode - m_lamp[9] = BIT(data,1); // 2nd Start + m_lamp[9] = BIT(data,1); // 2nd Start m_lamp[10] = BIT(data,2); // 3rd Start m_lamp[11] = BIT(data,3); // 4th Start - m_lamp[12] = BIT(data,4); // 5th Start + m_lamp[12] = BIT(data,4); // 5th Start m_lamp[13] = BIT(data,5); // Coin Lock Out Coil m_lamp[14] = BIT(data,6); // Divert Solenoid m_lamp[15] = BIT(data,7); // Divert Solenoid @@ -572,7 +572,7 @@ void hotchili_state::hotchili(machine_config &config) m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); m_screen->set_screen_update(FUNC(hotchili_state::screen_update)); m_screen->screen_vblank().set_inputline(m_maincpu, 0, HOLD_LINE); - m_screen->set_palette(m_palette); + m_screen->set_palette(m_palette); SETA001_SPRITE(config, m_seta001, 16'000'000, m_palette, gfx_hotchili); m_seta001->set_fg_yoffsets( -0x12, 0x0e ); diff --git a/src/mame/drivers/jpmsru.cpp b/src/mame/drivers/jpmsru.cpp index 98eba5a7611..a8d9cb2b4b7 100644 --- a/src/mame/drivers/jpmsru.cpp +++ b/src/mame/drivers/jpmsru.cpp @@ -1,46 +1,46 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, SomeRandomGuyIdk /********************************************************************** - - JPM Stepper Reel Unit - - JPM's first CPU-based fruit machine platform, from late 1978/1979. - Notably the first system to use stepper reels instead of EM reels. - Uses a 1.5MHz TMS9980A CPU together with some TTL for I/O providing - 56 outputs (16 used by reels) & 24 inputs (8 used by optos), - a ROM card holding game ROMs, and a selection of expansion boards. - Sound is output by a simple 6-tone NE556-based circuit. - - TODO: - - Layouts - - Netlist audio works but isn't quite right. The tone pot needs to - be set to 17% for it to not cut out, and even then popping can be heard. - Needs a look from someone with more analog knowledge than me. - - Add remaining games - - Expansion boards: - Bus Extension - Optional board with 128 nibbles NVRAM and 24 DIP switches, only supported by early JPM games - - Input Extension - Same as Bus Extension except with 8 extra inputs replacing the NVRAM (moved to ROM card), used by club games - - Logic Extension - 56 extra outputs addressed from CRU memory, accessed via 9 existing outputs - - Maxi Logic Extension - 64 extra outputs addressed from CRU memory, accessed via 9 existing outputs - - Mini Logic Extension - 16 extra outputs addressed directly from CRU memory - - Output Extension - 16 extra outputs addressed from main memory - - ROM cards: - Most SRU games used a 3K ROM card for storage. A few later games had a 4K card, - and a 6K card with 512 nibbles of NVRAM was used for club games. - + + JPM Stepper Reel Unit + + JPM's first CPU-based fruit machine platform, from late 1978/1979. + Notably the first system to use stepper reels instead of EM reels. + Uses a 1.5MHz TMS9980A CPU together with some TTL for I/O providing + 56 outputs (16 used by reels) & 24 inputs (8 used by optos), + a ROM card holding game ROMs, and a selection of expansion boards. + Sound is output by a simple 6-tone NE556-based circuit. + + TODO: + - Layouts + - Netlist audio works but isn't quite right. The tone pot needs to + be set to 17% for it to not cut out, and even then popping can be heard. + Needs a look from someone with more analog knowledge than me. + - Add remaining games + + Expansion boards: + Bus Extension + Optional board with 128 nibbles NVRAM and 24 DIP switches, only supported by early JPM games + + Input Extension + Same as Bus Extension except with 8 extra inputs replacing the NVRAM (moved to ROM card), used by club games + + Logic Extension + 56 extra outputs addressed from CRU memory, accessed via 9 existing outputs + + Maxi Logic Extension + 64 extra outputs addressed from CRU memory, accessed via 9 existing outputs + + Mini Logic Extension + 16 extra outputs addressed directly from CRU memory + + Output Extension + 16 extra outputs addressed from main memory + + ROM cards: + Most SRU games used a 3K ROM card for storage. A few later games had a 4K card, + and a 6K card with 512 nibbles of NVRAM was used for club games. + **********************************************************************/ #include "emu.h" @@ -71,7 +71,7 @@ class jpmsru_state : public driver_device { public: - jpmsru_state(const machine_config &mconfig, device_type type, const char *tag) : + jpmsru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inputs(*this, "IN%u", 0U), @@ -165,10 +165,10 @@ void jpmsru_state::jpmsru_3k_map(address_map &map) { map(0x0000, 0x0bff).rom(); map(0x0e00, 0x0eff).ram(); - /* Some sort of peculiar data logging system used by later JPM games. - It consists of 32 bytes of memory where games write various statistics - (total plays, win amount, win symbol, gamble win/lose etc.) either as numeric values - or ASCII text. Most likely for JPM internal use only. */ + /* Some sort of peculiar data logging system used by later JPM games. + It consists of 32 bytes of memory where games write various statistics + (total plays, win amount, win symbol, gamble win/lose etc.) either as numeric values + or ASCII text. Most likely for JPM internal use only. */ map(0x1400, 0x141f).ram(); } @@ -298,7 +298,7 @@ void jpmsru_state::reel_w(offs_t offset, uint8_t data) const int bit = offset & 0x3; m_reelbits[reel] = (m_reelbits[reel] & ~(1 << bit)) | (data ? (1 << bit) : 0); - if(bit == 3) + if(bit == 3) { m_reel[reel]->update(m_reelbits[reel]); const char reelnames[4][6] = { "reel1", "reel2", "reel3", "reel4" }; @@ -319,7 +319,7 @@ void jpmsru_state::out_lamp_ext_w(offs_t offset, uint8_t data) void jpmsru_state::out_disp_w(offs_t offset, uint8_t data) { - switch(offset) + switch(offset) { case 0: m_disp_digit = (m_disp_digit & ~0x01) | (data ? 0x00 : 0x01); break; case 1: m_disp_digit = (m_disp_digit & ~0x02) | (data ? 0x00 : 0x02); break; @@ -433,7 +433,7 @@ uint8_t jpmsru_state::busext_dips_r(offs_t offset) TIMER_DEVICE_CALLBACK_MEMBER(jpmsru_state::int1) { - if(m_int1_en) + if(m_int1_en) { m_int1 = 1; update_int(); @@ -442,7 +442,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jpmsru_state::int1) TIMER_DEVICE_CALLBACK_MEMBER(jpmsru_state::int2) { - if(m_int2_en) + if(m_int2_en) { m_int2 = 1; update_int(); @@ -718,8 +718,8 @@ static INPUT_PORTS_START( j_lan2 ) PORT_MODIFY("IN0") PORT_CONFNAME( 0x80, 0x80, "5p/10p jumper" ) - PORT_CONFSETTING( 0x00, "5p" ) - PORT_CONFSETTING( 0x80, "10p" ) + PORT_CONFSETTING( 0x00, "5p" ) + PORT_CONFSETTING( 0x80, "10p" ) INPUT_PORTS_END void jpmsru_state::machine_start() diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index 7d7b0183132..c38986c2b1e 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -94,7 +94,7 @@ ------------------------------------------------------------------------------------------------------ V 2.1 | puzzleme | ESI1, 24C02, YM2149F, RTC added ------------------------------------------------------------------------------------------------------ - V 2.2 | magicarde | + V 2.2 | magicarde | ------------------------------------------------------------------------------------------------------ V 4.0 | magicardj, magicardf, magicle | ESI1 replaced by ALTERA MAX EPM7128SQC100 | | YM2149F replaced by YMZ284-D, MX29F1610 added @@ -866,7 +866,7 @@ ROM_END Other components are unreadable in the PCB picture. - + */ ROM_START( magicardeb ) ROM_REGION( 0x80000, "maincpu", 0 ) // 68070 Code & GFX @@ -886,7 +886,7 @@ ROM_END Other components are unreadable in the PCB picture. - + */ ROM_START( magicardec ) ROM_REGION( 0x80000, "maincpu", 0 ) // 68070 Code & GFX @@ -1262,10 +1262,10 @@ ROM_END Impera. PCB layout: - ___________________________________________________________________________________________________________________________ + ___________________________________________________________________________________________________________________________ | ___ ___ ___ ___ | | ___ | | | | | | | | | - | | B | | A | | A | | A | | A | ______________________________________ |____ + | | B | | A | | A | | A | | A | ______________________________________ |____ | |___| _____ | | | | | | | | | | ___| | | _ | |___| |___| |___| |___| | YAMAHA | ___| | _______ |BATTE| | YM2149F | ___| @@ -1274,14 +1274,14 @@ ROM_END | |_____| | M | | M | | M | | M | ___| | | P | | P | | P | | P | ___________________________ ______________ _____ ___| | ____ ____ | T | | T | | T | | T | | | | ULN2803A | | O O | ___| - | |HY62| |HY62| | Y | | Y | | Y | | Y | | KDA0476CN_66 | |______________| | O O | ____| + | |HY62| |HY62| | Y | | Y | | Y | | Y | | KDA0476CN_66 | |______________| | O O | ____| | |64AL| |64AL| |___| |___| |___| |___| | KOREA 219 IC20| ________________ | O O | | | |J_10| |J_10| |___________________________| | 74HC273N | | O O | | | | | | | |________________| | O O | | | |____| |____| ___________ ____________ ________________ | O O | | | | 74HC04AP | |EMPTY SOCKET| | 74HC245N | | O O | | | _______ _______ |___________| |____________| |________________| | O O | | - | | | | | XTAL1 |_____| |____ + | | | | | XTAL1 |_____| |____ | | | | | _________________ XTAL3 ______________ CON3 ___| | | EMPTY | | EMPTY | | IMPERA 8 | _____ _____________ _____________ | TD62083AP | ___| | | SOCKET| | SOCKET| | 209751 | |24C02| | PIC16C54 | | HCF40106BE | |______________| ___| @@ -1304,7 +1304,7 @@ ROM_END | | | | | | 324320 | ___| | | | | | | DfD9501V3 Y | ___| | | | | | |_________________| ___| - | | IC21| | IC21| IC1 ______________ _________ ____| + | | IC21| | IC21| IC1 ______________ _________ ____| | |_______| |_______| | RTC 72421A | | DS1207 | | | IMPERA BOARD REV V2.1 |______________| |_________| | |___________________________________________________________________________________________________________________________| @@ -1335,22 +1335,22 @@ ROM_END PCB layout: ________________________________________________________________________________________________________________ | | - | __________ _____________ ___________ ___ | - | | 74LS04 | |LC324256BP-70| | C | | | ___ |__ - | |__________| |_____________| |___________| |EMP| |. .| __| + | __________ _____________ ___________ ___ | + | | 74LS04 | |LC324256BP-70| | C | | | ___ |__ + | |__________| |_____________| |___________| |EMP| |. .| __| | _____________ |TY | |. .| __| | ____ |LC324256BP-70| | | |. .| __| | | A | |_____________| |SOC| |. .| __| | |____| _____________ |KET| |. .| __| | |LC324256BP-70| |___| |. .| __| | |_____________| __________________ |. .| __| - | _____________ | ADV476KN35E | |. .| __| + | _____________ | ADV476KN35E | |. .| __| | |LC324256BP-70| | | |___| __| | _______ |_____________| | OF19802.3 | | ||DS1207 | |__________________| | - ||_______| | - | ___ XTAL2 __________ | - | | | ________ ________________ | PIC16C54 | | + ||_______| | + | ___ XTAL2 __________ | + | | | ________ ________________ | PIC16C54 | | | ___ |PC7| | | | | |__________| |__ | | | |4HC| | | | IMPERA 8 | XTAL3 __| | |HEF| |273| |HYUNDAI | | | __| @@ -1360,25 +1360,25 @@ ROM_END | | | | | | | | DfD0922713 Y | __| | |___| |___| | | | | ___ ___ __| | | 9218A | |________________| _____________ | | | | __| - | _______ | | | 74HC245N | |PC7| |ULN| __| - | | | | KOREA | |_____________| |4HC| |280| __| + | _______ | | | 74HC245N | |PC7| |ULN| __| + | | | | KOREA | |_____________| |4HC| |280| __| | |BATTERY| |________| |273| |3A | __| | | | |P | | | __| | |_______| ________ ________ | | | | __| | | | | | | | | | __| | | | | | _____________ |___| |___| __| - | ___ | | | | XTAL1 | 74HC245N | ___ ___ __| + | ___ | | | | XTAL1 | 74HC245N | ___ ___ __| | | B | | | | | __________________ |_____________| | | | | __| | |___| | | | | | | |PC7| |ULN| __| | | EMPTY | | | | IMPERA 7 | |4HC| |280| __| | | SOCKET | |27C4002 | | | |273| |3A | __| - | | | | | | 230031 | _____________ |P | | | __| + | | | | | | 230031 | _____________ |P | | | __| | ___ ___ | | | | | | | 74HC245N | | | | | __| - | | | | | | | | | | DfD9249V3 Y | |_____________| | | | | __| + | | | | | | | | | | DfD9249V3 Y | |_____________| | | | | __| | |PAL| |PAL| | | | | | | |___| |___| __| | |CE | |CE | | | | | | | __________ __| | | | | | | | | | | | | CNY 74-4 | __| - | | | | | | | | | |__________________| _____________ |__________| __| + | | | | | | | | | |__________________| _____________ |__________| __| | | | | | | | | | | 74HC245N | __| | | | | | | | | | |_____________| __| | |___| |___| |________| |________| ___________ __| @@ -1410,22 +1410,22 @@ ROM_END PCB layout: ________________________________________________________________________________________________________________ | | - | __________ _____________ ___________ ___ | - | | 74LS04 | |HY51C4256S-10| | C | |904| ___ |__ - | |__________| |_____________| |___________| |9 | |. .| __| + | __________ _____________ ___________ ___ | + | | 74LS04 | |HY51C4256S-10| | C | |904| ___ |__ + | |__________| |_____________| |___________| |9 | |. .| __| | _____________ | | |. .| __| | ____ |HY51C4256S-10| |LT1| |. .| __| | | A | |_____________| |081| |. .| __| | |____| _____________ |CN | |. .| __| | |HY51C4256S-10| |___| |. .| __| | |_____________| __________________ |. .| __| - | _____________ | ADV476KN35E | |. .| __| + | _____________ | ADV476KN35E | |. .| __| | |HY51C4256S-10| | | |___| __| | _______ |_____________| | OF19802.3 | | ||DS1207 | |__________________| | - ||_______| | - | ___ XTAL2 | - | | | ________ ________________ | + ||_______| | + | ___ XTAL2 | + | | | ________ ________________ | | ___ |PC7| | | | | |__ | | | |4HC| | | | IMPERA 8 | __| | |HEF| |273| |HYUNDAI | | | __| @@ -1435,25 +1435,25 @@ ROM_END | | | | | | | | DTD9105I1 Y | __| | |___| |___| | | | | ___ ___ __| | | 9218A | |________________| _____________ | | | | __| - | _______ | | | 74HC245AP | |PC7| |ULN| __| - | | | | KOREA | |_____________| |4HC| |280| __| + | _______ | | | 74HC245AP | |PC7| |ULN| __| + | | | | KOREA | |_____________| |4HC| |280| __| | |BATTERY| |________| |273| |3A | __| | | | |AP | | | __| | |_______| ________ ________ | | | | __| | | | | | | | | | __| | | | | | _____________ |___| |___| __| - | ___ | | | | XTAL1 | 74HC245AP | ___ ___ __| + | ___ | | | | XTAL1 | 74HC245AP | ___ ___ __| | | B | | | | | __________________ |_____________| | | | | __| | |___| | | | | | | |PC7| |ULN| __| | | | | | | IMPERA 7 | |4HC| |280| __| | |D27C210 | |D27C210 | | | |273| |3A | __| - | | | | | | 155200 | _____________ |AP | | | __| + | | | | | | 155200 | _____________ |AP | | | __| | ___ ___ | | | | | | | 74HC245AP | | | | | __| - | | | | | |GAME-ROM| | | | DfD9101V3 Y | |_____________| | | | | __| + | | | | | |GAME-ROM| | | | DfD9101V3 Y | |_____________| | | | | __| | |PAL| |PAL| | Lucky 7| | | | | |___| |___| __| | |16L| |16L| | | | | | | __________ __| | |8 | |8 | |VNr03-07| | | | | | PC849 | __| - | | | | | |Sum.D882| | | |__________________| _____________ |__________| __| + | | | | | |Sum.D882| | | |__________________| _____________ |__________| __| | | | | | | | | | | 74HC245AP | __| | | | | | | | | | |_____________| __| | |___| |___| |________| |________| ___________ __| @@ -1501,7 +1501,7 @@ ROM_END | | | +--+ +-------------+ +---------+ | | +--+ +--+ | | +------+ |SCC 66470 CAB| |PIC16C58 | | - | | | | | | | |LH5164| |206880 | +---------+ +---+ + | | | | | | | |LH5164| |206880 | +---------+ +---+ | |B | |C | |D | |D-10L | |DfD9210I3 Y | --| | | | | | | | | | | | --| | | | | | | | | | | PHILIPS 1988| --| @@ -1636,7 +1636,7 @@ ROM_END Under the "DALLAS POKER CZ/V1 B" chip is a PC74HC273T chip soldered on the PCB. Under the "DALLAS POKER CZ/V1 P" chip is a MB8464A-10L chip soldered on the PCB. - Subboard: Looks like an 40PIN MCU or PIC...only four wires connect the subboard + Subboard: Looks like an 40PIN MCU or PIC...only four wires connect the subboard with the mainboard. (GND & VCC and PIN21 and PIN22 from the 40pin-MCU/PIC) @@ -1666,10 +1666,10 @@ ROM_END Amatic. PCB layout: - ___________________________________________________________________________________________________________________________ + ___________________________________________________________________________________________________________________________ | ___ ___ ___ ___ | | ___ | | | | | | | | | - | | B | | A | | A | | A | | A | ______________________________________ |____ + | | B | | A | | A | | A | | A | ______________________________________ |____ | |___| _____ | | | | | | | | | | ___| | | _ | |___| |___| |___| |___| | YAMAHA | ___| | _______ |BATTE| | YM2149F | ___| @@ -1678,14 +1678,14 @@ ROM_END | |_____| | M | | M | | M | | M | ___| | | P | | P | | P | | P | ___________________________ ______________ _____ ___| | ____ ____ | T | | T | | T | | T | | | | ULN2803A | | O O | ___| - | |HY62| |HY62| | Y | | Y | | Y | | Y | | KDA0476CN_50 | |______________| | O O | ____| + | |HY62| |HY62| | Y | | Y | | Y | | Y | | KDA0476CN_50 | |______________| | O O | ____| | |64AL| |64AL| |___| |___| |___| |___| | KOREA 332B IC20| ________________ | O O | | | |J_10| |J_10| |___________________________| | 74HC273N | | O O | | | | | | | |________________| | O O | | | |____| |____| ___________ ____________ ________________ | O O | | | | 74HC04AP | |EMPTY SOCKET| | 74HC245N | | O O | | | _______ _______ |___________| |____________| |________________| | O O | | - | | | | | XTAL1 |_____| |____ + | | | | | XTAL1 |_____| |____ | | | | | _________________ XTAL3 ______________ CON3 ___| | | EMPTY | | EMPTY | | IMPERA 8 | _____ _____________ _____________ | EMPTY SOCKET | ___| | | SOCKET| | SOCKET| | 209751 | |24C02| | EMPTY SOCKET| | EMPTY SOCKET| |______________| ___| @@ -1708,7 +1708,7 @@ ROM_END | | | | | | 288571 | ___| | | | | | | DfD9414V3 Y | ___| | | | | | |_________________| ___| - | | IC22| | IC21| IC1 ______________ _________ ____| + | | IC22| | IC21| IC1 ______________ _________ ____| | |_______| |_______| | RTC 72421A | | EMPTY | | | IMPERA BOARD REV V2.1 |______________| |_________| | |___________________________________________________________________________________________________________________________| diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index ecd70122b6d..fe9da4f1723 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -682,16 +682,16 @@ void vic20_state::via2_pa_w(uint8_t data) { /* - bit description + bit description - PA0 ROW 0 - PA1 ROW 1 - PA2 ROW 2 - PA3 ROW 3 - PA4 ROW 4 - PA5 ROW 5 - PA6 ROW 6 - PA7 ROW 7 + PA0 ROW 0 + PA1 ROW 1 + PA2 ROW 2 + PA3 ROW 3 + PA4 ROW 4 + PA5 ROW 5 + PA6 ROW 6 + PA7 ROW 7 */ diff --git a/src/mame/layout/hotchili.lay b/src/mame/layout/hotchili.lay index d2a34dc2d4b..bd8796d2e0e 100644 --- a/src/mame/layout/hotchili.lay +++ b/src/mame/layout/hotchili.lay @@ -10,7 +10,7 @@ license:CC0 - + @@ -19,8 +19,8 @@ license:CC0 - - + + @@ -28,8 +28,8 @@ license:CC0 - - + + @@ -37,8 +37,8 @@ license:CC0 - - + + @@ -46,8 +46,8 @@ license:CC0 - - + + @@ -55,8 +55,8 @@ license:CC0 - - + + @@ -64,8 +64,8 @@ license:CC0 - - + + @@ -73,8 +73,8 @@ license:CC0 - - + + @@ -82,8 +82,8 @@ license:CC0 - - + + @@ -91,8 +91,8 @@ license:CC0 - - + + @@ -100,9 +100,9 @@ license:CC0 - - - + + + @@ -110,12 +110,12 @@ license:CC0 - + - + @@ -145,7 +145,7 @@ license:CC0 - + diff --git a/src/mame/layout/j_dud.lay b/src/mame/layout/j_dud.lay index f8e865c2d4e..983f330a04f 100644 --- a/src/mame/layout/j_dud.lay +++ b/src/mame/layout/j_dud.lay @@ -35,72 +35,72 @@ license:CC0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/j_ewn.lay b/src/mame/layout/j_ewn.lay index da7082b3047..8ab29c9c862 100644 --- a/src/mame/layout/j_ewn.lay +++ b/src/mame/layout/j_ewn.lay @@ -35,72 +35,72 @@ license:CC0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/j_lan.lay b/src/mame/layout/j_lan.lay index 3c6e8afbced..c8bcb48ae10 100644 --- a/src/mame/layout/j_lan.lay +++ b/src/mame/layout/j_lan.lay @@ -35,72 +35,72 @@ license:CC0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/j_ndu.lay b/src/mame/layout/j_ndu.lay index e039bad45b5..1ad7e977c3a 100644 --- a/src/mame/layout/j_ndu.lay +++ b/src/mame/layout/j_ndu.lay @@ -35,72 +35,72 @@ license:CC0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/jpmsru.lay b/src/mame/layout/jpmsru.lay index 9ccde975c26..90e90014c2f 100644 --- a/src/mame/layout/jpmsru.lay +++ b/src/mame/layout/jpmsru.lay @@ -20,26 +20,26 @@ license:CC0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +