From b7f9c64e6bd4274ade0b60d1c56c1cab7248cd52 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 27 Nov 2022 02:36:40 +1100 Subject: srcclean in preparation for 0.250 branch --- hash/apple2gs_flop_orig.xml | 2 +- hash/msx1_cass.xml | 28 ++++---- hash/msx1_flop_525.xml | 2 +- hash/spectrum_cass.xml | 20 +++--- src/devices/bus/abcbus/lux4105.cpp | 2 +- src/devices/cpu/cdc1700/cdc1700d.cpp | 6 +- src/lib/formats/dmk_dsk.cpp | 10 +-- src/mame/cirsa/neptunp2.cpp | 2 +- src/mame/layout/dx9.lay | 6 +- src/mame/mg1/kbd.cpp | 2 +- src/mame/misc/mtu130.cpp | 94 ++++++++++++------------ src/mame/nec/pc8801.cpp | 2 +- src/mame/nichibutsu/terracre.cpp | 2 +- src/mame/olympia/portrait_v.cpp | 2 +- src/mame/quantel/dpb7000.cpp | 134 +++++++++++++++++------------------ src/mame/seibu/banprestoms.cpp | 2 +- src/mame/skeleton/elcirculo.cpp | 4 +- src/mame/trs/agvision.cpp | 78 ++++++++++---------- src/mame/yamaha/ymdx9.cpp | 10 +-- 19 files changed, 204 insertions(+), 204 deletions(-) diff --git a/hash/apple2gs_flop_orig.xml b/hash/apple2gs_flop_orig.xml index 66058e795df..7be40676cb3 100644 --- a/hash/apple2gs_flop_orig.xml +++ b/hash/apple2gs_flop_orig.xml @@ -4085,5 +4085,5 @@ license:CC0 - + diff --git a/hash/msx1_cass.xml b/hash/msx1_cass.xml index ee650b572ec..e183186334c 100644 --- a/hash/msx1_cass.xml +++ b/hash/msx1_cass.xml @@ -16475,20 +16475,20 @@ license:CC0 diff --git a/hash/msx1_flop_525.xml b/hash/msx1_flop_525.xml index 37b43752a61..f05a3f9d413 100644 --- a/hash/msx1_flop_525.xml +++ b/hash/msx1_flop_525.xml @@ -5,7 +5,7 @@ license:CC0 --> diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index e3f1061dfed..e05f9eef6b1 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -15698,7 +15698,7 @@ license:CC0 1989 Cartoon Time (Code Masters) - + @@ -19164,7 +19164,7 @@ license:CC0 1989 Cartoon Time (Code Masters) - + @@ -77476,12 +77476,12 @@ Tape 2 - Side B: - + diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index c5d101e0ec5..85400f57786 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -309,7 +309,7 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req ) { // reset REQ FF m_req = 0; - } + } update_ack(); update_dma(); diff --git a/src/devices/cpu/cdc1700/cdc1700d.cpp b/src/devices/cpu/cdc1700/cdc1700d.cpp index 3b80a51f3e2..ba9ddc7d129 100644 --- a/src/devices/cpu/cdc1700/cdc1700d.cpp +++ b/src/devices/cpu/cdc1700/cdc1700d.cpp @@ -60,7 +60,7 @@ const char *const s_register_insts[15] = const char *const s_memory_insts[15] = { - "JMP", "MUI", "DVI", + "JMP", "MUI", "DVI", "STQ", "RTJ", "STA", "SPA", "ADD", "SUB", "AND", "EOR", "LDA", "RAO", "LDQ", "ADQ" @@ -311,7 +311,7 @@ offs_t cyber18_disassembler::dasm_register_reference(std::ostream &stream, offs_ if (BIT(inst, 8)) util::stream_format(stream, ",%d,%d", BIT(inst2, 12, 4), BIT(inst2, 8, 4) + 1); - // For LCA, SCA and CCE, first index is a character index + // For LCA, SCA and CCE, first index is a character index if (!BIT(inst, 8) && (inst2 & 0xde00) == 0xc200) util::stream_format(stream, ",%s", s_reg_long_names[BIT(inst, 0, 3)]); @@ -524,7 +524,7 @@ offs_t cdc1700_disassembler::disassemble(std::ostream &stream, offs_t pc, const case 0xf: // Shift instructions if (BIT(inst, 5, 2) != 0) - util::stream_format(stream, "%c%c%-3c%d", "QAL"[BIT(inst, 5, 2) - 1], BIT(inst, 7) ? 'L' : 'R', 'S', inst & 0x001f); + util::stream_format(stream, "%c%c%-3c%d", "QAL"[BIT(inst, 5, 2) - 1], BIT(inst, 7) ? 'L' : 'R', 'S', inst & 0x001f); else util::stream_format(stream, "%-5s$%04X", "NUM", inst); return 1 | SUPPORTED; diff --git a/src/lib/formats/dmk_dsk.cpp b/src/lib/formats/dmk_dsk.cpp index 1a5de766292..b4d006f4a3a 100644 --- a/src/lib/formats/dmk_dsk.cpp +++ b/src/lib/formats/dmk_dsk.cpp @@ -31,9 +31,9 @@ uint32_t wide_fm(uint16_t val) uint32_t data_to_wide_fm(uint8_t val) { - uint16_t res = 0xaaaa; // clock + uint16_t res = 0xaaaa; // clock for (int i = 7; i >= 0; i--) { - res |= (util::BIT(val, i) << i*2); // data + res |= (util::BIT(val, i) << i*2); // data } return wide_fm(res); } @@ -166,7 +166,7 @@ bool dmk_format::load(util::random_read &io, uint32_t form_factor, const std::ve { mark_location[i] = -1; mark_value[i] = 0xfe; - mark_is_mfm[i] = !is_sd; // Use default encoding + mark_is_mfm[i] = !is_sd; // Use default encoding } int mark_count = 0; @@ -241,7 +241,7 @@ bool dmk_format::load(util::random_read &io, uint32_t form_factor, const std::ve } else { - raw_w(raw_track_data, 32, wide_fm(0xf77a)); // FC clocked with D7 + raw_w(raw_track_data, 32, wide_fm(0xf77a)); // FC clocked with D7 offset += fm_stride; } } @@ -299,7 +299,7 @@ bool dmk_format::load(util::random_read &io, uint32_t form_factor, const std::ve else raw_w(raw_track_data, 32, data_to_wide_fm(track_data[offset])); - + if (!enc_mfm) offset += fm_stride - 1; } diff --git a/src/mame/cirsa/neptunp2.cpp b/src/mame/cirsa/neptunp2.cpp index 35c2cb12396..7afc6310a47 100644 --- a/src/mame/cirsa/neptunp2.cpp +++ b/src/mame/cirsa/neptunp2.cpp @@ -38,7 +38,7 @@ The "960606-5" PCB is used at least on the following games: Unidesa/Cirsa Vikingos Unidesa/Cirsa Vulcano -The same hardware from Unidesa/Cirsa was also used on some games from +The same hardware from Unidesa/Cirsa was also used on some games from "Europea de Investigaciones Electrónicas S.A.": Unidesa/Cirsa/Europea Atlantis diff --git a/src/mame/layout/dx9.lay b/src/mame/layout/dx9.lay index 86ba63b70c4..0c9886a56ea 100644 --- a/src/mame/layout/dx9.lay +++ b/src/mame/layout/dx9.lay @@ -47,7 +47,7 @@ license:CC0 - + @@ -197,7 +197,7 @@ license:CC0 - + @@ -554,7 +554,7 @@ license:CC0 - + diff --git a/src/mame/mg1/kbd.cpp b/src/mame/mg1/kbd.cpp index e5567ed3afd..555e88e8bd0 100644 --- a/src/mame/mg1/kbd.cpp +++ b/src/mame/mg1/kbd.cpp @@ -3,7 +3,7 @@ /* * Emulation of a keyboard for the Whitechapel Computer Works MG-1 workstation. - * + * * Sources: * - Data sheet E501-1083, "Personal Computer Keyboard", General Instrument, Computer Products Division, C.P. Clare International N.V. * diff --git a/src/mame/misc/mtu130.cpp b/src/mame/misc/mtu130.cpp index 40d4c2511ac..47a4a27ad79 100644 --- a/src/mame/misc/mtu130.cpp +++ b/src/mame/misc/mtu130.cpp @@ -621,53 +621,53 @@ TIMER_CALLBACK_MEMBER(mtu130_state::lightpen_hit) // aaaa aaaa .ppp ...s (a = address, p = pixel, s = skew) // The os-provided coordinates decoding routine cannot generate x >= 474 static const uint16_t x_to_address[480] = { - 0x0261, 0x0271, 0x0300, 0x0310, 0x0320, 0x0330, 0x0340, 0x0350, 0x0360, 0x0370, - 0x0301, 0x0311, 0x0421, 0x0431, 0x0440, 0x0450, 0x0460, 0x0470, 0x0400, 0x0410, - 0x0420, 0x0430, 0x0540, 0x0550, 0x0560, 0x0570, 0x0501, 0x0511, 0x0521, 0x0531, - 0x0541, 0x0551, 0x0660, 0x0670, 0x0700, 0x0710, 0x0720, 0x0730, 0x0740, 0x0750, - 0x0760, 0x0770, 0x0801, 0x0811, 0x0821, 0x0831, 0x0840, 0x0850, 0x0860, 0x0870, - 0x0800, 0x0810, 0x0820, 0x0830, 0x0940, 0x0950, 0x0960, 0x0970, 0x0901, 0x0911, - 0x0921, 0x0931, 0x0a41, 0x0a51, 0x0a61, 0x0a71, 0x0a00, 0x0a10, 0x0a20, 0x0a30, - 0x0a40, 0x0a50, 0x0a60, 0x0a70, 0x0c00, 0x0c10, 0x0c20, 0x0c30, 0x0c40, 0x0c50, - 0x0c61, 0x0c71, 0x0d00, 0x0d10, 0x0d20, 0x0d30, 0x0d40, 0x0d50, 0x0d60, 0x0d70, - 0x0d01, 0x0d11, 0x0e21, 0x0e31, 0x0e40, 0x0e50, 0x0e60, 0x0e70, 0x0e00, 0x0e10, - 0x0e20, 0x0e30, 0x0f40, 0x0f50, 0x0f60, 0x0f70, 0x0f01, 0x0f11, 0x0f21, 0x0f31, - 0x0f41, 0x0f51, 0x1060, 0x1070, 0x1100, 0x1110, 0x1120, 0x1130, 0x1140, 0x1150, - 0x1160, 0x1170, 0x1201, 0x1211, 0x1221, 0x1231, 0x1240, 0x1250, 0x1260, 0x1270, - 0x1200, 0x1210, 0x1220, 0x1230, 0x1340, 0x1350, 0x1360, 0x1370, 0x1301, 0x1311, - 0x1321, 0x1331, 0x1441, 0x1451, 0x1461, 0x1471, 0x1400, 0x1410, 0x1420, 0x1430, - 0x1440, 0x1450, 0x1460, 0x1470, 0x1600, 0x1610, 0x1620, 0x1630, 0x1640, 0x1650, - 0x1661, 0x1671, 0x1700, 0x1710, 0x1720, 0x1730, 0x1740, 0x1750, 0x1760, 0x1770, - 0x1701, 0x1711, 0x1821, 0x1831, 0x1840, 0x1850, 0x1860, 0x1870, 0x1800, 0x1810, - 0x1820, 0x1830, 0x1940, 0x1950, 0x1960, 0x1970, 0x1901, 0x1911, 0x1921, 0x1931, - 0x1941, 0x1951, 0x1a60, 0x1a70, 0x1b00, 0x1b10, 0x1b20, 0x1b30, 0x1b40, 0x1b50, - 0x1b60, 0x1b70, 0x1c01, 0x1c11, 0x1c21, 0x1c31, 0x1c40, 0x1c50, 0x1c60, 0x1c70, - 0x1c00, 0x1c10, 0x1c20, 0x1c30, 0x1d40, 0x1d50, 0x1d60, 0x1d70, 0x1d01, 0x1d11, - 0x1d21, 0x1d31, 0x1e41, 0x1e51, 0x1e61, 0x1e71, 0x1e00, 0x1e10, 0x1e20, 0x1e30, - 0x1e40, 0x1e50, 0x1e60, 0x1e70, 0x2000, 0x2010, 0x2020, 0x2030, 0x2040, 0x2050, - 0x2061, 0x2071, 0x2100, 0x2110, 0x2120, 0x2130, 0x2140, 0x2150, 0x2160, 0x2170, - 0x2101, 0x2111, 0x2221, 0x2231, 0x2240, 0x2250, 0x2260, 0x2270, 0x2200, 0x2210, - 0x2220, 0x2230, 0x2340, 0x2350, 0x2360, 0x2370, 0x2301, 0x2311, 0x2321, 0x2331, - 0x2341, 0x2351, 0x2460, 0x2470, 0x2500, 0x2510, 0x2520, 0x2530, 0x2540, 0x2550, - 0x2560, 0x2570, 0x2601, 0x2611, 0x2621, 0x2631, 0x2640, 0x2650, 0x2660, 0x2670, - 0x2600, 0x2610, 0x2620, 0x2630, 0x2740, 0x2750, 0x2760, 0x2770, 0x2701, 0x2711, - 0x2721, 0x2731, 0x2841, 0x2851, 0x2861, 0x2871, 0x2800, 0x2810, 0x2820, 0x2830, - 0x2840, 0x2850, 0x2860, 0x2870, 0x2a00, 0x2a10, 0x2a20, 0x2a30, 0x2a40, 0x2a50, - 0x2a61, 0x2a71, 0x2b00, 0x2b10, 0x2b20, 0x2b30, 0x2b40, 0x2b50, 0x2b60, 0x2b70, - 0x2b01, 0x2b11, 0x2c21, 0x2c31, 0x2c40, 0x2c50, 0x2c60, 0x2c70, 0x2c00, 0x2c10, - 0x2c20, 0x2c30, 0x2d40, 0x2d50, 0x2d60, 0x2d70, 0x2d01, 0x2d11, 0x2d21, 0x2d31, - 0x2d41, 0x2d51, 0x2e60, 0x2e70, 0x2f00, 0x2f10, 0x2f20, 0x2f30, 0x2f40, 0x2f50, - 0x2f60, 0x2f70, 0x3001, 0x3011, 0x3021, 0x3031, 0x3040, 0x3050, 0x3060, 0x3070, - 0x3000, 0x3010, 0x3020, 0x3030, 0x3140, 0x3150, 0x3160, 0x3170, 0x3101, 0x3111, - 0x3121, 0x3131, 0x3241, 0x3251, 0x3261, 0x3271, 0x3200, 0x3210, 0x3220, 0x3230, - 0x3240, 0x3250, 0x3260, 0x3270, 0x3400, 0x3410, 0x3420, 0x3430, 0x3440, 0x3450, - 0x3461, 0x3471, 0x3500, 0x3510, 0x3520, 0x3530, 0x3540, 0x3550, 0x3560, 0x3570, - 0x3501, 0x3511, 0x3621, 0x3631, 0x3640, 0x3650, 0x3660, 0x3670, 0x3600, 0x3610, - 0x3620, 0x3630, 0x3740, 0x3750, 0x3760, 0x3770, 0x3701, 0x3711, 0x3721, 0x3731, - 0x3741, 0x3751, 0x3860, 0x3870, 0x3900, 0x3910, 0x3920, 0x3930, 0x3940, 0x3950, - 0x3960, 0x3970, 0x3a01, 0x3a11, 0x3a21, 0x3a31, 0x3a40, 0x3a50, 0x3a60, 0x3a70, - 0x3a00, 0x3a10, 0x3a20, 0x3a30, 0x3b40, 0x3b50, 0x3b60, 0x3b70, 0x3b01, 0x3b11, - 0x3b21, 0x3b31, 0x3c41, 0x3c51, 0x3c61, 0x3c71, 0x3c00, 0x3c10, 0x3c20, 0x3c30, + 0x0261, 0x0271, 0x0300, 0x0310, 0x0320, 0x0330, 0x0340, 0x0350, 0x0360, 0x0370, + 0x0301, 0x0311, 0x0421, 0x0431, 0x0440, 0x0450, 0x0460, 0x0470, 0x0400, 0x0410, + 0x0420, 0x0430, 0x0540, 0x0550, 0x0560, 0x0570, 0x0501, 0x0511, 0x0521, 0x0531, + 0x0541, 0x0551, 0x0660, 0x0670, 0x0700, 0x0710, 0x0720, 0x0730, 0x0740, 0x0750, + 0x0760, 0x0770, 0x0801, 0x0811, 0x0821, 0x0831, 0x0840, 0x0850, 0x0860, 0x0870, + 0x0800, 0x0810, 0x0820, 0x0830, 0x0940, 0x0950, 0x0960, 0x0970, 0x0901, 0x0911, + 0x0921, 0x0931, 0x0a41, 0x0a51, 0x0a61, 0x0a71, 0x0a00, 0x0a10, 0x0a20, 0x0a30, + 0x0a40, 0x0a50, 0x0a60, 0x0a70, 0x0c00, 0x0c10, 0x0c20, 0x0c30, 0x0c40, 0x0c50, + 0x0c61, 0x0c71, 0x0d00, 0x0d10, 0x0d20, 0x0d30, 0x0d40, 0x0d50, 0x0d60, 0x0d70, + 0x0d01, 0x0d11, 0x0e21, 0x0e31, 0x0e40, 0x0e50, 0x0e60, 0x0e70, 0x0e00, 0x0e10, + 0x0e20, 0x0e30, 0x0f40, 0x0f50, 0x0f60, 0x0f70, 0x0f01, 0x0f11, 0x0f21, 0x0f31, + 0x0f41, 0x0f51, 0x1060, 0x1070, 0x1100, 0x1110, 0x1120, 0x1130, 0x1140, 0x1150, + 0x1160, 0x1170, 0x1201, 0x1211, 0x1221, 0x1231, 0x1240, 0x1250, 0x1260, 0x1270, + 0x1200, 0x1210, 0x1220, 0x1230, 0x1340, 0x1350, 0x1360, 0x1370, 0x1301, 0x1311, + 0x1321, 0x1331, 0x1441, 0x1451, 0x1461, 0x1471, 0x1400, 0x1410, 0x1420, 0x1430, + 0x1440, 0x1450, 0x1460, 0x1470, 0x1600, 0x1610, 0x1620, 0x1630, 0x1640, 0x1650, + 0x1661, 0x1671, 0x1700, 0x1710, 0x1720, 0x1730, 0x1740, 0x1750, 0x1760, 0x1770, + 0x1701, 0x1711, 0x1821, 0x1831, 0x1840, 0x1850, 0x1860, 0x1870, 0x1800, 0x1810, + 0x1820, 0x1830, 0x1940, 0x1950, 0x1960, 0x1970, 0x1901, 0x1911, 0x1921, 0x1931, + 0x1941, 0x1951, 0x1a60, 0x1a70, 0x1b00, 0x1b10, 0x1b20, 0x1b30, 0x1b40, 0x1b50, + 0x1b60, 0x1b70, 0x1c01, 0x1c11, 0x1c21, 0x1c31, 0x1c40, 0x1c50, 0x1c60, 0x1c70, + 0x1c00, 0x1c10, 0x1c20, 0x1c30, 0x1d40, 0x1d50, 0x1d60, 0x1d70, 0x1d01, 0x1d11, + 0x1d21, 0x1d31, 0x1e41, 0x1e51, 0x1e61, 0x1e71, 0x1e00, 0x1e10, 0x1e20, 0x1e30, + 0x1e40, 0x1e50, 0x1e60, 0x1e70, 0x2000, 0x2010, 0x2020, 0x2030, 0x2040, 0x2050, + 0x2061, 0x2071, 0x2100, 0x2110, 0x2120, 0x2130, 0x2140, 0x2150, 0x2160, 0x2170, + 0x2101, 0x2111, 0x2221, 0x2231, 0x2240, 0x2250, 0x2260, 0x2270, 0x2200, 0x2210, + 0x2220, 0x2230, 0x2340, 0x2350, 0x2360, 0x2370, 0x2301, 0x2311, 0x2321, 0x2331, + 0x2341, 0x2351, 0x2460, 0x2470, 0x2500, 0x2510, 0x2520, 0x2530, 0x2540, 0x2550, + 0x2560, 0x2570, 0x2601, 0x2611, 0x2621, 0x2631, 0x2640, 0x2650, 0x2660, 0x2670, + 0x2600, 0x2610, 0x2620, 0x2630, 0x2740, 0x2750, 0x2760, 0x2770, 0x2701, 0x2711, + 0x2721, 0x2731, 0x2841, 0x2851, 0x2861, 0x2871, 0x2800, 0x2810, 0x2820, 0x2830, + 0x2840, 0x2850, 0x2860, 0x2870, 0x2a00, 0x2a10, 0x2a20, 0x2a30, 0x2a40, 0x2a50, + 0x2a61, 0x2a71, 0x2b00, 0x2b10, 0x2b20, 0x2b30, 0x2b40, 0x2b50, 0x2b60, 0x2b70, + 0x2b01, 0x2b11, 0x2c21, 0x2c31, 0x2c40, 0x2c50, 0x2c60, 0x2c70, 0x2c00, 0x2c10, + 0x2c20, 0x2c30, 0x2d40, 0x2d50, 0x2d60, 0x2d70, 0x2d01, 0x2d11, 0x2d21, 0x2d31, + 0x2d41, 0x2d51, 0x2e60, 0x2e70, 0x2f00, 0x2f10, 0x2f20, 0x2f30, 0x2f40, 0x2f50, + 0x2f60, 0x2f70, 0x3001, 0x3011, 0x3021, 0x3031, 0x3040, 0x3050, 0x3060, 0x3070, + 0x3000, 0x3010, 0x3020, 0x3030, 0x3140, 0x3150, 0x3160, 0x3170, 0x3101, 0x3111, + 0x3121, 0x3131, 0x3241, 0x3251, 0x3261, 0x3271, 0x3200, 0x3210, 0x3220, 0x3230, + 0x3240, 0x3250, 0x3260, 0x3270, 0x3400, 0x3410, 0x3420, 0x3430, 0x3440, 0x3450, + 0x3461, 0x3471, 0x3500, 0x3510, 0x3520, 0x3530, 0x3540, 0x3550, 0x3560, 0x3570, + 0x3501, 0x3511, 0x3621, 0x3631, 0x3640, 0x3650, 0x3660, 0x3670, 0x3600, 0x3610, + 0x3620, 0x3630, 0x3740, 0x3750, 0x3760, 0x3770, 0x3701, 0x3711, 0x3721, 0x3731, + 0x3741, 0x3751, 0x3860, 0x3870, 0x3900, 0x3910, 0x3920, 0x3930, 0x3940, 0x3950, + 0x3960, 0x3970, 0x3a01, 0x3a11, 0x3a21, 0x3a31, 0x3a40, 0x3a50, 0x3a60, 0x3a70, + 0x3a00, 0x3a10, 0x3a20, 0x3a30, 0x3b40, 0x3b50, 0x3b60, 0x3b70, 0x3b01, 0x3b11, + 0x3b21, 0x3b31, 0x3c41, 0x3c51, 0x3c61, 0x3c71, 0x3c00, 0x3c10, 0x3c20, 0x3c30, 0x3c40, 0x3c50, 0x3c60, 0x3c70, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; diff --git a/src/mame/nec/pc8801.cpp b/src/mame/nec/pc8801.cpp index 969f0ac99a4..04dbc246fa6 100644 --- a/src/mame/nec/pc8801.cpp +++ b/src/mame/nec/pc8801.cpp @@ -8,7 +8,7 @@ driver by Angelo Salese, original MESS PC-88SR driver by ??? TODO: - - cassette support; + - cassette support; - waitstates; - support for partial palette updates (pretty off in p8suite analog RGB test if enabled); - understand why i8214 needs a dis hack setter (depends on attached i8212?); diff --git a/src/mame/nichibutsu/terracre.cpp b/src/mame/nichibutsu/terracre.cpp index a17412cda2a..1eb123c4ee5 100644 --- a/src/mame/nichibutsu/terracre.cpp +++ b/src/mame/nichibutsu/terracre.cpp @@ -548,7 +548,7 @@ void terracre_state::ym2203(machine_config &config) // SSGC: 0.035000 * 0.23 = 0.00805 // Sum: 0.74081 // Multiply all 5 values by 1 / 0.74081 (i.e. 1.349873): - // ym: 0.236228; dac1: 0.21463; dac2: 0.472456, ssgA+B: 0.06582; ssg3: 0.010866) + // ym: 0.236228; dac1: 0.21463; dac2: 0.472456, ssgA+B: 0.06582; ssg3: 0.010866) FILTER_BIQUAD(config, m_ymfilter).opamp_sk_lowpass_setup(RES_K(4.7), RES_K(4.7), RES_M(999.99), RES_R(0.001), CAP_N(3.3), CAP_N(1.0)); // R10, R11, nothing(infinite resistance), wire(short), C11, C12 m_ymfilter->add_route(ALL_OUTPUTS, "speaker", 1.0); diff --git a/src/mame/olympia/portrait_v.cpp b/src/mame/olympia/portrait_v.cpp index 72f60971d9d..a5ae385866d 100644 --- a/src/mame/olympia/portrait_v.cpp +++ b/src/mame/olympia/portrait_v.cpp @@ -25,7 +25,7 @@ void portrait_state::fgvideo_write(offs_t offset, uint8_t data) // NB: undisplayed areas gets filled at POST but never really used // $8x36-$8x3f / $8x76-$8x7f / $8xb6-$8xbf / $8xf6-$8xff -// given that tilemap doesn't really cope well with live editing your best bet in debugging this is +// given that tilemap doesn't really cope well with live editing your best bet in debugging this is // potentially to subscribe these unused areas to a mark_all_dirty() fn. inline void portrait_state::get_tile_info( tile_data &tileinfo, int tile_index, const uint8_t *source ) { diff --git a/src/mame/quantel/dpb7000.cpp b/src/mame/quantel/dpb7000.cpp index d4c3fea0384..f388316f208 100644 --- a/src/mame/quantel/dpb7000.cpp +++ b/src/mame/quantel/dpb7000.cpp @@ -4,19 +4,19 @@ DPB-7001 (c) 1981 Quantel - Known issues/possible improvements: - - Disk Sequencer Card is currently implemented via HLE. - - Tablet is currently implemented via HLE. - - Blanking PAL is currently disabled, which results in on-screen - garbage when scrolling. - - Size Card and Filter Card functionality is not yet implemented. - - Video input functionality is not yet implemented. - - There are numerous Brush Processor Card functions that are not yet - implemented. - - To create a hard disk image compatible with the "330Mb Fujitsu" DIP - setting: - - chdman createhd -o [output name] -chs 1024,16,80 -ss 256 -c none + Known issues/possible improvements: + - Disk Sequencer Card is currently implemented via HLE. + - Tablet is currently implemented via HLE. + - Blanking PAL is currently disabled, which results in on-screen + garbage when scrolling. + - Size Card and Filter Card functionality is not yet implemented. + - Video input functionality is not yet implemented. + - There are numerous Brush Processor Card functions that are not yet + implemented. + + To create a hard disk image compatible with the "330Mb Fujitsu" DIP + setting: + - chdman createhd -o [output name] -chs 1024,16,80 -ss 256 -c none ***************************************************************************/ @@ -69,12 +69,12 @@ #define LOG_TDS (1 << 17) #define LOG_TABLET (1 << 18) #define LOG_COMMANDS (1 << 19) -#define LOG_HDD (1 << 20) -#define LOG_FDD (1 << 21) -#define LOG_DDB (1 << 22) -#define LOG_IRQ (1 << 23) -#define LOG_BRUSH_LATCH (1 << 24) -#define LOG_BRUSH_DRAWS (1 << 25) +#define LOG_HDD (1 << 20) +#define LOG_FDD (1 << 21) +#define LOG_DDB (1 << 22) +#define LOG_IRQ (1 << 23) +#define LOG_BRUSH_LATCH (1 << 24) +#define LOG_BRUSH_DRAWS (1 << 25) #define LOG_BRUSH_WRITES (1 << 26) #define LOG_STORE_READS (1 << 27) #define LOG_ALL (LOG_UNKNOWN | LOG_CSR | LOG_CTRLBUS | LOG_SYS_CTRL | LOG_BRUSH_ADDR | \ @@ -267,18 +267,18 @@ private: enum : uint16_t { - DGROUP_TYPE_INVALID0 = 0, - DGROUP_TYPE_80MB_CDC = 1, - DGROUP_TYPE_INVALID1 = 2, - DGROUP_TYPE_FLOPPY = 3, - DGROUP_TYPE_INVALID2 = 4, - DGROUP_TYPE_330MB_FUJITSU = 5, - DGROUP_TYPE_160MB_FUJITSU = 6, - DGROUP_TYPE_NONE = 7, - - DGROUP_0_SHIFT = 2, - DGROUP_1_SHIFT = 7, - DGROUP_2_SHIFT = 12 + DGROUP_TYPE_INVALID0 = 0, + DGROUP_TYPE_80MB_CDC = 1, + DGROUP_TYPE_INVALID1 = 2, + DGROUP_TYPE_FLOPPY = 3, + DGROUP_TYPE_INVALID2 = 4, + DGROUP_TYPE_330MB_FUJITSU = 5, + DGROUP_TYPE_160MB_FUJITSU = 6, + DGROUP_TYPE_NONE = 7, + + DGROUP_0_SHIFT = 2, + DGROUP_1_SHIFT = 7, + DGROUP_2_SHIFT = 12 }; // Computer Card @@ -1433,34 +1433,34 @@ bool dpb7000_state::handle_command(uint16_t data) LOGMASKED(LOG_COMMANDS, "Unsupported command: Fast Wipe Brush Store\n"); break; /*case 7: // Fast Wipe Framestore - for (int i = 0; i < 2; i++) - { - if (!BIT(data, 5 + i)) - { - m_bylen_counter = m_bylen; - for (uint16_t y = m_cypos[1]; m_bylen_counter != 0x1000; m_bylen_counter++, y = (y + 1) & 0xfff) - { - if (y >= 768) - continue; - - uint8_t *lum = &m_framestore_lum[i][y * 800]; - uint8_t *chr = &m_framestore_chr[i][y * 800]; - uint8_t *ext = &m_framestore_ext[i][y * 800]; - m_bxlen_counter = m_bxlen; - for (uint16_t x = m_cxpos[1]; m_bxlen_counter != 0x1000; m_bxlen_counter++, x = (x + 1) & 0xfff) - { - if (x >= 800) - continue; - - lum[x] = m_bs_y_latch; - chr[x] = (x & 1) ? m_bs_v_latch : m_bs_u_latch; - if (BIT(data, 9)) - ext[x] = m_bs_y_latch; - } - } - } - } - break;*/ + for (int i = 0; i < 2; i++) + { + if (!BIT(data, 5 + i)) + { + m_bylen_counter = m_bylen; + for (uint16_t y = m_cypos[1]; m_bylen_counter != 0x1000; m_bylen_counter++, y = (y + 1) & 0xfff) + { + if (y >= 768) + continue; + + uint8_t *lum = &m_framestore_lum[i][y * 800]; + uint8_t *chr = &m_framestore_chr[i][y * 800]; + uint8_t *ext = &m_framestore_ext[i][y * 800]; + m_bxlen_counter = m_bxlen; + for (uint16_t x = m_cxpos[1]; m_bxlen_counter != 0x1000; m_bxlen_counter++, x = (x + 1) & 0xfff) + { + if (x >= 800) + continue; + + lum[x] = m_bs_y_latch; + chr[x] = (x & 1) ? m_bs_v_latch : m_bs_u_latch; + if (BIT(data, 9)) + ext[x] = m_bs_y_latch; + } + } + } + } + break;*/ case 7: // Fast Wipe Framestore case 8: // Draw { @@ -2403,8 +2403,8 @@ TIMER_CALLBACK_MEMBER(dpb7000_state::req_a_w) } /*else { - m_sys_ctrl &= ~SYSCTRL_REQ_A_IN; - update_req_irqs(); + m_sys_ctrl &= ~SYSCTRL_REQ_A_IN; + update_req_irqs(); }*/ } @@ -3285,12 +3285,12 @@ void dpb7000_state::tds_p2_w(uint8_t data) /*INPUT_CHANGED_MEMBER(dpb7000_state::pen_prox_changed) { - m_tds_in_proximity = newval ? false : true; - if (m_tds_in_proximity) - { - LOGMASKED(LOG_TABLET, "Triggering IRQ due to proximity\n"); - m_tablet_cpu->set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE); - } + m_tds_in_proximity = newval ? false : true; + if (m_tds_in_proximity) + { + LOGMASKED(LOG_TABLET, "Triggering IRQ due to proximity\n"); + m_tablet_cpu->set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE); + } }*/ TIMER_CALLBACK_MEMBER(dpb7000_state::tablet_hle_tick) diff --git a/src/mame/seibu/banprestoms.cpp b/src/mame/seibu/banprestoms.cpp index bf5cb92e243..ad3e08aaade 100644 --- a/src/mame/seibu/banprestoms.cpp +++ b/src/mame/seibu/banprestoms.cpp @@ -258,7 +258,7 @@ void banprestoms_state::prg_map(address_map &map) map(0x0c0080, 0x0c0081).nopw(); // CRTC related ? map(0x0c00c0, 0x0c00c1).nopw(); // CRTC related ? map(0x0c0100, 0x0c0101).w(FUNC(banprestoms_state::okibank_w)); -// map(0x0c0140, 0x0c0141).nopw(); // in marioun bit 3 is lamp according to test mode +// map(0x0c0140, 0x0c0141).nopw(); // in marioun bit 3 is lamp according to test mode map(0x0e0000, 0x0e0001).portr("DSW1"); map(0x0e0002, 0x0e0003).portr("IN1"); map(0x0e0004, 0x0e0005).portr("IN2"); diff --git a/src/mame/skeleton/elcirculo.cpp b/src/mame/skeleton/elcirculo.cpp index ef7c32f7530..6876df515c8 100644 --- a/src/mame/skeleton/elcirculo.cpp +++ b/src/mame/skeleton/elcirculo.cpp @@ -13,7 +13,7 @@ | L21 (_) (_) LD26 | | _________ _________ _________ _________ _________ | | _ DM81LS95N DM81LS95N DM74LS04N DM74LS04N DM74LS04N _ | - | LD20 (_) (_) LD27 | + | LD20 (_) (_) LD27 | | _________ _________ _________ _________ _________ | | _ |_DIPSx8_| HM74C173N HM74C173N HM74C173N HM74C173N _ | | LD17 (_) (_) LD30 | @@ -43,7 +43,7 @@ LD15 (_) | _ _ | | LD07 (_) (_) LD06 (unused) | |_________________________________________________________________________________________________| - + LD = leds IL = light bulbs diff --git a/src/mame/trs/agvision.cpp b/src/mame/trs/agvision.cpp index b3ef29ee63c..fdd0899299d 100644 --- a/src/mame/trs/agvision.cpp +++ b/src/mame/trs/agvision.cpp @@ -2,40 +2,40 @@ // copyright-holders: tim lindner /*************************************************************************** - Elanco AgVision and Radio Shack VideoTex terminals - - Dynamic RAM (16 or 4k) starts at $0000. - ROM (2K) starts at $A000 and mirrors up to $BFFF - Static RAM starts at $C000 for 128 bytes - The PIA data port a is at $FF1C - control port a is at $FF1D - data port b is at $FF1E - control port b is at $FF1F - - The Control Register (flip flop) is at $FF20 - The SAM starts at $FFC0 - - PIA: - Port A and B make up the keyboard matrix - PA7 - RS-232 receive. - CA1 - The horizontal sync from the VDG. - CA2 - Unconnected, not verified. - CB1 - Modem status, carrier detect. - CB2 - Modem control (unverified). - IRQA - Connected to the 6809 FIRQ. - IRQB - Unconnected, not verified. - - Control Register: - Bit 7 - RS-232 transmit. - Bit 6 - RS-232 DTR, or activity LED (unsure which). - Bit 5 - unconnected (not verified). - Bit 3 - VDG GM0. - Bit 2 - VDG GM1. - Bit 1 - VDG GM2. - Bit 0 - VDG A* / G. - - Reverse engineering used with permission of George Phillips of the - trs80gp emulator. + Elanco AgVision and Radio Shack VideoTex terminals + + Dynamic RAM (16 or 4k) starts at $0000. + ROM (2K) starts at $A000 and mirrors up to $BFFF + Static RAM starts at $C000 for 128 bytes + The PIA data port a is at $FF1C + control port a is at $FF1D + data port b is at $FF1E + control port b is at $FF1F + + The Control Register (flip flop) is at $FF20 + The SAM starts at $FFC0 + + PIA: + Port A and B make up the keyboard matrix + PA7 - RS-232 receive. + CA1 - The horizontal sync from the VDG. + CA2 - Unconnected, not verified. + CB1 - Modem status, carrier detect. + CB2 - Modem control (unverified). + IRQA - Connected to the 6809 FIRQ. + IRQB - Unconnected, not verified. + + Control Register: + Bit 7 - RS-232 transmit. + Bit 6 - RS-232 DTR, or activity LED (unsure which). + Bit 5 - unconnected (not verified). + Bit 3 - VDG GM0. + Bit 2 - VDG GM1. + Bit 1 - VDG GM2. + Bit 0 - VDG A* / G. + + Reverse engineering used with permission of George Phillips of the + trs80gp emulator. ***************************************************************************/ @@ -219,11 +219,11 @@ void agvision_state::agvision(machine_config &config) // memory controller SAM6883(config, m_sam, XTAL(14'318'181), m_maincpu); - m_sam->set_addrmap(2, &agvision_state::rom_map); // ROM at $A000 - m_sam->set_addrmap(3, &agvision_state::static_ram_map); // RAM at $C000 - m_sam->set_addrmap(4, &agvision_state::io0_map); // IO at $FF00 - m_sam->set_addrmap(5, &agvision_state::io1_map); // IO at $FF20 - m_sam->set_addrmap(7, &agvision_state::boot_map); // IO at $FF60 + m_sam->set_addrmap(2, &agvision_state::rom_map); // ROM at $A000 + m_sam->set_addrmap(3, &agvision_state::static_ram_map); // RAM at $C000 + m_sam->set_addrmap(4, &agvision_state::io0_map); // IO at $FF00 + m_sam->set_addrmap(5, &agvision_state::io1_map); // IO at $FF20 + m_sam->set_addrmap(7, &agvision_state::boot_map); // IO at $FF60 RS232_PORT(config, m_rs232, default_rs232_devices, "null_modem"); m_rs232->set_option_device_input_defaults("null_modem", DEVICE_INPUT_DEFAULTS_NAME(ag_modem)); diff --git a/src/mame/yamaha/ymdx9.cpp b/src/mame/yamaha/ymdx9.cpp index b13dd3b9448..676501cd833 100644 --- a/src/mame/yamaha/ymdx9.cpp +++ b/src/mame/yamaha/ymdx9.cpp @@ -59,7 +59,7 @@ private: /** * @brief Which input line on the keyboard/switch scan driver is currently selected. - * This driver is used to read the analog switch values from the synth's keyboard, and + * This driver is used to read the analog switch values from the synth's keyboard, and * front-panel switches. * TODO: I'm currently not sure of the actual implementation of this circuit. This * implementation is based off the *very* limited description in the service manual, and @@ -102,13 +102,13 @@ private: /** * @brief Handles a read from the keyboard/switch scan driver. * This multiplexing driver circuit is used to read the states of the synth's front-panel - * switches, and keyboard. The driver's input is wired to the CPU's IO port 1, and the + * switches, and keyboard. The driver's input is wired to the CPU's IO port 1, and the * output is wired into the address map. * Input line 0 covers the 'main' front-panel switches. * Input line 1 covers the numeric front-panel switches 1 through 8. * Input line 2 covers the numeric front-panel switches 9 though 16. * Input line 3 covers the numeric front-panel switches 17 though 20, as well as the - * modulation pedal inputs: The Portamento, and Sustain pedals are mapped to + * modulation pedal inputs: The Portamento, and Sustain pedals are mapped to * bits 6, and 7 respectively. * Note: Input lines 4-15 are used to map the keyboard, which is not implemented here. * When the keyboard state is read, the default value of 0 will be returned. @@ -378,8 +378,8 @@ static INPUT_PORTS_START(dx9) // These IO ports belong to the keyboard scan circuit. // Each of these 12 ports represents an individual key within an octave. - // The keyboard is wired so that when each key's line is selected, reading the keyboard - // scan driver output will return a power of two indicating the octave the pressed key + // The keyboard is wired so that when each key's line is selected, reading the keyboard + // scan driver output will return a power of two indicating the octave the pressed key // is in, from 0 to 7. PORT_START("KEY_SWITCH_INPUT.4") PORT_START("KEY_SWITCH_INPUT.5") -- cgit v1.2.3