diff options
| author | 2023-11-23 16:14:05 +0100 | |
|---|---|---|
| committer | 2023-11-23 16:14:05 +0100 | |
| commit | 4f61c5c88566e601248fec292ed02f0f33225109 (patch) | |
| tree | f40054d0dcad99e40c225b6a7fb46369b2f520c4 /src | |
| parent | 659829d58fb01077b1b063f24f453b808f62a830 (diff) | |
chess*: digit grouping for large numbers, small tweak to internal artwork lcd
Diffstat (limited to 'src')
36 files changed, 101 insertions, 104 deletions
diff --git a/src/mame/appliedconcepts/borisdpl.cpp b/src/mame/appliedconcepts/borisdpl.cpp index 689a7952849..82cdf674753 100644 --- a/src/mame/appliedconcepts/borisdpl.cpp +++ b/src/mame/appliedconcepts/borisdpl.cpp @@ -183,12 +183,12 @@ INPUT_PORTS_END void borisdpl_state::borisdpl(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 3000000/2); // frequency approximated from video reference + F8(config, m_maincpu, 3'000'000/2); // frequency approximated from video reference m_maincpu->set_addrmap(AS_PROGRAM, &borisdpl_state::main_map); m_maincpu->set_addrmap(AS_IO, &borisdpl_state::main_io); m_maincpu->set_irq_acknowledge_callback("psu", FUNC(f38t56_device::int_acknowledge)); - f38t56_device &psu(F38T56(config, "psu", 3000000/2)); + f38t56_device &psu(F38T56(config, "psu", 3'000'000/2)); psu.set_int_vector(0x5020); psu.int_req_callback().set_inputline("maincpu", F8_INPUT_LINE_INT_REQ); psu.read_a().set(FUNC(borisdpl_state::ram_data_r)); diff --git a/src/mame/chess/compuchess.cpp b/src/mame/chess/compuchess.cpp index 63668fd9a31..c4cc20f5682 100644 --- a/src/mame/chess/compuchess.cpp +++ b/src/mame/chess/compuchess.cpp @@ -216,7 +216,7 @@ void cmpchess_state::update_reset(ioport_value state) void cmpchess_state::update_cpu_freq(ioport_value state) { // 2 MK I versions, 2nd one was a lot faster - const u32 freq = state ? 3500000 : 2250000; + const u32 freq = state ? 3'500'000 : 2'250'000; m_maincpu->set_unscaled_clock(freq); subdevice<f3853_device>("smi")->set_unscaled_clock(freq); } @@ -443,8 +443,8 @@ void cmpchess_state::mk1(machine_config &config) cmpchess(config); // basic machine hardware - m_maincpu->set_clock(2250000); // see notes - subdevice<f3853_device>("smi")->set_clock(2250000); + m_maincpu->set_clock(2'250'000); // see notes + subdevice<f3853_device>("smi")->set_clock(2'250'000); config.set_default_layout(layout_novag_mk1); } @@ -454,11 +454,11 @@ void cmpchess_state::cncchess(machine_config &config) cmpchess2(config); // basic machine hardware - m_maincpu->set_clock(2000000); // LC circuit, measured 2MHz + m_maincpu->set_clock(2'000'000); // LC circuit, measured 2MHz m_maincpu->set_addrmap(AS_PROGRAM, &cmpchess_state::cncchess_map); m_maincpu->set_addrmap(AS_IO, &cmpchess_state::cncchess_io); - subdevice<f3853_device>("smi")->set_clock(2000000); + subdevice<f3853_device>("smi")->set_clock(2'000'000); config.set_default_layout(layout_conic_cchess); diff --git a/src/mame/chess/conic_cchess2.cpp b/src/mame/chess/conic_cchess2.cpp index 902c0d82258..341c2482edc 100644 --- a/src/mame/chess/conic_cchess2.cpp +++ b/src/mame/chess/conic_cchess2.cpp @@ -237,7 +237,7 @@ INPUT_PORTS_END void cchess2_state::cncchess2(machine_config &config) { // basic machine hardware - M6504(config, m_maincpu, 1000000); // approximation, no XTAL + M6504(config, m_maincpu, 1'000'000); // approximation, no XTAL m_maincpu->set_addrmap(AS_PROGRAM, &cchess2_state::main_map); PIA6821(config, m_pia[0]); diff --git a/src/mame/cxg/scptchess.cpp b/src/mame/cxg/scptchess.cpp index 67220c436e8..573ac7f71b3 100644 --- a/src/mame/cxg/scptchess.cpp +++ b/src/mame/cxg/scptchess.cpp @@ -190,7 +190,7 @@ INPUT_PORTS_END void scptchess_state::scptchess_v1(machine_config &config) { // basic machine hardware - HD44801(config, m_maincpu, 400000); + HD44801(config, m_maincpu, 400'000); m_maincpu->write_r<2>().set(FUNC(scptchess_state::mux_w<0>)); m_maincpu->write_r<3>().set(FUNC(scptchess_state::mux_w<1>)); m_maincpu->write_d().set(FUNC(scptchess_state::leds_w)); diff --git a/src/mame/cxg/sphinx40.cpp b/src/mame/cxg/sphinx40.cpp index b2983354854..a65daf5186c 100644 --- a/src/mame/cxg/sphinx40.cpp +++ b/src/mame/cxg/sphinx40.cpp @@ -273,10 +273,10 @@ INPUT_PORTS_END void sphinx40_state::sphinx40(machine_config &config) { // basic machine hardware - M68000(config, m_maincpu, 8000000); + M68000(config, m_maincpu, 8'000'000); m_maincpu->set_addrmap(AS_PROGRAM, &sphinx40_state::main_map); - const attotime irq_period = attotime::from_hz(8000000 / 0x1000); + const attotime irq_period = attotime::from_hz(8'000'000 / 0x1000); m_maincpu->set_periodic_int(FUNC(sphinx40_state::irq4_line_hold), irq_period); PIA6821(config, m_pia); diff --git a/src/mame/elektor/avrmax.cpp b/src/mame/elektor/avrmax.cpp index 46b5d0d0bd9..a598f2bd566 100644 --- a/src/mame/elektor/avrmax.cpp +++ b/src/mame/elektor/avrmax.cpp @@ -287,9 +287,9 @@ void avrmax_state::atm18mcc(machine_config &config) screen.set_visarea_full(); screen.set_screen_update(FUNC(avrmax_state::screen_update)); - // HD44780UA02 is required for certain international characters in cc2schach, - // the others can optionally use a more standard HD44780[U]A00 display HD44780U(config, m_lcd, 270'000); // TODO: clock not measured, datasheet typical clock used + // HD44780UA02 is required for certain international characters in cc2schach, + // the English version can optionally use a more standard HD44780[U]A00 display m_lcd->set_default_bios_tag("a02"); config.set_default_layout(layout_atm18mcc); diff --git a/src/mame/fidelity/bridgeb.cpp b/src/mame/fidelity/bridgeb.cpp index 0feb9ca276f..f87974ef03b 100644 --- a/src/mame/fidelity/bridgeb.cpp +++ b/src/mame/fidelity/bridgeb.cpp @@ -248,12 +248,12 @@ static const z80_daisy_config daisy_chain[] = void bridgeb_state::bridgeb(machine_config &config) { // basic machine hardware - Z80(config, m_maincpu, 1000000); // R/C clock, appromixation + Z80(config, m_maincpu, 1'000'000); // R/C clock, appromixation m_maincpu->set_addrmap(AS_PROGRAM, &bridgeb_state::main_map); m_maincpu->set_addrmap(AS_IO, &bridgeb_state::main_io); m_maincpu->set_daisy_config(daisy_chain); - Z80PIO(config, m_z80pio, 1000000); + Z80PIO(config, m_z80pio, 1'000'000); m_z80pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); m_z80pio->out_pa_callback().set(FUNC(bridgeb_state::control_w)); m_z80pio->in_pa_callback().set(FUNC(bridgeb_state::input_r)); diff --git a/src/mame/fidelity/checkc2.cpp b/src/mame/fidelity/checkc2.cpp index daa75ba936a..71d72d9142b 100644 --- a/src/mame/fidelity/checkc2.cpp +++ b/src/mame/fidelity/checkc2.cpp @@ -208,7 +208,7 @@ INPUT_PORTS_END void cr_state::cr(machine_config &config) { // basic machine hardware - NEC_D546(config, m_maincpu, 400000); // approximation + NEC_D546(config, m_maincpu, 400'000); // approximation m_maincpu->read_a().set(FUNC(cr_state::input_r)); m_maincpu->read_b().set(FUNC(cr_state::ram_r)); m_maincpu->write_c().set(FUNC(cr_state::ram_w)); diff --git a/src/mame/fidelity/csc.cpp b/src/mame/fidelity/csc.cpp index fbc14b3c1c7..6bbb97d77ae 100644 --- a/src/mame/fidelity/csc.cpp +++ b/src/mame/fidelity/csc.cpp @@ -684,7 +684,7 @@ void su9_state::su9(machine_config &config) void csc_state::rsc(machine_config &config) { // basic machine hardware - M6502(config, m_maincpu, 1800000); // measured approx 1.81MHz + M6502(config, m_maincpu, 1'800'000); // measured approx 1.81MHz m_maincpu->set_addrmap(AS_PROGRAM, &csc_state::rsc_map); auto &irq_clock(CLOCK(config, "irq_clock", 546)); // from 555 timer, measured diff --git a/src/mame/fidelity/sc9.cpp b/src/mame/fidelity/sc9.cpp index af27c8300c0..f10c9d9f72f 100644 --- a/src/mame/fidelity/sc9.cpp +++ b/src/mame/fidelity/sc9.cpp @@ -142,7 +142,7 @@ void sc9c_state::sc9c_set_cpu_freq() { // SC9(C01) was released with 1.5MHz, 1.6MHz, or 1.9MHz CPU u8 inp = ioport("FAKE")->read(); - m_maincpu->set_unscaled_clock((inp & 2) ? 1900000 : ((inp & 1) ? 1600000 : 1500000)); + m_maincpu->set_unscaled_clock((inp & 2) ? 1'900'000 : ((inp & 1) ? 1'600'000 : 1'500'000)); } @@ -289,7 +289,7 @@ void sc9_state::sc9b(machine_config &config) sc9d(config); // basic machine hardware - m_maincpu->set_clock(1500000); // from ceramic resonator "681 JSA", measured + m_maincpu->set_clock(1'500'000); // from ceramic resonator "681 JSA", measured m_maincpu->set_addrmap(AS_PROGRAM, &sc9_state::sc9_map); } diff --git a/src/mame/handheld/teammate.cpp b/src/mame/handheld/teammate.cpp index afbcfdc44f7..4888def0361 100644 --- a/src/mame/handheld/teammate.cpp +++ b/src/mame/handheld/teammate.cpp @@ -213,12 +213,12 @@ INPUT_PORTS_END void teammate_state::teammate(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 3600000/2); // R/C osc, approximation + F8(config, m_maincpu, 3'600'000/2); // R/C osc, approximation m_maincpu->set_addrmap(AS_PROGRAM, &teammate_state::main_map); m_maincpu->set_addrmap(AS_IO, &teammate_state::main_io); m_maincpu->set_irq_acknowledge_callback("psu", FUNC(f38t56_device::int_acknowledge)); - f38t56_device &psu(F38T56(config, "psu", 3600000/2)); + f38t56_device &psu(F38T56(config, "psu", 3'600'000/2)); psu.set_int_vector(0x20); psu.int_req_callback().set_inputline("maincpu", F8_INPUT_LINE_INT_REQ); psu.read_a().set(FUNC(teammate_state::input_r)); diff --git a/src/mame/hegenerglaser/mm2.cpp b/src/mame/hegenerglaser/mm2.cpp index 4b0251ca5ac..1b7e3a0912a 100644 --- a/src/mame/hegenerglaser/mm2.cpp +++ b/src/mame/hegenerglaser/mm2.cpp @@ -370,7 +370,7 @@ void mm2_state::mm4(machine_config &config) void mm2_state::mm4tk(machine_config &config) { mm4(config); - m_maincpu->set_clock(18000000); + m_maincpu->set_clock(18'000'000); } void mm2_state::mm5(machine_config &config) diff --git a/src/mame/hegenerglaser/mondial.cpp b/src/mame/hegenerglaser/mondial.cpp index e598f13b0a2..53dc3cfa7b9 100644 --- a/src/mame/hegenerglaser/mondial.cpp +++ b/src/mame/hegenerglaser/mondial.cpp @@ -163,10 +163,10 @@ INPUT_PORTS_END void mondial_state::mondial(machine_config &config) { // basic machine hardware - M65SC02(config, m_maincpu, 2000000); + M65SC02(config, m_maincpu, 2'000'000); m_maincpu->set_addrmap(AS_PROGRAM, &mondial_state::mondial_mem); - const attotime irq_period = attotime::from_hz(2000000 / 0x1000); + const attotime irq_period = attotime::from_hz(2'000'000 / 0x1000); m_maincpu->set_periodic_int(FUNC(mondial_state::irq0_line_assert), irq_period); SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS); diff --git a/src/mame/layout/cxg_commander.lay b/src/mame/layout/cxg_commander.lay index 0d4f2e09885..1cbd711c2ea 100644 --- a/src/mame/layout/cxg_commander.lay +++ b/src/mame/layout/cxg_commander.lay @@ -392,8 +392,8 @@ license:CC0-1.0 <element name="digit2" ref="digit"><bounds x="43.0" y="91" width="4" height="6" /></element> <element name="digit3" ref="digit"><bounds x="47.5" y="91" width="4" height="6" /></element> - <element name="lcd0.16" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd0.16" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd0.16" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd0.16" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> @@ -404,8 +404,8 @@ license:CC0-1.0 <element name="digit6" ref="digit"><bounds x="43.0" y="91" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="47.5" y="91" width="4" height="6" /></element> - <element name="lcd1.16" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd1.16" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd1.16" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd1.16" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> diff --git a/src/mame/layout/cxg_dominator.lay b/src/mame/layout/cxg_dominator.lay index e253b8d5d2f..425eeb645a0 100644 --- a/src/mame/layout/cxg_dominator.lay +++ b/src/mame/layout/cxg_dominator.lay @@ -492,8 +492,8 @@ license:CC0-1.0 <element name="digit2" ref="digit"><bounds x="43.0" y="91" width="4" height="6" /></element> <element name="digit3" ref="digit"><bounds x="47.5" y="91" width="4" height="6" /></element> - <element name="lcd0.16" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd0.16" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd0.16" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd0.16" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> @@ -504,8 +504,8 @@ license:CC0-1.0 <element name="digit6" ref="digit"><bounds x="43.0" y="91" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="47.5" y="91" width="4" height="6" /></element> - <element name="lcd1.16" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd1.16" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd1.16" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd1.16" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> diff --git a/src/mame/layout/cxg_galaxy.lay b/src/mame/layout/cxg_galaxy.lay index 687fdd64670..cea01dba3cd 100644 --- a/src/mame/layout/cxg_galaxy.lay +++ b/src/mame/layout/cxg_galaxy.lay @@ -484,8 +484,8 @@ license:CC0-1.0 <element name="digit2" ref="digit"><bounds x="43.0" y="91" width="4" height="6" /></element> <element name="digit3" ref="digit"><bounds x="47.5" y="91" width="4" height="6" /></element> - <element name="lcd0.16" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd0.16" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd0.16" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd0.16" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> @@ -496,8 +496,8 @@ license:CC0-1.0 <element name="digit6" ref="digit"><bounds x="43.0" y="91" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="47.5" y="91" width="4" height="6" /></element> - <element name="lcd1.16" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd1.16" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd1.16" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd1.16" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> diff --git a/src/mame/layout/cxg_sphinx40.lay b/src/mame/layout/cxg_sphinx40.lay index 519125e8555..78f7a163e94 100644 --- a/src/mame/layout/cxg_sphinx40.lay +++ b/src/mame/layout/cxg_sphinx40.lay @@ -396,8 +396,8 @@ license:CC0-1.0 <element name="digit2" ref="digit"><bounds x="42.75" y="91" width="4" height="6" /></element> <element name="digit3" ref="digit"><bounds x="47.75" y="91" width="4" height="6" /></element> - <element name="lcd31" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd31" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd31" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd31" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> @@ -410,8 +410,8 @@ license:CC0-1.0 <element name="digit6" ref="digit"><bounds x="42.75" y="91" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="47.75" y="91" width="4" height="6" /></element> - <element name="lcd63" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd63" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd63" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd63" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> diff --git a/src/mame/layout/saitek_corona.lay b/src/mame/layout/saitek_corona.lay index 0828ad145ed..4c6fa286221 100644 --- a/src/mame/layout/saitek_corona.lay +++ b/src/mame/layout/saitek_corona.lay @@ -507,16 +507,16 @@ license:CC0-1.0 <element name="digit3" ref="digit"><bounds x="30" y="0" width="4" height="6" /></element> <element name="digit4" ref="digit"><bounds x="34" y="0" width="4" height="6" /></element> - <element name="lcd0.0.0" ref="ldot"><bounds x="28.91" y="1.8" width="0.6" height="0.6" /></element> - <element name="lcd0.0.0" ref="ldot"><bounds x="28.69" y="3.65" width="0.6" height="0.6" /></element> + <element name="lcd0.0.0" ref="ldot"><bounds x="28.91" y="1.4" width="0.6" height="0.6" /></element> + <element name="lcd0.0.0" ref="ldot"><bounds x="28.69" y="4.05" width="0.6" height="0.6" /></element> <element name="digit5" ref="digit"><bounds x="20" y="8" width="4" height="6" /></element> <element name="digit6" ref="digit"><bounds x="24" y="8" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="30" y="8" width="4" height="6" /></element> <element name="digit8" ref="digit"><bounds x="34" y="8" width="4" height="6" /></element> - <element name="lcd1.0.0" ref="ldot"><bounds x="28.91" y="9.8" width="0.6" height="0.6" /></element> - <element name="lcd1.0.0" ref="ldot"><bounds x="28.69" y="11.65" width="0.6" height="0.6" /></element> + <element name="lcd1.0.0" ref="ldot"><bounds x="28.91" y="9.4" width="0.6" height="0.6" /></element> + <element name="lcd1.0.0" ref="ldot"><bounds x="28.69" y="12.05" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> diff --git a/src/mame/layout/saitek_simultano.lay b/src/mame/layout/saitek_simultano.lay index 9df1fe68928..88c2d1b99df 100644 --- a/src/mame/layout/saitek_simultano.lay +++ b/src/mame/layout/saitek_simultano.lay @@ -28,23 +28,23 @@ license:CC0-1.0 <rect state="1"><color red="0.33" green="0.31" blue="0.31" /></rect> </element> - <element name="text_1"><text string="1"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_2"><text string="2"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_3"><text string="3"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_4"><text string="4"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_5"><text string="5"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_6"><text string="6"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_7"><text string="7"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_8"><text string="8"><color red="0.41" green="0.4" blue="0.39" /></text></element> - - <element name="text_a"><text string="A"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_b"><text string="B"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_c"><text string="C"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_d"><text string="D"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_e"><text string="E"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_f"><text string="F"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_g"><text string="G"><color red="0.41" green="0.4" blue="0.39" /></text></element> - <element name="text_h"><text string="H"><color red="0.41" green="0.4" blue="0.39" /></text></element> + <element name="text_1"><text string="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_2"><text string="2"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_3"><text string="3"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_4"><text string="4"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_5"><text string="5"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_6"><text string="6"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_7"><text string="7"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_8"><text string="8"><color red="0.81" green="0.8" blue="0.79" /></text></element> + + <element name="text_a"><text string="A"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_b"><text string="B"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_c"><text string="C"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_d"><text string="D"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_e"><text string="E"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_f"><text string="F"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_g"><text string="G"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_h"><text string="H"><color red="0.81" green="0.8" blue="0.79" /></text></element> <element name="text_r1"><text string="WHITE" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> <element name="text_r2"><text string="BLACK" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> @@ -416,8 +416,7 @@ license:CC0-1.0 <group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group> <group ref="sb_ui"><bounds x="-12" y="3" width="10" height="80" /></group> - <!-- chessboard coords --> - + <!-- chessboard coords --> <element ref="text_8"><bounds x="1.5" y="7" width="2" height="2" /></element> <element ref="text_7"><bounds x="1.5" y="17" width="2" height="2" /></element> <element ref="text_6"><bounds x="1.5" y="27" width="2" height="2" /></element> @@ -436,8 +435,7 @@ license:CC0-1.0 <element ref="text_g"><bounds x="68" y="83.5" width="2" height="2" /></element> <element ref="text_h"><bounds x="78" y="83.5" width="2" height="2" /></element> - <!-- chessboard leds --> - + <!-- chessboard leds --> <element name="0.7" ref="ledr"><bounds x="-1" y="7.5" width="2" height="1" /></element> <element name="0.6" ref="ledr"><bounds x="-1" y="17.5" width="2" height="1" /></element> <element name="0.5" ref="ledr"><bounds x="-1" y="27.5" width="2" height="1" /></element> @@ -456,8 +454,7 @@ license:CC0-1.0 <element name="1.6" ref="ledr"><bounds x="68.5" y="86" width="1" height="2" /></element> <element name="1.7" ref="ledr"><bounds x="78.5" y="86" width="1" height="2" /></element> - <!-- right side --> - + <!-- right side --> <group ref="display"><bounds x="96.5" y="13" width="23.6" height="30" /></group> <element name="2.0" ref="ledr"><bounds x="88.5" y="20.5" width="2" height="1" /></element> diff --git a/src/mame/layout/saitek_stratos.lay b/src/mame/layout/saitek_stratos.lay index be99ce7c2a0..64744576329 100644 --- a/src/mame/layout/saitek_stratos.lay +++ b/src/mame/layout/saitek_stratos.lay @@ -486,16 +486,16 @@ license:CC0-1.0 <element name="digit3" ref="digit"><bounds x="30" y="0" width="4" height="6" /></element> <element name="digit4" ref="digit"><bounds x="34" y="0" width="4" height="6" /></element> - <element name="lcd0.0.0" ref="ldot"><bounds x="28.91" y="1.8" width="0.6" height="0.6" /></element> - <element name="lcd0.0.0" ref="ldot"><bounds x="28.69" y="3.65" width="0.6" height="0.6" /></element> + <element name="lcd0.0.0" ref="ldot"><bounds x="28.91" y="1.4" width="0.6" height="0.6" /></element> + <element name="lcd0.0.0" ref="ldot"><bounds x="28.69" y="4.05" width="0.6" height="0.6" /></element> <element name="digit5" ref="digit"><bounds x="20" y="8" width="4" height="6" /></element> <element name="digit6" ref="digit"><bounds x="24" y="8" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="30" y="8" width="4" height="6" /></element> <element name="digit8" ref="digit"><bounds x="34" y="8" width="4" height="6" /></element> - <element name="lcd1.0.0" ref="ldot"><bounds x="28.91" y="9.8" width="0.6" height="0.6" /></element> - <element name="lcd1.0.0" ref="ldot"><bounds x="28.69" y="11.65" width="0.6" height="0.6" /></element> + <element name="lcd1.0.0" ref="ldot"><bounds x="28.91" y="9.4" width="0.6" height="0.6" /></element> + <element name="lcd1.0.0" ref="ldot"><bounds x="28.69" y="12.05" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> diff --git a/src/mame/layout/saitek_tking.lay b/src/mame/layout/saitek_tking.lay index a4c839333df..f025e5e3f52 100644 --- a/src/mame/layout/saitek_tking.lay +++ b/src/mame/layout/saitek_tking.lay @@ -424,16 +424,16 @@ license:CC0-1.0 <element name="digit3" ref="digit"><bounds x="30" y="0" width="4" height="6" /></element> <element name="digit4" ref="digit"><bounds x="34" y="0" width="4" height="6" /></element> - <element name="lcd0.0.0" ref="ldot"><bounds x="28.91" y="1.8" width="0.6" height="0.6" /></element> - <element name="lcd0.0.0" ref="ldot"><bounds x="28.69" y="3.65" width="0.6" height="0.6" /></element> + <element name="lcd0.0.0" ref="ldot"><bounds x="28.91" y="1.4" width="0.6" height="0.6" /></element> + <element name="lcd0.0.0" ref="ldot"><bounds x="28.69" y="4.05" width="0.6" height="0.6" /></element> <element name="digit5" ref="digit"><bounds x="20" y="8" width="4" height="6" /></element> <element name="digit6" ref="digit"><bounds x="24" y="8" width="4" height="6" /></element> <element name="digit7" ref="digit"><bounds x="30" y="8" width="4" height="6" /></element> <element name="digit8" ref="digit"><bounds x="34" y="8" width="4" height="6" /></element> - <element name="lcd1.0.0" ref="ldot"><bounds x="28.91" y="9.8" width="0.6" height="0.6" /></element> - <element name="lcd1.0.0" ref="ldot"><bounds x="28.69" y="11.65" width="0.6" height="0.6" /></element> + <element name="lcd1.0.0" ref="ldot"><bounds x="28.91" y="9.4" width="0.6" height="0.6" /></element> + <element name="lcd1.0.0" ref="ldot"><bounds x="28.69" y="12.05" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> diff --git a/src/mame/layout/yeno_532xl.lay b/src/mame/layout/yeno_532xl.lay index 1ddc354b4ed..ff7adb3c23b 100644 --- a/src/mame/layout/yeno_532xl.lay +++ b/src/mame/layout/yeno_532xl.lay @@ -432,8 +432,8 @@ license:CC0-1.0 <element name="digit1" ref="digit"><bounds x="42.75" y="91" width="4" height="6" /></element> <element name="digit0" ref="digit"><bounds x="47.75" y="91" width="4" height="6" /></element> - <element name="lcd7" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd7" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd7" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd7" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> <group name="lcd2"> @@ -444,8 +444,8 @@ license:CC0-1.0 <element name="digit5" ref="digit"><bounds x="42.75" y="91" width="4" height="6" /></element> <element name="digit4" ref="digit"><bounds x="47.75" y="91" width="4" height="6" /></element> - <element name="lcd39" ref="ldot"><bounds x="42.13" y="92.55" width="0.6" height="0.6" /></element> - <element name="lcd39" ref="ldot"><bounds x="41.97" y="94.75" width="0.6" height="0.6" /></element> + <element name="lcd39" ref="ldot"><bounds xc="42.45" yc="92.25" width="0.6" height="0.6" /></element> + <element name="lcd39" ref="ldot"><bounds xc="42.15" yc="95.65" width="0.6" height="0.6" /></element> </group> diff --git a/src/mame/novag/micro.cpp b/src/mame/novag/micro.cpp index 205c2e8d778..4ca52f8e869 100644 --- a/src/mame/novag/micro.cpp +++ b/src/mame/novag/micro.cpp @@ -197,11 +197,11 @@ INPUT_PORTS_END void micro_state::micro(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 4500000/2); // matches video reference + F8(config, m_maincpu, 4'500'000/2); // matches video reference m_maincpu->set_addrmap(AS_PROGRAM, µ_state::main_map); m_maincpu->set_addrmap(AS_IO, µ_state::main_io); - f38t56_device &psu(F38T56(config, "psu", 4500000/2)); + f38t56_device &psu(F38T56(config, "psu", 4'500'000/2)); psu.read_a().set(FUNC(micro_state::control_r)); psu.write_a().set(FUNC(micro_state::control_w)); psu.write_b().set(FUNC(micro_state::led_w)); diff --git a/src/mame/novag/micro2.cpp b/src/mame/novag/micro2.cpp index c78b14108cc..c7db34842c4 100644 --- a/src/mame/novag/micro2.cpp +++ b/src/mame/novag/micro2.cpp @@ -108,8 +108,8 @@ void micro2_state::machine_start() void micro2_state::set_cpu_freq() { // known CPU speeds: 6MHz(XTAL), 6MHz(LC), 12MHz(LC) - u32 clock = (ioport("FAKE")->read() & 1) ? 12000000 : 6000000; - m_board->set_delay(attotime::from_ticks(2000000, clock)); // see TODO + u32 clock = (ioport("FAKE")->read() & 1) ? 12'000'000 : 6'000'000; + m_board->set_delay(attotime::from_ticks(2'000'000, clock)); // see TODO m_maincpu->set_unscaled_clock(clock); } diff --git a/src/mame/saitek/chesstrv.cpp b/src/mame/saitek/chesstrv.cpp index 5aa8a8f3f4c..aaf03634e2f 100644 --- a/src/mame/saitek/chesstrv.cpp +++ b/src/mame/saitek/chesstrv.cpp @@ -243,11 +243,11 @@ INPUT_PORTS_END void chesstrv_state::chesstrv(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 4500000/2); // approximation + F8(config, m_maincpu, 4'500'000/2); // approximation m_maincpu->set_addrmap(AS_PROGRAM, &chesstrv_state::chesstrv_mem); m_maincpu->set_addrmap(AS_IO, &chesstrv_state::chesstrv_io); - f38t56_device &psu(F38T56(config, "psu", 4500000/2)); + f38t56_device &psu(F38T56(config, "psu", 4'500'000/2)); psu.read_a().set(FUNC(chesstrv_state::ram_data_r)); psu.write_a().set(FUNC(chesstrv_state::ram_data_w)); psu.read_b().set(FUNC(chesstrv_state::input_r)); @@ -264,8 +264,8 @@ void chesstrv_state::chesstrvi(machine_config &config) chesstrv(config); // basic machine hardware - m_maincpu->set_clock(6000000/2); // approximation - subdevice<f38t56_device>("psu")->set_clock(6000000/2); + m_maincpu->set_clock(6'000'000/2); // approximation + subdevice<f38t56_device>("psu")->set_clock(6'000'000/2); TIMER(config, m_comp_timer).configure_generic(FUNC(chesstrv_state::computing)); config.set_default_layout(layout_saitek_chesstrvi); diff --git a/src/mame/saitek/companion.cpp b/src/mame/saitek/companion.cpp index 49818b53e46..1416e2590c2 100644 --- a/src/mame/saitek/companion.cpp +++ b/src/mame/saitek/companion.cpp @@ -189,7 +189,7 @@ INPUT_PORTS_END void compan_state::compan(machine_config &config) { // basic machine hardware - M6504(config, m_maincpu, 1000000); // approximation, no XTAL + M6504(config, m_maincpu, 1'000'000); // approximation, no XTAL m_maincpu->set_addrmap(AS_PROGRAM, &compan_state::main_map); PIA6821(config, m_pia); diff --git a/src/mame/saitek/companion2.cpp b/src/mame/saitek/companion2.cpp index c98877cb381..510a2b6088e 100644 --- a/src/mame/saitek/companion2.cpp +++ b/src/mame/saitek/companion2.cpp @@ -150,7 +150,7 @@ void compan2_state::machine_start() void compan2_state::set_cpu_freq() { // Concord II MCU speed is around twice higher - m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? 7200000 : 4000000); + m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? 7'200'000 : 4'000'000); } @@ -372,7 +372,7 @@ void compan2_state::expchess(machine_config &config) enterp(config); // basic machine hardware - m_maincpu->set_clock(4000000); // approximation, no XTAL + m_maincpu->set_clock(4'000'000); // approximation, no XTAL m_maincpu->in_p2_cb().set(FUNC(compan2_state::input2_r)); m_maincpu->out_p2_cb().set("dac", FUNC(dac_1bit_device::write)).bit(0); m_maincpu->in_p4_cb().set(FUNC(compan2_state::power_r)); diff --git a/src/mame/saitek/cp2000.cpp b/src/mame/saitek/cp2000.cpp index b4322c4a337..6d9c175a712 100644 --- a/src/mame/saitek/cp2000.cpp +++ b/src/mame/saitek/cp2000.cpp @@ -216,12 +216,12 @@ INPUT_PORTS_END void cp2000_state::cp2000(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 2750000); // see driver notes + F8(config, m_maincpu, 2'750'000); // see driver notes m_maincpu->set_addrmap(AS_PROGRAM, &cp2000_state::main_map); m_maincpu->set_addrmap(AS_IO, &cp2000_state::main_io); m_maincpu->set_irq_acknowledge_callback("f3853", FUNC(f3853_device::int_acknowledge)); - f3853_device &f3853(F3853(config, "f3853", 2750000)); + f3853_device &f3853(F3853(config, "f3853", 2'750'000)); f3853.int_req_callback().set_inputline("maincpu", F8_INPUT_LINE_INT_REQ); SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS); diff --git a/src/mame/saitek/delta1.cpp b/src/mame/saitek/delta1.cpp index 6501676cab6..27778de589a 100644 --- a/src/mame/saitek/delta1.cpp +++ b/src/mame/saitek/delta1.cpp @@ -217,12 +217,12 @@ INPUT_PORTS_END void delta1_state::delta1(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 2000000); // LC circuit, measured 2MHz + F8(config, m_maincpu, 2'000'000); // LC circuit, measured 2MHz m_maincpu->set_addrmap(AS_PROGRAM, &delta1_state::main_map); m_maincpu->set_addrmap(AS_IO, &delta1_state::main_io); m_maincpu->set_irq_acknowledge_callback("f3853", FUNC(f3853_device::int_acknowledge)); - f3853_device &f3853(F3853(config, "f3853", 2000000)); + f3853_device &f3853(F3853(config, "f3853", 2'000'000)); f3853.int_req_callback().set_inputline("maincpu", F8_INPUT_LINE_INT_REQ); // video hardware diff --git a/src/mame/saitek/exechess.cpp b/src/mame/saitek/exechess.cpp index 006e592def6..f68b83f72a3 100644 --- a/src/mame/saitek/exechess.cpp +++ b/src/mame/saitek/exechess.cpp @@ -213,12 +213,12 @@ INPUT_PORTS_END void exechess_state::exechess(machine_config &config) { // basic machine hardware - F8(config, m_maincpu, 4500000/2); // measured + F8(config, m_maincpu, 4'500'000/2); // measured m_maincpu->set_addrmap(AS_PROGRAM, &exechess_state::main_map); m_maincpu->set_addrmap(AS_IO, &exechess_state::main_io); m_maincpu->set_irq_acknowledge_callback("psu", FUNC(f38t56_device::int_acknowledge)); - f38t56_device &psu(F38T56(config, "psu", 4500000/2)); + f38t56_device &psu(F38T56(config, "psu", 4'500'000/2)); psu.set_int_vector(0x0020); psu.int_req_callback().set_inputline("maincpu", F8_INPUT_LINE_INT_REQ); psu.read_a().set(FUNC(exechess_state::ram_data_r)); diff --git a/src/mame/saitek/minichess.cpp b/src/mame/saitek/minichess.cpp index b7b05749705..07e820d0e2c 100644 --- a/src/mame/saitek/minichess.cpp +++ b/src/mame/saitek/minichess.cpp @@ -179,7 +179,7 @@ INPUT_PORTS_END void mini_state::smchess(machine_config &config) { // basic machine hardware - HD44801(config, m_maincpu, 400000); + HD44801(config, m_maincpu, 400'000); m_maincpu->write_r<2>().set(FUNC(mini_state::seg_w<0>)); m_maincpu->write_r<3>().set(FUNC(mini_state::seg_w<1>)); m_maincpu->write_d().set(FUNC(mini_state::mux_w)); diff --git a/src/mame/saitek/prschess.cpp b/src/mame/saitek/prschess.cpp index 388f800c413..71bb6b9d2ec 100644 --- a/src/mame/saitek/prschess.cpp +++ b/src/mame/saitek/prschess.cpp @@ -187,7 +187,7 @@ INPUT_PORTS_END void prschess_state::prschess(machine_config &config) { // basic machine hardware - M6502(config, m_maincpu, 2000000); + M6502(config, m_maincpu, 2'000'000); m_maincpu->set_addrmap(AS_PROGRAM, &prschess_state::main_map); m_maincpu->set_periodic_int(FUNC(prschess_state::nmi_line_pulse), attotime::from_hz(100)); // guessed diff --git a/src/mame/saitek/schess.cpp b/src/mame/saitek/schess.cpp index af76ae2de15..8d67e2f7e58 100644 --- a/src/mame/saitek/schess.cpp +++ b/src/mame/saitek/schess.cpp @@ -212,12 +212,12 @@ INPUT_PORTS_END void schess_state::schess(machine_config &config) { // basic machine hardware - M6502(config, m_maincpu, 2000000); // approximation, no XTAL + M6502(config, m_maincpu, 2'000'000); // approximation, no XTAL m_maincpu->set_addrmap(AS_PROGRAM, &schess_state::main_map); SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS); m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess)); - m_board->set_delay(attotime::from_ticks(1115000, 2000000)); // see driver notes + m_board->set_delay(attotime::from_ticks(1'115'000, 2'000'000)); // see driver notes GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "schess_cart"); SOFTWARE_LIST(config, "cart_list").set_original("saitek_schess"); diff --git a/src/mame/saitek/ssystem3.cpp b/src/mame/saitek/ssystem3.cpp index 2cbe26e1592..cd767d175e1 100644 --- a/src/mame/saitek/ssystem3.cpp +++ b/src/mame/saitek/ssystem3.cpp @@ -488,7 +488,7 @@ void ssystem3_state::ssystem3(machine_config &config) // basic machine hardware m_maincpu->set_addrmap(AS_PROGRAM, &ssystem3_state::ssystem3_map); - M6808(config, m_subcpu, 6800000); // LC circuit, measured + M6808(config, m_subcpu, 6'800'000); // LC circuit, measured m_subcpu->set_addrmap(AS_PROGRAM, &ssystem3_state::chessunit_map); config.set_perfect_quantum(m_maincpu); diff --git a/src/mame/saitek/superstar.cpp b/src/mame/saitek/superstar.cpp index 5dccbba3dba..0e8931920ca 100644 --- a/src/mame/saitek/superstar.cpp +++ b/src/mame/saitek/superstar.cpp @@ -198,10 +198,10 @@ INPUT_PORTS_END void star_state::sstar28k(machine_config &config) { // basic machine hardware - M6502(config, m_maincpu, 2000000); // no XTAL + M6502(config, m_maincpu, 2'000'000); // no XTAL m_maincpu->set_addrmap(AS_PROGRAM, &star_state::sstar28k_map); - const attotime nmi_period = attotime::from_hz(2000000 / 0x2000); // 4020 Q13 + const attotime nmi_period = attotime::from_hz(2'000'000 / 0x2000); // 4020 Q13 m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), nmi_period); SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS); diff --git a/src/mame/ussr/intellect02.cpp b/src/mame/ussr/intellect02.cpp index ba18bbe077a..97ecd7a77aa 100644 --- a/src/mame/ussr/intellect02.cpp +++ b/src/mame/ussr/intellect02.cpp @@ -213,7 +213,7 @@ INPUT_PORTS_END void intel02_state::intel02(machine_config &config) { // basic machine hardware - I8080A(config, m_maincpu, 1500000); // measured (no XTAL) + I8080A(config, m_maincpu, 1'500'000); // measured (no XTAL) m_maincpu->set_addrmap(AS_PROGRAM, &intel02_state::main_map); m_maincpu->set_addrmap(AS_IO, &intel02_state::main_io); |
