diff options
author | 2023-10-22 01:50:53 +1100 | |
---|---|---|
committer | 2023-10-22 01:50:53 +1100 | |
commit | 12266741f1e34f9dc087e64a1c31defbc02ab871 (patch) | |
tree | 15348fe63b6af13cd746ed77764b6370913f2976 | |
parent | 63e8d2a1b437f155904caae65cec6554fde5904d (diff) |
srcclean in preparation for MAME 0.260 release branch
-rw-r--r-- | hash/pc98.xml | 2 | ||||
-rw-r--r-- | src/devices/bus/nubus/8lc.cpp | 14 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8_intc.cpp | 2 | ||||
-rw-r--r-- | src/devices/imagedev/midiin.cpp | 2 | ||||
-rw-r--r-- | src/devices/sound/swp00.cpp | 16 | ||||
-rw-r--r-- | src/devices/sound/swp00.h | 2 | ||||
-rw-r--r-- | src/mame/dataeast/tumbleb.cpp | 8 | ||||
-rw-r--r-- | src/mame/ibm/ibm5550.cpp | 60 | ||||
-rw-r--r-- | src/mame/layout/babyfrts.lay | 30 | ||||
-rw-r--r-- | src/mame/layout/cbrava_77.lay | 12 | ||||
-rw-r--r-- | src/mame/layout/cbrava_81.lay | 12 | ||||
-rw-r--r-- | src/mame/layout/ifslots.lay | 40 | ||||
-rw-r--r-- | src/mame/layout/sevilla_77.lay | 10 | ||||
-rw-r--r-- | src/mame/layout/sevilla_81.lay | 10 | ||||
-rw-r--r-- | src/mame/layout/toledo_83.lay | 14 | ||||
-rw-r--r-- | src/mame/layout/toledo_87.lay | 14 | ||||
-rw-r--r-- | src/mame/misc/interflip8035.cpp | 186 | ||||
-rw-r--r-- | src/mame/misc/rfslotsmcs48.cpp | 28 | ||||
-rw-r--r-- | src/mame/nmk/ddealer.cpp | 6 | ||||
-rw-r--r-- | src/mame/nmk/nmk16.cpp | 2 | ||||
-rw-r--r-- | src/mame/pc/quakeat.cpp | 8 | ||||
-rw-r--r-- | src/mame/seibu/wiz.cpp | 2 |
22 files changed, 240 insertions, 240 deletions
diff --git a/hash/pc98.xml b/hash/pc98.xml index 1d539fae62b..f96a6bb1492 100644 --- a/hash/pc98.xml +++ b/hash/pc98.xml @@ -66705,7 +66705,7 @@ doujin?!? <description>Five Gals Connection</description> <year>19??</year> <publisher><doujin></publisher> <!-- is this really a doujin soft? --> - <notes><![CDATA[ + <notes><![CDATA[ Black screen [FDC] 2DD disk Has XA and LT support according to spine card ]]></notes> diff --git a/src/devices/bus/nubus/8lc.cpp b/src/devices/bus/nubus/8lc.cpp index a88d9d114ee..5a42d967f82 100644 --- a/src/devices/bus/nubus/8lc.cpp +++ b/src/devices/bus/nubus/8lc.cpp @@ -2,16 +2,16 @@ // copyright-holders:R. Belmont /*************************************************************************** - RasterOps ColorVue 8LC + RasterOps ColorVue 8LC 1, 2, 4, and 8 bpp at 1024x768 for the Macintosh LC This is the same hardware as the ClearVueGS/LC board, which shows grayscale. Both cards are documented to only work with the original LC due to some shortcuts - taken in how they map the address space. + taken in how they map the address space. Note: the current ROM is a prototype from a former ROPS employee. - RasterOps' graphics driver software doesn't recognize it to enable the pan/zoom functionality. - ROM dumps from a retail card would resolve several questions. + RasterOps' graphics driver software doesn't recognize it to enable the pan/zoom functionality. + ROM dumps from a retail card would resolve several questions. Map: 0xXXX00000: VRAM (768K) @@ -27,9 +27,9 @@ bit 8: monitor sense (1 = connected) bit 11: Display enable switch on the 708+/SE this is derived from - TODO: - - Get real declaration ROMs for 8LC and ClearVueGS/LC and other related cards - - Implement pan/zoom functionality if supported, which likely requires VRAM to go through the TMS34061 + TODO: + - Get real declaration ROMs for 8LC and ClearVueGS/LC and other related cards + - Implement pan/zoom functionality if supported, which likely requires VRAM to go through the TMS34061 ***************************************************************************/ diff --git a/src/devices/cpu/h8/h8_intc.cpp b/src/devices/cpu/h8/h8_intc.cpp index bf976781ce8..a2fdcdd7cfc 100644 --- a/src/devices/cpu/h8/h8_intc.cpp +++ b/src/devices/cpu/h8/h8_intc.cpp @@ -117,7 +117,7 @@ uint8_t h8_intc_device::ier_r() void h8_intc_device::ier_w(uint8_t data) { m_ier = data; - // logerror("ier = %02x\n", data); + // logerror("ier = %02x\n", data); update_irq_state(); } diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp index 189bd85d20c..bdeb0c2d0f0 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -495,7 +495,7 @@ std::error_condition midiin_device::midi_sequence::parse(util::random_read &stre } else if ((u8)type == 0xf0) parse_sysex_data(buffer.reset()); - else + else parse_midi_data(buffer.reset()); m_iterator = m_list.begin(); diff --git a/src/devices/sound/swp00.cpp b/src/devices/sound/swp00.cpp index 89a355bd6b8..54ab5ca3d6e 100644 --- a/src/devices/sound/swp00.cpp +++ b/src/devices/sound/swp00.cpp @@ -33,7 +33,7 @@ const std::array<s32, 16> swp00_device::panmap = { bool swp00_device::istep(s32 &value, s32 limit, s32 step) { - // fprintf(stderr, "istep(%x, %x, %x)\n", value, limit, step); + // fprintf(stderr, "istep(%x, %x, %x)\n", value, limit, step); if(value < limit) { value += step; if(value >= limit) { @@ -78,7 +78,7 @@ s32 swp00_device::fpsub(s32 value, s32 step) s32 e = value >> 24; s32 m = (value & 0xffffff) | 0xfe000000; m = e < 0xc ? m - (step << e) : (m >> (e - 0xb)) - (step << 0xb); - // fprintf(stderr, "%07x %05x -> %x %08x\n", value, step, e, m); + // fprintf(stderr, "%07x %05x -> %x %08x\n", value, step, e, m); if(m >= 0) return 0; if(e >= 0xc) @@ -93,13 +93,13 @@ s32 swp00_device::fpsub(s32 value, s32 step) e ++; m <<= 1; } - + return (e << 24) | (m & 0xffffff); } bool swp00_device::fpstep(s32 &value, s32 limit, s32 step) { - // fprintf(stderr, "fpstep(%x, %x, %x)\n", value, limit, step); + // fprintf(stderr, "fpstep(%x, %x, %x)\n", value, limit, step); // value, limit and step are 4.24 but step has its exponent and // top four bits zero @@ -578,7 +578,7 @@ void swp00_device::decay_speed_w(offs_t offset, u8 data) m_stream->update(); m_decay_speed[chan] = data; - + if(data & 0x80) m_decay[chan] = true; @@ -834,7 +834,7 @@ u8 swp00_device::state_r() { m_stream->update(); - // logerror("state_r %x.%02x\n", m_state_adr >> 5, m_state_adr & 0x1f); + // logerror("state_r %x.%02x\n", m_state_adr >> 5, m_state_adr & 0x1f); int chan = m_state_adr & 0x1f; switch(m_state_adr & 0xe0) { case 0x00: // lpf value @@ -905,8 +905,8 @@ u8 swp00_device::snd_r(offs_t offset) void swp00_device::snd_w(offs_t offset, u8 data) { - // if(rr[offset] == data) - // return; + // if(rr[offset] == data) + // return; rr[offset] = data; diff --git a/src/devices/sound/swp00.h b/src/devices/sound/swp00.h index 82d91aa0534..4a29fedc4c2 100644 --- a/src/devices/sound/swp00.h +++ b/src/devices/sound/swp00.h @@ -79,7 +79,7 @@ private: std::array<s32, 0x20> m_lpf_value; std::array<s32, 0x20> m_lpf_timer; std::array<s32, 0x20> m_lpf_ha; - std::array<s32, 0x20> m_lpf_hb; + std::array<s32, 0x20> m_lpf_hb; std::array<bool, 0x20> m_active, m_decay, m_decay_done, m_lpf_done; u16 m_waverom_val; diff --git a/src/mame/dataeast/tumbleb.cpp b/src/mame/dataeast/tumbleb.cpp index 46f00ae4d69..10b558e41fb 100644 --- a/src/mame/dataeast/tumbleb.cpp +++ b/src/mame/dataeast/tumbleb.cpp @@ -2490,10 +2490,10 @@ void tumbleb_state::suprtrio(machine_config &config) // OSCs: 14MHz, 12MHz & 8MH /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); -// m_screen->set_refresh_hz(60); -// m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(529)); -// m_screen->set_size(40*8, 32*8); -// m_screen->set_visarea(0*8, 40*8-1, 1*8-1, 31*8-2); +// m_screen->set_refresh_hz(60); +// m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(529)); +// m_screen->set_size(40*8, 32*8); +// m_screen->set_visarea(0*8, 40*8-1, 1*8-1, 31*8-2); // not measured, assume same as tumblep for now. // Game has a very dull irq routine to stay at the mercy of set_vblank_time, // reportedly happens to randomly crash at stage 3 boss + be laggy on later levels otherwise. diff --git a/src/mame/ibm/ibm5550.cpp b/src/mame/ibm/ibm5550.cpp index eab7a4c60e5..099c97feeba 100644 --- a/src/mame/ibm/ibm5550.cpp +++ b/src/mame/ibm/ibm5550.cpp @@ -86,13 +86,13 @@ private: /* static const gfx_layout kanji_layout = { - 32, 32, - RGN_FRAC(1,1), - 1, - { 0 }, - { STEP16(0,1), STEP16(16, 16) }, - { STEP16(0,16), STEP16(16*16, 16) }, - 32*32 + 32, 32, + RGN_FRAC(1,1), + 1, + { 0 }, + { STEP16(0,1), STEP16(16, 16) }, + { STEP16(0,16), STEP16(16*16, 16) }, + 32*32 }; */ @@ -145,20 +145,20 @@ void ibm5550_state::main_map(address_map &map) void ibm5550_state::main_io(address_map &map) { map.unmap_value_high(); -// map(0x00?0, 0x00?7).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); +// map(0x00?0, 0x00?7).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x0020, 0x0021).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); // tested later, with bit 6 irq from PIC -// map(0x0040, 0x0047).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); +// map(0x0040, 0x0047).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); -// map(0x0060, 0x0060) / map(0x0064, 0x0064) standard XT keyboard +// map(0x0060, 0x0060) / map(0x0064, 0x0064) standard XT keyboard - // bit 0 on will punt before testing for $20-$21, + // bit 0 on will punt before testing for $20-$21, // but will be required on after $4c-$ec RAM holes above // ... RAM protection? map(0x00a0, 0x00a0).lrw8( NAME([this] (offs_t offset) { return m_a0_unk; }), - NAME([this] (offs_t offset, u8 data) { + NAME([this] (offs_t offset, u8 data) { logerror("$a0 %02x\n", data); m_a0_unk = BIT(data, 6); if (data == 0xc0) @@ -168,7 +168,7 @@ void ibm5550_state::main_io(address_map &map) } }) ); -// map(0x00a1, 0x00a1) LED write? +// map(0x00a1, 0x00a1) LED write? map(0x00a1, 0x00a1).lr8( NAME([] (offs_t offset) { // read thru NMI trap above, bit 3-0 must be low @@ -176,7 +176,7 @@ void ibm5550_state::main_io(address_map &map) }) ); map(0x00a2, 0x00a2).lw8( - NAME([this] (offs_t offset, u8 data) { + NAME([this] (offs_t offset, u8 data) { logerror("$a2 %02x\n", data); m_a0_unk = 0; }) @@ -238,7 +238,7 @@ void ibm5550_state::ibm5550(machine_config &config) // HD46505SP-2, unknown pixel clock HD6845S(config, m_crtc, XTAL(40'000'000) / 10); m_crtc->set_screen(m_screen); -// m_crtc->set_show_border_area(true); +// m_crtc->set_show_border_area(true); m_crtc->set_char_width(16); // IBM6343870 / MN50015SPG @@ -255,27 +255,27 @@ void ibm5550_state::ibm5550(machine_config &config) PALETTE(config, m_palette, palette_device::MONOCHROME_HIGHLIGHT); -// ibm5160_mb_device &mb(IBM5160_MOTHERBOARD(config, "mb")); -// mb.set_cputag(m_maincpu); -// mb.int_callback().set_inputline(m_maincpu, 0); -// mb.nmi_callback().set_inputline(m_maincpu, INPUT_LINE_NMI); -// mb.kbdclk_callback().set("kbd", FUNC(pc_kbdc_device::clock_write_from_mb)); -// mb.kbddata_callback().set("kbd", FUNC(pc_kbdc_device::data_write_from_mb)); -// mb.set_input_default(DEVICE_INPUT_DEFAULTS_NAME(pccga)); +// ibm5160_mb_device &mb(IBM5160_MOTHERBOARD(config, "mb")); +// mb.set_cputag(m_maincpu); +// mb.int_callback().set_inputline(m_maincpu, 0); +// mb.nmi_callback().set_inputline(m_maincpu, INPUT_LINE_NMI); +// mb.kbdclk_callback().set("kbd", FUNC(pc_kbdc_device::clock_write_from_mb)); +// mb.kbddata_callback().set("kbd", FUNC(pc_kbdc_device::data_write_from_mb)); +// mb.set_input_default(DEVICE_INPUT_DEFAULTS_NAME(pccga)); // FIXME: determine ISA bus clock -// ISA8_SLOT(config, "isa1", 0, "mb:isa", pc_isa8_cards, "cga", false); -// ISA8_SLOT(config, "isa2", 0, "mb:isa", pc_isa8_cards, "fdc_xt", false); -// ISA8_SLOT(config, "isa3", 0, "mb:isa", pc_isa8_cards, "lpt", false); -// ISA8_SLOT(config, "isa4", 0, "mb:isa", pc_isa8_cards, "com", false); +// ISA8_SLOT(config, "isa1", 0, "mb:isa", pc_isa8_cards, "cga", false); +// ISA8_SLOT(config, "isa2", 0, "mb:isa", pc_isa8_cards, "fdc_xt", false); +// ISA8_SLOT(config, "isa3", 0, "mb:isa", pc_isa8_cards, "lpt", false); +// ISA8_SLOT(config, "isa4", 0, "mb:isa", pc_isa8_cards, "com", false); /* keyboard */ -// pc_kbdc_device &kbd(PC_KBDC(config, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)); -// kbd.out_clock_cb().set("mb", FUNC(ibm5160_mb_device::keyboard_clock_w)); -// kbd.out_data_cb().set("mb", FUNC(ibm5160_mb_device::keyboard_data_w)); +// pc_kbdc_device &kbd(PC_KBDC(config, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)); +// kbd.out_clock_cb().set("mb", FUNC(ibm5160_mb_device::keyboard_clock_w)); +// kbd.out_data_cb().set("mb", FUNC(ibm5160_mb_device::keyboard_data_w)); /* internal ram */ -// RAM(config, RAM_TAG).set_default_size("256K").set_extra_options("512K"); +// RAM(config, RAM_TAG).set_default_size("256K").set_extra_options("512K"); } ROM_START( ibm5550 ) diff --git a/src/mame/layout/babyfrts.lay b/src/mame/layout/babyfrts.lay index 103c5e4b444..23fb0ac13e5 100644 --- a/src/mame/layout/babyfrts.lay +++ b/src/mame/layout/babyfrts.lay @@ -93,7 +93,7 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> <!-- Round Illuminated Buttons --> - + <element name="L0" defstate="0"> <disk state="1"> <color red="1.0" green="0.0" blue="0.0"/> @@ -146,8 +146,8 @@ copyright-holders: Roberto Fresca, Grull Osgo </text> </element> -<!-- Game lamps, coils, and other active elements --> - +<!-- Game lamps, coils, and other active elements --> + <element name="L4" defstate="0"> <rect state="1"> <color red="1.0" green="1.0" blue="1.0"/> @@ -227,7 +227,7 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> <!-- Coin --> - + <element name="coin" defstate="0"> <disk state="1"> <color red="0.58" green="0.53" blue="0.33"/> @@ -242,7 +242,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="0.16" y="0.12" width="0.7" height="0.7"/> </text> </element> - + <element name="coin_counter" defstate="0"> <simplecounter maxstate="999999" digits="6"> <color red="0.8" green="0.8" blue="0.8"/> @@ -261,7 +261,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="10" y="50" width="550" height="420"/> </element> -<!-- Playfield --> +<!-- Playfield --> <element ref="rect_black"> <bounds x="40" y="90" width="360" height="120"/> @@ -325,7 +325,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="300" y="110" width="80" height="80"/> </element> -<!-- Player Buttons: Advance 1, 2, 3, Start --> +<!-- Player Buttons: Advance 1, 2, 3, Start --> <element ref="disk_gray_01"> <bounds x="55" y="235" width="90" height="90"/> @@ -355,7 +355,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="420" y="240" width="80" height="80"/> </element> -<!-- Game lamps: Insert Coin, Fault --> +<!-- Game lamps: Insert Coin, Fault --> <element name="outbit7" ref="L4"> <bounds x="570" y="50" width="60" height="20"/> @@ -377,7 +377,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="570" y="200" width="60" height="20"/> </element> -<!-- E.M. Counters --> +<!-- E.M. Counters --> <element name="outbit5" ref="EM1"> <bounds x="570" y="360" width="60" height="20"/> @@ -385,27 +385,27 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="outbit16" ref="coin_counter"> <bounds x="570" y="390" width="60" height="20"/> - </element> - + </element> + <element name="outbit6" ref="EM2"> <bounds x="570" y="420" width="60" height="20"/> </element> <element name="outbit17" ref="coin_counter"> <bounds x="570" y="450" width="60" height="20"/> - </element> + </element> <!-- Coin --> <element name="outbit7" ref="coin" inputtag="IN2" inputmask="0x02"> <bounds x="585" y="90" width="30" height="30"/> </element> - + <!-- Coin out --> <element name="outbit6" ref="coin"> <bounds x="585" y="240" width="30" height="30"/> </element> - + </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/cbrava_77.lay b/src/mame/layout/cbrava_77.lay index 5fe4d334dd2..59fa8603a41 100644 --- a/src/mame/layout/cbrava_77.lay +++ b/src/mame/layout/cbrava_77.lay @@ -496,7 +496,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds left="0" top="0" right="640" bottom="480" /> -<!-- Coin Lamps --> +<!-- Coin Lamps --> <element name="outbit0" ref="CL1"> <bounds x="10" y="120" width="60" height="20" /> @@ -510,7 +510,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="150" y="120" width="60" height="20" /> </element> -<!-- Game Lamps --> +<!-- Game Lamps --> <element name="outbit6" ref="L3"> <bounds x="220" y="120" width="60" height="20" /> @@ -588,7 +588,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- Int Enable Led --> <element name="outbit44" ref="IRQ"> - <bounds x="430" y="150" width="60" height="20"/> + <bounds x="430" y="150" width="60" height="20"/> </element> <!-- Seven Segment Displays --> @@ -644,7 +644,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- 1st Coin --> <element name="outbit0" ref="rect_red"> - <bounds x="45" y="330" width="200" height="3"/> + <bounds x="45" y="330" width="200" height="3"/> </element> <repeat count="10"> <param name="x" start="35" increment="1" /> @@ -684,7 +684,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- 3rd Coin --> <element name="outbit2" ref="rect_red"> - <bounds x="45" y="270" width="200" height="3"/> + <bounds x="45" y="270" width="200" height="3"/> </element> <repeat count="10"> <param name="x" start="35" increment="1" /> @@ -730,4 +730,4 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/cbrava_81.lay b/src/mame/layout/cbrava_81.lay index 71d9a15120a..f6cc5d65207 100644 --- a/src/mame/layout/cbrava_81.lay +++ b/src/mame/layout/cbrava_81.lay @@ -496,7 +496,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds left="0" top="0" right="640" bottom="480" /> -<!-- Coin Lamps --> +<!-- Coin Lamps --> <element name="outbit0" ref="CL1"> <bounds x="10" y="120" width="60" height="20" /> @@ -510,7 +510,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="150" y="120" width="60" height="20" /> </element> -<!-- Game Lamps --> +<!-- Game Lamps --> <element name="outbit6" ref="L3"> <bounds x="220" y="120" width="60" height="20" /> @@ -588,7 +588,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- Int Enable Led --> <element name="outbit44" ref="IRQ"> - <bounds x="430" y="150" width="60" height="20"/> + <bounds x="430" y="150" width="60" height="20"/> </element> <!-- Seven Segment Displays --> @@ -644,7 +644,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- 1st Coin --> <element name="outbit0" ref="rect_red"> - <bounds x="45" y="330" width="200" height="3"/> + <bounds x="45" y="330" width="200" height="3"/> </element> <repeat count="10"> <param name="x" start="35" increment="1" /> @@ -684,7 +684,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- 3rd Coin --> <element name="outbit2" ref="rect_red"> - <bounds x="45" y="270" width="200" height="3"/> + <bounds x="45" y="270" width="200" height="3"/> </element> <repeat count="10"> <param name="x" start="35" increment="1" /> @@ -730,4 +730,4 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/ifslots.lay b/src/mame/layout/ifslots.lay index 6ff9cbfe032..2a6e2c6aac7 100644 --- a/src/mame/layout/ifslots.lay +++ b/src/mame/layout/ifslots.lay @@ -43,20 +43,20 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="stat" defstate="0"> <text string="off" state="0"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="1"> <color red="0.0" green="1.0" blue="0.0" /> - </text> - </element> + </text> + </element> <element name="statinv" defstate="1"> <text string="off" state="1"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="0"> <color red="0.0" green="1.0" blue="0.0" /> - </text> - </element> + </text> + </element> <element name="lamp" defstate="0"> <disk state="1"> @@ -156,7 +156,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <color red="0.0" green="0.0" blue="0.0" /> <bounds x="0" y="0.1" width="1" height="0.8" /> </text> - </element> + </element> <element name="C1" defstate="1"> <rect state="0"> @@ -469,7 +469,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds left="0" top="0" right="640" bottom="480" /> -<!-- Coin Lamps --> +<!-- Coin Lamps --> <element name="outbit0" ref="L0"> <bounds x="10" y="120" width="60" height="20" /> @@ -483,7 +483,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="150" y="120" width="60" height="20" /> </element> -<!-- Game Lamps --> +<!-- Game Lamps --> <element name="outbit3" ref="L3"> <bounds x="220" y="120" width="60" height="20" /> @@ -501,7 +501,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="430" y="120" width="60" height="20" /> </element> -<!-- E.M. Counters --> +<!-- E.M. Counters --> <element name="outbit20" ref="EM1"> <bounds x="10" y="150" width="60" height="20" /> @@ -519,7 +519,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="220" y="150" width="60" height="20" /> </element> -<!-- Relays (Motors)--> +<!-- Relays (Motors)--> <element name="outbit24" ref="RL1"> <bounds x="290" y="150" width="60" height="20" /> @@ -529,7 +529,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="360" y="150" width="60" height="20" /> </element> -<!-- Reel Unlock Coils --> +<!-- Reel Unlock Coils --> <element name="outbit10" ref="C1"> <bounds x="10" y="180" width="60" height="20" /> @@ -547,7 +547,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="220" y="180" width="60" height="20" /> </element> -<!-- Coin lock, diverter and lever coils --> +<!-- Coin lock, diverter and lever coils --> <element name="outbit14" ref="C5"> <bounds x="290" y="180" width="60" height="20" /> @@ -559,9 +559,9 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="outbit16" ref="C7"> <bounds x="430" y="180" width="60" height="20" /> - </element> + </element> -<!-- Optos A/B Readout --> +<!-- Optos A/B Readout --> <repeat count="4"> <param name="i" start="30" increment="1" /> @@ -578,11 +578,11 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="~x~" y="205" width="14" height="15" /> </element> </repeat> - + <!-- Int Enable Led --> <element name="outbit44" ref="IRQ"> - <bounds x="430" y="150" width="60" height="20"/> + <bounds x="430" y="150" width="60" height="20"/> </element> <!-- Seven Segment Displays --> @@ -601,7 +601,7 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> </repeat> -<!-- Door Display --> +<!-- Door Display --> <repeat count="4"> <param name="i" start="0" increment="1" /> @@ -632,9 +632,9 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="~x~" y="450" width="50" height="20"/> </element> </repeat> - + <element ref="rect_black"> - <bounds x="10" y="330" width="240" height="1"/> + <bounds x="10" y="330" width="240" height="1"/> </element> </view> diff --git a/src/mame/layout/sevilla_77.lay b/src/mame/layout/sevilla_77.lay index 5ff114e73ca..1761564cd7f 100644 --- a/src/mame/layout/sevilla_77.lay +++ b/src/mame/layout/sevilla_77.lay @@ -43,7 +43,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="stat" defstate="0"> <text string="off" state="0"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="1"> <color red="0.0" green="1.0" blue="0.0" /> </text> @@ -52,7 +52,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="statinv" defstate="1"> <text string="off" state="1"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="0"> <color red="0.0" green="1.0" blue="0.0" /> </text> @@ -470,7 +470,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds left="0" top="0" right="640" bottom="480" /> -<!-- Coin Lamps --> +<!-- Coin Lamps --> <element name="outbit0" ref="L0"> <bounds x="10" y="120" width="60" height="20" /> @@ -593,7 +593,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="~x~" y="35" width="40" height="50" /> </element> </repeat> - + <!-- Optos A/B Readout --> <repeat count="3"> @@ -659,4 +659,4 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/sevilla_81.lay b/src/mame/layout/sevilla_81.lay index 77e254dcb0c..c0c20b4b76b 100644 --- a/src/mame/layout/sevilla_81.lay +++ b/src/mame/layout/sevilla_81.lay @@ -43,7 +43,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="stat" defstate="0"> <text string="off" state="0"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="1"> <color red="0.0" green="1.0" blue="0.0" /> </text> @@ -52,7 +52,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="statinv" defstate="1"> <text string="off" state="1"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="0"> <color red="0.0" green="1.0" blue="0.0" /> </text> @@ -470,7 +470,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds left="0" top="0" right="640" bottom="480" /> -<!-- Coin Lamps --> +<!-- Coin Lamps --> <element name="outbit0" ref="L0"> <bounds x="10" y="120" width="60" height="20" /> @@ -593,7 +593,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="~x~" y="35" width="40" height="50" /> </element> </repeat> - + <!-- Optos A/B Readout --> <repeat count="3"> @@ -659,4 +659,4 @@ copyright-holders: Roberto Fresca, Grull Osgo </element> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/toledo_83.lay b/src/mame/layout/toledo_83.lay index b6cd695d72b..7e6fa369bf7 100644 --- a/src/mame/layout/toledo_83.lay +++ b/src/mame/layout/toledo_83.lay @@ -43,7 +43,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="stat" defstate="0"> <text string="off" state="0"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="1"> <color red="0.0" green="1.0" blue="0.0" /> </text> @@ -557,7 +557,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="185" y="120" width="30" height="20" /> </element> -<!-- Game Lamps --> +<!-- Game Lamps --> <element name="outbit6" ref="L3"> <bounds x="220" y="120" width="60" height="20" /> @@ -621,7 +621,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="220" y="180" width="60" height="20" /> </element> -<!-- Coin lock, diverter and lever coils --> +<!-- Coin lock, diverter and lever coils --> <element name="outbit14" ref="C5"> <bounds x="290" y="180" width="60" height="20" /> @@ -633,7 +633,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="outbit16" ref="C7"> <bounds x="430" y="180" width="60" height="20" /> - </element> + </element> <!-- Optos A/B Readout --> @@ -656,7 +656,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- Int Enable Led --> <element name="outbit44" ref="IRQ"> - <bounds x="430" y="150" width="60" height="20"/> + <bounds x="430" y="150" width="60" height="20"/> </element> <!-- Seven Segment Displays --> @@ -719,7 +719,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="outbit14" ref="coin" inputtag="IN0" inputmask="0x80"> <bounds x="600" y="440" width="30" height="30"/> - </element> + </element> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/toledo_87.lay b/src/mame/layout/toledo_87.lay index bf17fc2fe72..b0c8deee770 100644 --- a/src/mame/layout/toledo_87.lay +++ b/src/mame/layout/toledo_87.lay @@ -43,7 +43,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="stat" defstate="0"> <text string="off" state="0"> <color red="1.0" green="0.0" blue="0.0" /> - </text> + </text> <text string="on" state="1"> <color red="0.0" green="1.0" blue="0.0" /> </text> @@ -557,7 +557,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="185" y="120" width="30" height="20" /> </element> -<!-- Game Lamps --> +<!-- Game Lamps --> <element name="outbit6" ref="L3"> <bounds x="220" y="120" width="60" height="20" /> @@ -621,7 +621,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <bounds x="220" y="180" width="60" height="20" /> </element> -<!-- Coin lock, diverter and lever coils --> +<!-- Coin lock, diverter and lever coils --> <element name="outbit14" ref="C5"> <bounds x="290" y="180" width="60" height="20" /> @@ -633,7 +633,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="outbit16" ref="C7"> <bounds x="430" y="180" width="60" height="20" /> - </element> + </element> <!-- Optos A/B Readout --> @@ -656,7 +656,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <!-- Int Enable Led --> <element name="outbit44" ref="IRQ"> - <bounds x="430" y="150" width="60" height="20"/> + <bounds x="430" y="150" width="60" height="20"/> </element> <!-- Seven Segment Displays --> @@ -719,7 +719,7 @@ copyright-holders: Roberto Fresca, Grull Osgo <element name="outbit14" ref="coin" inputtag="IN0" inputmask="0x80"> <bounds x="600" y="440" width="30" height="30"/> - </element> + </element> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/misc/interflip8035.cpp b/src/mame/misc/interflip8035.cpp index 7c8a01465fd..5d6920eb1fb 100644 --- a/src/mame/misc/interflip8035.cpp +++ b/src/mame/misc/interflip8035.cpp @@ -38,7 +38,7 @@ Sound CPU: I8035 @ 4 MHz. 2K EPROM - 4051 (8-channel analog multiplexers/demultiplexers) as DAC + resistor + 4051 (8-channel analog multiplexers/demultiplexers) as DAC + resistor 3x I8243 (I/O expander) 1x I8279 (programmable keyboard/display interface) @@ -67,7 +67,7 @@ - Auxiliary Lever Activation: The cam activates the Auxiliary Lever microswitch as it initiates the mechanism's forward movement when the player pulls the lever. - + - Lever Microswitch Activation: The Lever microswitch is engaged when the cam reaches the end-of-tour position. The game is initiated by processing the combination of these signal events within the system. @@ -115,7 +115,7 @@ Error codes: - + 01: Physical RAM error. 02: CPU/MCU error. 03: Coin-In error. @@ -278,7 +278,7 @@ Toledo plays from 1 to 6 tokens. All coins bet in the central line, but usually - the prize is multiplied by the number of inserted tokens. + the prize is multiplied by the number of inserted tokens. TOLEDO PAYTABLE PRIZE @@ -409,7 +409,7 @@ Sevilla plays from 1 to 3 tokens. All coins bet in the central line, but usually - the prize is multiplied by the number of inserted tokens. + the prize is multiplied by the number of inserted tokens. SEVILLA PAYTABLE PRIZE @@ -541,7 +541,7 @@ private: u8 m_mp2 = 0xff; u8 m_int_flag = 0x00; - // Audio MCU Interface + // Audio MCU Interface u8 audio_io_r(offs_t offset); void audio_io_w(offs_t offset, u8 data); u8 audio_p2_r(); @@ -652,7 +652,7 @@ u8 interflip8035_state::main_io_r(offs_t offset) // logerror("Data RAM Read Offs:%02X - Data:%02X\n", offset, ret); break; } - default: + default: ret = 0xff; } return ret; @@ -681,32 +681,32 @@ void interflip8035_state::main_io_w(offs_t offset, u8 data) break; } } - // logerror("%s: Main I/O Write Offs:%02X - Data: %02X\n", machine().describe_context(), offset, data); + // logerror("%s: Main I/O Write Offs:%02X - Data: %02X\n", machine().describe_context(), offset, data); /* gpkd commands ( under revision) CMD Binary ----- ---- ---- -0x25 0010-0101 -> 001 (1) - 00101 Code=1: Program Clock Divider 5 +---- ---- ---- +0x25 0010-0101 -> 001 (1) - 00101 Code=1: Program Clock Divider 5 -0x0C 0000-1100 -> 000 (0) - 01-100 Code=0: Keyboard Display Mode Set. - DD=01: 16 8bit character display. - KKK=100: Encoded Scan Sensor Matrix. +0x0C 0000-1100 -> 000 (0) - 01-100 Code=0: Keyboard Display Mode Set. + DD=01: 16 8bit character display. + KKK=100: Encoded Scan Sensor Matrix. -0xD6 1101-0110 -> 110 (6) - 101-10 Code=6: Clear - CD CD CD = 101: Clear all Zeroes - CF = 1: Fifo Status Cleared an the interrupt output line is reset. - Also, the sensor raw pointer is set to row 0. - CA = 0: No Clear all bit. +0xD6 1101-0110 -> 110 (6) - 101-10 Code=6: Clear + CD CD CD = 101: Clear all Zeroes + CF = 1: Fifo Status Cleared an the interrupt output line is reset. + Also, the sensor raw pointer is set to row 0. + CA = 0: No Clear all bit. 0xA5 1010-0101 -> 101 (5) - 0-0101 Code=5: Display Write inhibit/blanking - x = 0: - IWA IWB = 01: Inhibit port B - BLA BLB = 01: Blank port B + x = 0: + IWA IWB = 01: Inhibit port B + BLA BLB = 01: Blank port B 0x90 1001-0000 -> 100 (4) - 1-0000 Code = 4: Write display Ram - AI = 1 : Autoincrement - AD AD AD AD = 0000: Buffer base address to write. + AI = 1 : Autoincrement + AD AD AD AD = 0000: Buffer base address to write. Then MPU sends gpkd data. @@ -730,17 +730,17 @@ void interflip8035_state::audio_io_w(offs_t offset, u8 data) void interflip8035_state::main_p1_enc_data_w(u8 data) // Encoded lamps. (Sevilla & Toledo) { /* - Port P1 Maincpu - =============== - - P1.0 Coin Lamp Bit 0 - P1.1 Coin Lamp Bit 1 - P1.2 Coin Lamp Bit 2 - P1.3 Interrupt Flag (enable/disable /INT via NAND Gate.) - P1.4 /CS PIA 1 - Debug: MPU usually writes 0x67, 0x6f, 0xe7 or 0xef to enable PIA access - P1.5 /CS PIA 2 - Debug: MPU usually writes 0x57, 0x5f, 0x57 or 0x5f to enable PIA access - P1.6 /CS PIA 3 - Debug: MPU usually writes 0x37, 0x3f, 0x37 or 0x3f to enable PIA access - P1.7 /GPKD Reset (Not implemented on device) + Port P1 Maincpu + =============== + + P1.0 Coin Lamp Bit 0 + P1.1 Coin Lamp Bit 1 + P1.2 Coin Lamp Bit 2 + P1.3 Interrupt Flag (enable/disable /INT via NAND Gate.) + P1.4 /CS PIA 1 - Debug: MPU usually writes 0x67, 0x6f, 0xe7 or 0xef to enable PIA access + P1.5 /CS PIA 2 - Debug: MPU usually writes 0x57, 0x5f, 0x57 or 0x5f to enable PIA access + P1.6 /CS PIA 3 - Debug: MPU usually writes 0x37, 0x3f, 0x37 or 0x3f to enable PIA access + P1.7 /GPKD Reset (Not implemented on device) */ m_mp1 = data; @@ -762,7 +762,7 @@ m_outbit[5] -> Lamp: 6th. Coin m_int_flag = BIT(data, 3); // Main Interrupt Flag m_outbit[44] = BIT(data, 3); // Main Interrupt Flag - m_ioexp[0]->cs_w(BIT(data, 4)); // Chip Select IO Expander_1 + m_ioexp[0]->cs_w(BIT(data, 4)); // Chip Select IO Expander_1 m_ioexp[1]->cs_w(BIT(data, 5)); // Chip Select IO Expander_2 m_ioexp[2]->cs_w(BIT(data, 6)); // Chip Select IO Expander_3 // m_kbdc->reset(BIT(data, 7)); // Reset GPKD (not implemented on device) @@ -773,17 +773,17 @@ m_outbit[5] -> Lamp: 6th. Coin void interflip8035_state::main_p1_dec_data_w(u8 data) // Decoded lamps. (Costa Brava) { /* - Port P1 Maincpu - =============== - - P1.0 Lamp 1st. Coin - P1.1 Lamp 2nd. Coin - P1.2 Lamp 3rd. Coin - P1.3 Interrupt Flag (enable/disable /INT via NAND Gate.) - P1.4 /CS PIA 1 - Debug: MPU usually writes 0x67, 0x6f, 0xe7 or 0xef to enable PIA access - P1.5 /CS PIA 2 - Debug: MPU usually writes 0x57, 0x5f, 0x57 or 0x5f to enable PIA access - P1.6 /CS PIA 3 - Debug: MPU usually writes 0x37, 0x3f, 0x37 or 0x3f to enable PIA access - P1.7 /GPKD Reset (Not implemented on device) + Port P1 Maincpu + =============== + + P1.0 Lamp 1st. Coin + P1.1 Lamp 2nd. Coin + P1.2 Lamp 3rd. Coin + P1.3 Interrupt Flag (enable/disable /INT via NAND Gate.) + P1.4 /CS PIA 1 - Debug: MPU usually writes 0x67, 0x6f, 0xe7 or 0xef to enable PIA access + P1.5 /CS PIA 2 - Debug: MPU usually writes 0x57, 0x5f, 0x57 or 0x5f to enable PIA access + P1.6 /CS PIA 3 - Debug: MPU usually writes 0x37, 0x3f, 0x37 or 0x3f to enable PIA access + P1.7 /GPKD Reset (Not implemented on device) */ m_mp1 = data; @@ -792,7 +792,7 @@ void interflip8035_state::main_p1_dec_data_w(u8 data) // Decoded lamps. (Costa m_outbit[2] = BIT(data, 2); // Lamp: 3rd. Coin m_int_flag = BIT(data, 3); // Main Interrupt Flag m_outbit[44] = BIT(data, 3); // Main Interrupt Flag - m_ioexp[0]->cs_w(BIT(data, 4)); // Chip Select IO Expander_1 + m_ioexp[0]->cs_w(BIT(data, 4)); // Chip Select IO Expander_1 m_ioexp[1]->cs_w(BIT(data, 5)); // Chip Select IO Expander_2 m_ioexp[2]->cs_w(BIT(data, 6)); // Chip Select IO Expander_3 // m_kbdc->reset(BIT(data, 7)); // Reset GPKD (not implemented on device) @@ -803,19 +803,19 @@ void interflip8035_state::main_p1_dec_data_w(u8 data) // Decoded lamps. (Costa void interflip8035_state::main_p2_w(u8 data) { /* - Port P2 Maincpu - =============== - - P2.0 A8 Address line - P2.1 A9 Address line - P2.2 A10 Address line - P2.3 A11 Address line - P2.4 /CE1 RAM 1 - Debug: MPU usually writes 0xef to enable NVRAM access - P2.5 /CE1 RAM 2 - Unused on these games - P2.6 /A0 GPKD - Selects -> [Data (rw)] or [Status(r)/ Control(w)] access on I8279 - P2.7 /CS GPKD - Enable I8279 access. - - GPKD Notes: MPU writes 0x3f to data access and 0x7f to status/control + Port P2 Maincpu + =============== + + P2.0 A8 Address line + P2.1 A9 Address line + P2.2 A10 Address line + P2.3 A11 Address line + P2.4 /CE1 RAM 1 - Debug: MPU usually writes 0xef to enable NVRAM access + P2.5 /CE1 RAM 2 - Unused on these games + P2.6 /A0 GPKD - Selects -> [Data (rw)] or [Status(r)/ Control(w)] access on I8279 + P2.7 /CS GPKD - Enable I8279 access. + + GPKD Notes: MPU writes 0x3f to data access and 0x7f to status/control */ m_mp2 = data; @@ -831,9 +831,9 @@ void interflip8035_state::main_p2_w(u8 data) u8 interflip8035_state::main_p2_r() { /* - P1.4 /CS PIA 1 - Debug: MPU usually writes 0x67, 0x6f, 0xe7 or 0xef to enable PIA access - P1.5 /CS PIA 2 - Debug: MPU usually writes 0x57, 0x5f, 0xd7 or 0xdf to enable PIA access - P1.6 /CS PIA 3 - Debug: MPU usually writes 0x37, 0x3f, 0xb7 or 0xbf to enable PIA access + P1.4 /CS PIA 1 - Debug: MPU usually writes 0x67, 0x6f, 0xe7 or 0xef to enable PIA access + P1.5 /CS PIA 2 - Debug: MPU usually writes 0x57, 0x5f, 0xd7 or 0xdf to enable PIA access + P1.6 /CS PIA 3 - Debug: MPU usually writes 0x37, 0x3f, 0xb7 or 0xbf to enable PIA access */ u8 opt, ret; opt = (m_mp1 & 0x70) >> 4; // valid PIA selectors are 3, 5, 6 @@ -870,9 +870,9 @@ u8 interflip8035_state::main_p2_r() u8 interflip8035_state::audio_p2_r() { /* - P2.4 Sound Code 0 - P2.5 Sound Code 1 - P2.6 Sound Code 2 + P2.4 Sound Code 0 + P2.5 Sound Code 1 + P2.6 Sound Code 2 */ return m_audio; } @@ -888,7 +888,7 @@ void interflip8035_state::audio_p2_w(u8 data) u8 change = false; if(m_outbit[28] != BIT(data, 7)) change = true; - m_outbit[28] = BIT(data, 7); // P2.7 Topper Lamp + m_outbit[28] = BIT(data, 7); // P2.7 Topper Lamp if(!m_outbit[28] && change) { @@ -911,9 +911,9 @@ void interflip8035_state::audio_p2_w(u8 data) I8243 IO Expander Interface x 3 - Access: - P1 -> Enable PIA Access - IORW -> Destination Port (4, 5, 6, 7) 0xf4, 0xf5, 0xf6, 0xf7 + Access: + P1 -> Enable PIA Access + IORW -> Destination Port (4, 5, 6, 7) 0xf4, 0xf5, 0xf6, 0xf7 ****************************************************************/ @@ -947,7 +947,7 @@ void interflip8035_state::exp2_p6_w(u8 data) machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); // EM.Counter: Coin Out machine().bookkeeping().coin_counter_w(2, BIT(data, 2)); // EM.Counter: Coin Drop machine().bookkeeping().coin_counter_w(3, BIT(data, 3)); // EM.Counter: Jackpot Times - + // Coin in sound if(BIT(data, 0)) m_samples->start(0, 1, false); @@ -984,12 +984,12 @@ void interflip8035_state::exp3_p4_w(u8 data) void interflip8035_state::exp3_p6_w(u8 data) { /* Swapped Sound Control bits - ========================== - IO_Exp_Data -> Audio MPU P2 - bit 0 - /Int /Int - bit 1 - Code2 P2.6 - bit 2 - Code1 P2.5 - bit 3 - Code0 P2.4 + ========================== + IO_Exp_Data -> Audio MPU P2 + bit 0 - /Int /Int + bit 1 - Code2 P2.6 + bit 2 - Code1 P2.5 + bit 3 - Code0 P2.4 */ u8 state; @@ -1009,7 +1009,7 @@ void interflip8035_state::kbd_sl_w(u8 data) { // Scan Line m_kbd_sl = data; - // logerror("I8279: Scan Line: %02X\n", data); + // logerror("I8279: Scan Line: %02X\n", data); } u8 interflip8035_state::kbd_rl_r() @@ -1054,7 +1054,7 @@ void interflip8035_state::output_digit(int i, u8 data) // Segment Decode static const u8 led_map[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0x00 }; -// show layout +// show layout m_outbyte[i] = led_map[data & 0x0f]; } @@ -1154,30 +1154,30 @@ static INPUT_PORTS_START( interflip ) // To select Game Mode all DSW5, DSW6 and DSW7 must be On. All others are ignored. PORT_START("DSW_A") - PORT_DIPNAME(0x01, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME(0x01, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x01, DEF_STR(On)) - PORT_DIPNAME(0x02, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME(0x02, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x02, DEF_STR(On)) - PORT_DIPNAME(0x04, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:3") + PORT_DIPNAME(0x04, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x04, DEF_STR(On)) - PORT_DIPNAME(0x08, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME(0x08, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x08, DEF_STR(On)) PORT_START("DSW_B") - PORT_DIPNAME(0x01, 0x00, "General Test") PORT_DIPLOCATION("SW1:5") + PORT_DIPNAME(0x01, 0x00, "General Test") PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x01, DEF_STR(On)) - PORT_DIPNAME(0x02, 0x00, "Reels Test") PORT_DIPLOCATION("SW1:6") + PORT_DIPNAME(0x02, 0x00, "Reels Test") PORT_DIPLOCATION("SW1:6") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x02, DEF_STR(On)) - PORT_DIPNAME(0x04, 0x00, "Timing Test") PORT_DIPLOCATION("SW1:7") + PORT_DIPNAME(0x04, 0x00, "Timing Test") PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x04, DEF_STR(On)) - PORT_DIPNAME(0x08, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:8") + PORT_DIPNAME(0x08, 0x00, DEF_STR(Unused)) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x08, DEF_STR(On)) INPUT_PORTS_END @@ -1235,10 +1235,10 @@ void interflip8035_state::interflip(machine_config &config) // electromechanics add_em_reels(config, 20, attotime::from_double(2)); - + // hopper device HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - + // sound stuff SPEAKER(config, "mono").front_center(); @@ -1277,7 +1277,7 @@ void interflip8035_state::sev_81_cnf(machine_config &config) { interflip(config); - m_maincpu->p1_out_cb().set(FUNC(interflip8035_state::main_p1_enc_data_w)); // encoded coin lamps + m_maincpu->p1_out_cb().set(FUNC(interflip8035_state::main_p1_enc_data_w)); // encoded coin lamps // video layout config.set_default_layout(layout_sevilla_81); @@ -1287,7 +1287,7 @@ void interflip8035_state::sev_77_cnf(machine_config &config) { interflip(config); - m_maincpu->p1_out_cb().set(FUNC(interflip8035_state::main_p1_enc_data_w)); // encoded coin lamps + m_maincpu->p1_out_cb().set(FUNC(interflip8035_state::main_p1_enc_data_w)); // encoded coin lamps // video layout config.set_default_layout(layout_sevilla_77); @@ -1299,7 +1299,7 @@ void interflip8035_state::tol_87_cnf(machine_config &config) interflip(config); m_maincpu->p1_out_cb().set(FUNC(interflip8035_state::main_p1_enc_data_w)); // encoded coin lamps - + // video layout config.set_default_layout(layout_toledo_87); } @@ -1309,7 +1309,7 @@ void interflip8035_state::tol_83_cnf(machine_config &config) interflip(config); m_maincpu->p1_out_cb().set(FUNC(interflip8035_state::main_p1_enc_data_w)); // encoded coin lamps - + // video layout config.set_default_layout(layout_toledo_83); } diff --git a/src/mame/misc/rfslotsmcs48.cpp b/src/mame/misc/rfslotsmcs48.cpp index 872f73727bb..65faaab5fef 100644 --- a/src/mame/misc/rfslotsmcs48.cpp +++ b/src/mame/misc/rfslotsmcs48.cpp @@ -484,8 +484,8 @@ void rfslotsmcs48_state::exp2_p4_w(u8 data) // coils and emcounters void rfslotsmcs48_state::exp2_p5_w(u8 data) // game lights { m_outbit[7] = BIT(data, 0); // insert coin lamp - m_outbit[8] = BIT(data, 1); // fault lamp - m_outbit[9] = BIT(data, 2); // start lamp + m_outbit[8] = BIT(data, 1); // fault lamp + m_outbit[9] = BIT(data, 2); // start lamp m_outbit[10] = BIT(data, 3); // unused } @@ -519,7 +519,7 @@ void rfslotsmcs48_state::kbd_sl_w(u8 data) { // Scan Line m_kbd_sl = data; - // logerror("I8279: Scan Line: %02X\n", data); + // logerror("I8279: Scan Line: %02X\n", data); } void rfslotsmcs48_state::disp_w(u8 data) @@ -615,30 +615,30 @@ static INPUT_PORTS_START(babyfrts) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("SWA") // switches order from schematics... - PORT_DIPNAME(0x01, 0x01, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:4") + PORT_DIPNAME(0x01, 0x01, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:4") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x01, DEF_STR(Off)) - PORT_DIPNAME(0x02, 0x02, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:3") + PORT_DIPNAME(0x02, 0x02, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:3") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x02, DEF_STR(Off)) - PORT_DIPNAME(0x04, 0x04, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:2") + PORT_DIPNAME(0x04, 0x04, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:2") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x04, DEF_STR(Off)) - PORT_DIPNAME(0x08, 0x08, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:1") + PORT_DIPNAME(0x08, 0x08, DEF_STR(Unknown)) PORT_DIPLOCATION("SWA:1") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x08, DEF_STR(Off)) PORT_START("SWB") // switches order from schematics... - PORT_DIPNAME(0x01, 0x01, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:4") + PORT_DIPNAME(0x01, 0x01, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:4") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x01, DEF_STR(Off)) - PORT_DIPNAME(0x02, 0x02, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:1") + PORT_DIPNAME(0x02, 0x02, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:1") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x02, DEF_STR(Off)) - PORT_DIPNAME(0x04, 0x04, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:2") + PORT_DIPNAME(0x04, 0x04, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:2") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x04, DEF_STR(Off)) - PORT_DIPNAME(0x08, 0x08, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:3") + PORT_DIPNAME(0x08, 0x08, DEF_STR(Unknown)) PORT_DIPLOCATION("SWB:3") PORT_DIPSETTING(0x00, DEF_STR(On)) PORT_DIPSETTING(0x08, DEF_STR(Off)) INPUT_PORTS_END @@ -830,7 +830,7 @@ void rfslotsmcs48_state::ajofrin(machine_config &config) .----------------------------------. | .-------------------------. | | |·························| | - | '-------------------------' | + | '-------------------------' | | Xtal | | 6.000 MHz | | .--------------------. | @@ -849,10 +849,10 @@ void rfslotsmcs48_state::ajofrin(machine_config &config) | | GI AY-3-8910 | | | | | | | '--------------------' | - | .-------. | + | .-------. | | |· · · ·| | | '-------' | - '----------------------------------' + '----------------------------------' */ ROM_START(babyfrts) diff --git a/src/mame/nmk/ddealer.cpp b/src/mame/nmk/ddealer.cpp index 9b0a1cc9d19..65f769a91b9 100644 --- a/src/mame/nmk/ddealer.cpp +++ b/src/mame/nmk/ddealer.cpp @@ -11,7 +11,7 @@ TODO: - Understand better the video emulation and convert it to tilemaps; - Check audio IRQ frequency (controls music tempo, if too high 2 Player mode becomes slow) - + ========================================================================================================== pcb marked GD91071 @@ -65,7 +65,7 @@ public: { } void ddealer(machine_config &config); - + private: void flipscreen_w(u16 data); void back_vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); @@ -113,7 +113,7 @@ private: // splitted foreground area tilemap_t *m_fg_tilemap_left; tilemap_t *m_fg_tilemap_right; - + u8 m_bus_status; }; diff --git a/src/mame/nmk/nmk16.cpp b/src/mame/nmk/nmk16.cpp index 0357e0884f4..4a747a8a601 100644 --- a/src/mame/nmk/nmk16.cpp +++ b/src/mame/nmk/nmk16.cpp @@ -686,7 +686,7 @@ void nmk16_state::hachamf_map(address_map &map) map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::txvideoram_w)).share("txvideoram"); // Main RAM, inc sprites, shared with MCU - map(0x0f0000, 0x0fffff).ram().share("mainram"); // ram is shared with MCU + map(0x0f0000, 0x0fffff).ram().share("mainram"); // ram is shared with MCU } diff --git a/src/mame/pc/quakeat.cpp b/src/mame/pc/quakeat.cpp index 0ac4759e047..2b7d46a7916 100644 --- a/src/mame/pc/quakeat.cpp +++ b/src/mame/pc/quakeat.cpp @@ -203,7 +203,7 @@ void quakeat_state::quake(machine_config &config) { PENTIUM2(config, m_maincpu, 233'000'000); /* Pentium II, 233MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &quakeat_state::quake_map); -// m_maincpu->set_disable(); +// m_maincpu->set_disable(); PCI_ROOT(config, "pci", 0); // ... @@ -218,15 +218,15 @@ ROM_START(quake) // 4N4XL0X0.86A.0011.P05 ROM_REGION32_LE(0x20000, "pc_bios", 0) /* motherboard bios */ // TODO: compressed -// ROM_LOAD("p05-0011.bio", 0x000000, 0x10000, NO_DUMP ) -// ROM_CONTINUE( 0x1ffff-0xa0, 0xa0 ) +// ROM_LOAD("p05-0011.bio", 0x000000, 0x10000, NO_DUMP ) +// ROM_CONTINUE( 0x1ffff-0xa0, 0xa0 ) ROM_LOAD("quakearcadetournament.pcbios", 0x000000, 0x20000, NO_DUMP ) // Hitachi DK237A-21 A/A0A0, IDE/ATA 2.5" 2.1GB 4000 RPM // WS03131880 DISK_REGION( "disks" ) // wrong chs 263,255,63 -// DISK_IMAGE( "quakeat", 0, BAD_DUMP SHA1(c44695b9d521273c9d3c0e18c88f0dca0185bd7b) ) +// DISK_IMAGE( "quakeat", 0, BAD_DUMP SHA1(c44695b9d521273c9d3c0e18c88f0dca0185bd7b) ) // regenerated from above, with -chs 4200,16,63 as per reported HDD label DISK_IMAGE( "quakeat", 0, BAD_DUMP SHA1(9a422ad342aeddd447514d0287efde49e3de5fa8) ) ROM_END diff --git a/src/mame/seibu/wiz.cpp b/src/mame/seibu/wiz.cpp index 799a6cb82ae..59abd0dfaf7 100644 --- a/src/mame/seibu/wiz.cpp +++ b/src/mame/seibu/wiz.cpp @@ -311,7 +311,7 @@ uint8_t wiz_state::kungfuta_protection_r() case 0x5a: return 0xda; // after bonus round, prevents infinite loop case 0x7a: return 0xfa; // maybe not, condition is inverted case 0xaa: return 0x0a; // all the time during gameplay, unknown purpose - case 0xba: return 0x0a; + case 0xba: return 0x0a; case 0xca: return 0xca; // game over, unknown purpose case 0xff: return 0xff; // done before other checks, although code at 0xacc8 will skip 2nd check like this } |