From 25c64006b7ca4bbb0d575b46c6c5c4f214dac7ed Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 24 Apr 2022 14:14:49 +1000 Subject: srcclean in preparation for 0.243 --- hash/apple2_flop_orig.xml | 8 ++-- hash/pc8801_cdrom.xml | 2 +- hash/pc8801_flop.xml | 28 ++++++------ hash/pcecd.xml | 6 +-- src/devices/bus/nes/nes_ines.hxx | 2 +- src/devices/bus/nes/taito.cpp | 8 ++-- src/devices/bus/pc8801/jmbx1.cpp | 10 ++--- src/devices/bus/pc8801/pc8801_23.cpp | 20 ++++----- src/devices/bus/pc8801/pc8801_23.h | 4 +- src/devices/bus/pc8801/pc8801_exp.cpp | 74 +++++++++++++++--------------- src/devices/bus/pc8801/pc8801_exp.h | 10 ++--- src/devices/bus/pc8801/pcg8100.cpp | 16 +++---- src/devices/cpu/8x300/8x300.cpp | 4 +- src/devices/cpu/8x300/8x300.h | 4 +- src/devices/cpu/cr16c/cr16cdasm.cpp | 2 +- src/devices/cpu/i386/i386segs.hxx | 2 +- src/devices/cpu/mips/mips3drc.cpp | 4 +- src/devices/imagedev/floppy.cpp | 2 +- src/devices/machine/acorn_vidc.cpp | 4 +- src/devices/machine/arm_iomd.cpp | 4 +- src/devices/machine/tms9901.cpp | 2 +- src/frontend/mame/ui/filecreate.h | 4 +- src/frontend/mame/ui/ui.h | 2 +- src/lib/formats/ap2_dsk.cpp | 2 +- src/lib/formats/fs_coco_os9.cpp | 70 ++++++++++++++--------------- src/lib/formats/fsmeta.cpp | 8 ++-- src/lib/util/cdrom.cpp | 28 ++++++------ src/lib/util/cdrom.h | 10 ++--- src/lib/util/corefile.cpp | 2 +- src/mame/drivers/4enlinea.cpp | 2 +- src/mame/drivers/apple2gs.cpp | 2 +- src/mame/drivers/cosmos_playc8f.cpp | 4 +- src/mame/drivers/cps1.cpp | 4 +- src/mame/drivers/fruitpc.cpp | 2 +- src/mame/drivers/gamecstl.cpp | 4 +- src/mame/drivers/gammagic.cpp | 2 +- src/mame/drivers/goldnpkr.cpp | 24 +++++----- src/mame/drivers/krz2000.cpp | 26 +++++------ src/mame/drivers/lependu.cpp | 4 +- src/mame/drivers/metro.cpp | 12 ++--- src/mame/drivers/paokaipc.cpp | 36 +++++++-------- src/mame/drivers/rainbow.cpp | 2 +- src/mame/drivers/rastersp.cpp | 66 +++++++++++++-------------- src/mame/drivers/s11c.cpp | 2 +- src/mame/drivers/savquest.cpp | 4 +- src/mame/drivers/taitowlf.cpp | 2 +- src/mame/drivers/twinkle.cpp | 84 +++++++++++++++++------------------ src/mame/includes/pc8801.h | 2 +- src/mame/layout/lependu.lay | 8 ++-- src/mame/layout/lespendu.lay | 16 +++---- src/mame/machine/abc1600mac.cpp | 10 ++--- src/mame/machine/pc80s31k.cpp | 4 +- src/mame/video/m92.cpp | 20 ++++----- src/mame/video/vigilant.cpp | 2 +- 54 files changed, 343 insertions(+), 343 deletions(-) diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index 2302ec66eb0..cb20337469a 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -3628,9 +3628,9 @@ license:CC0 - + @@ -21836,7 +21836,7 @@ license:CC0 - + diff --git a/hash/pc8801_cdrom.xml b/hash/pc8801_cdrom.xml index ccae35f1e1c..17134537b2d 100644 --- a/hash/pc8801_cdrom.xml +++ b/hash/pc8801_cdrom.xml @@ -5,7 +5,7 @@ license:CC0 --> - - + @@ -54787,13 +54787,13 @@ ExtractDisk [02]"DISK_B " -> "game music library_02.d88" 88Gamez1 @@ -54809,12 +54809,12 @@ ExtractDisk [02]"DISK_B " -> "game music library_02.d88" 88Gamez2 diff --git a/hash/pcecd.xml b/hash/pcecd.xml index b53af00f83e..652dc58431c 100644 --- a/hash/pcecd.xml +++ b/hash/pcecd.xml @@ -31,9 +31,9 @@ license:CC0 various PC software and/or emulators handle them? There are multiple second audio offset issues with several games in MESS/MAME which could be related. - TODO: - - Fix sharedfeat for Arcade Card (ACD) games, once that we split implementation from scdsys; - - What [Imperfect] means in some sets? Is it an alias for baddump? + TODO: + - Fix sharedfeat for Arcade Card (ACD) games, once that we split implementation from scdsys; + - What [Imperfect] means in some sets? Is it an alias for baddump? --> diff --git a/src/devices/bus/nes/nes_ines.hxx b/src/devices/bus/nes/nes_ines.hxx index 87374379cd2..fc08abcffef 100644 --- a/src/devices/bus/nes/nes_ines.hxx +++ b/src/devices/bus/nes/nes_ines.hxx @@ -477,7 +477,7 @@ static const nes_mmc mmc_list[] = // 439 YS2309 multicart // 440 Dongda Sonic REC-9388 educational computer // 441 841026C and 850335C multicarts - // 442 "Golden Key" educational computer + // 442 "Golden Key" educational computer // 443 NC3000M multicart // 444 NC7000M multicart // 445 DG574B MMC3-compatible multicart diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index db6458aaa7a..4a620a09283 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -428,8 +428,8 @@ void nes_x1_017_device::write_m(offs_t offset, u8 data) // 2+2+1 KB of Internal RAM can be independently enabled/disabled! if ((offset < 0x0800 && m_reg[0] == 0xca) || - (offset < 0x1000 && m_reg[1] == 0x69) || - (offset < 0x1400 && m_reg[2] == 0x84)) + (offset < 0x1000 && m_reg[1] == 0x69) || + (offset < 0x1400 && m_reg[2] == 0x84)) { m_x1_017_ram[offset] = data; @@ -444,8 +444,8 @@ u8 nes_x1_017_device::read_m(offs_t offset) // 2+2+1 KB of Internal RAM can be independently enabled/disabled! if ((offset < 0x0800 && m_reg[0] == 0xca) || - (offset < 0x1000 && m_reg[1] == 0x69) || - (offset < 0x1400 && m_reg[2] == 0x84)) + (offset < 0x1000 && m_reg[1] == 0x69) || + (offset < 0x1400 && m_reg[2] == 0x84)) { u8 ret = m_x1_017_ram[offset]; diff --git a/src/devices/bus/pc8801/jmbx1.cpp b/src/devices/bus/pc8801/jmbx1.cpp index 12f330bd6e6..33a48019a20 100644 --- a/src/devices/bus/pc8801/jmbx1.cpp +++ b/src/devices/bus/pc8801/jmbx1.cpp @@ -7,9 +7,9 @@ Used for PC-8001mkII/PC-8801 NRTDRV sound program http://upd780c1.g1.xrea.com/pc-8001/j80-25.html - TODO: - - Source claims it runs on INT3, but the vector that uses NRTDRV is clearly INT4. - Is it configurable? + TODO: + - Source claims it runs on INT3, but the vector that uses NRTDRV is clearly INT4. + Is it configurable? **************************************************************************************************/ @@ -19,8 +19,8 @@ DEFINE_DEVICE_TYPE(JMBX1, jmbx1_device, "jmbx1", "JMB-X1 \"Sound Board X\"") -jmbx1_device::jmbx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : pc8801_exp_device(mconfig, JMBX1, tag, owner, clock) +jmbx1_device::jmbx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : pc8801_exp_device(mconfig, JMBX1, tag, owner, clock) , m_opm1(*this, "opm1") , m_opm2(*this, "opm2") , m_ssg(*this, "ssg") diff --git a/src/devices/bus/pc8801/pc8801_23.cpp b/src/devices/bus/pc8801/pc8801_23.cpp index 32fc87610e7..f0b11773d2c 100644 --- a/src/devices/bus/pc8801/pc8801_23.cpp +++ b/src/devices/bus/pc8801/pc8801_23.cpp @@ -2,13 +2,13 @@ // copyright-holders:Angelo Salese /************************************************************************************************** - NEC PC-8801-23 / -24 / -25 "Sound Board II" + NEC PC-8801-23 / -24 / -25 "Sound Board II" - TODO: - - Irq hangs if there's a PC-8801 OPN/OPNA declared in driver. + TODO: + - Irq hangs if there's a PC-8801 OPN/OPNA declared in driver. Master OPNA keeps sending acks in the correlated INT4 handler that hampers irq - signals from here; - - Confirm there's no DB9 joyport on any variants of this; + signals from here; + - Confirm there's no DB9 joyport on any variants of this; **************************************************************************************************/ @@ -17,8 +17,8 @@ DEFINE_DEVICE_TYPE(PC8801_23, pc8801_23_device, "pc8801_23", "NEC PC-8801-23 \"Sound Board II\"") -pc8801_23_device::pc8801_23_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : pc8801_exp_device(mconfig, PC8801_23, tag, owner, clock) +pc8801_23_device::pc8801_23_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : pc8801_exp_device(mconfig, PC8801_23, tag, owner, clock) , m_opna(*this, "opna") { } @@ -47,8 +47,8 @@ void pc8801_23_device::device_add_mconfig(machine_config &config) YM2608(config, m_opna, sound_clock); m_opna->set_addrmap(0, &pc8801_23_device::opna_map); m_opna->irq_handler().set(FUNC(pc8801_23_device::int4_w)); -// m_opna->port_a_read_callback().set(FUNC(pc8801_23_device::opn_porta_r)); -// m_opna->port_b_read_callback().set_ioport("OPN_PB"); +// m_opna->port_a_read_callback().set(FUNC(pc8801_23_device::opn_porta_r)); +// m_opna->port_b_read_callback().set_ioport("OPN_PB"); // TODO: per-channel mixing is unconfirmed m_opna->add_route(0, "^^lspeaker", 0.25); m_opna->add_route(0, "^^rspeaker", 0.25); @@ -76,7 +76,7 @@ u8 pc8801_23_device::irq_status_r() void pc8801_23_device::irq_mask_w(u8 data) { m_irq_mask = bool(BIT(data, 7)); - + if (!m_irq_mask && m_irq_pending) int4_w(m_irq_pending); } diff --git a/src/devices/bus/pc8801/pc8801_23.h b/src/devices/bus/pc8801/pc8801_23.h index efed51e3f04..b112274c7d0 100644 --- a/src/devices/bus/pc8801/pc8801_23.h +++ b/src/devices/bus/pc8801/pc8801_23.h @@ -27,13 +27,13 @@ private: virtual void device_add_mconfig(machine_config &config) override; required_device m_opna; - + u8 irq_status_r(); void irq_mask_w(u8 data); bool m_irq_mask = false; bool m_irq_pending = false; - + void opna_map(address_map &map); }; diff --git a/src/devices/bus/pc8801/pc8801_exp.cpp b/src/devices/bus/pc8801/pc8801_exp.cpp index dd277bd3421..d99a6d252ff 100644 --- a/src/devices/bus/pc8801/pc8801_exp.cpp +++ b/src/devices/bus/pc8801/pc8801_exp.cpp @@ -4,41 +4,41 @@ PC-8801 EXPansion bus - List of known cards: - \- NEC PC-8801-10 - (MIDI interface); - \- NEC PC-8801-11 - ("Sound Board", single YM2203C OPN, single joy port, mono out); - \- NEC PC-8801-12 - (Modem board, full duplex 300bps); - \- NEC PC-8801-13 - (Parallel I/F board); - \- NEC PC-8801-17 / -18 - (VTR capture card "Video art board" / "Video digitizing unit", 16-bit color); - \- NEC PC-8801-21 - (CMT i/f board); - \- NEC PC-8801-22 - ("Multi board B", upgrades a FH to MH and FA to MA (?)); - \- NEC PC-8801-23 & -24 & -25 - ("Sound Board 2", single YM2608 OPNA, single joy port, stereo out. - -24 is the internal FH / MH version, -25 is the internal FE / FE2 with YM2608B. - Standard and on main board instead for FA / MA and onward); - \- NEC PC-8801-30 & -31 - (-31 is CD-ROM SCSI i/f, -30 is virtually same to PC Engine CD-ROM² drive) - \- NEC PC-8864 - (Network board mapping at $a0-$a3) - \- HAL PCG-8100 - (PCG and 3x DAC_1BIT at I/O $01, $02. PIT at $0c-$0f) - \- HAL GSX-8800 - (2x PSG at I/O $a0-$a3, mono out. Has goofy extra connector on top and a couple jumpers, - guess it may cascade with another board for 2x extra PSGs at $a4-$a7); - \- HIBIKI-8800 - (YM2151 OPM + YM3802-X MIDI controller, stereo out, has own internal XTAL @ 4MHz. - Has an undumped PAL/PROM labeled "HAL-881"); - \- HAL HMB-20 - (same as HIBIKI-8800 board?) - \- JMB-X1 - ("Sound Board X", 2x OPM + 1x SSG. Used by NRTDRV, more info at GH #8709); + List of known cards: + \- NEC PC-8801-10 + (MIDI interface); + \- NEC PC-8801-11 + ("Sound Board", single YM2203C OPN, single joy port, mono out); + \- NEC PC-8801-12 + (Modem board, full duplex 300bps); + \- NEC PC-8801-13 + (Parallel I/F board); + \- NEC PC-8801-17 / -18 + (VTR capture card "Video art board" / "Video digitizing unit", 16-bit color); + \- NEC PC-8801-21 + (CMT i/f board); + \- NEC PC-8801-22 + ("Multi board B", upgrades a FH to MH and FA to MA (?)); + \- NEC PC-8801-23 & -24 & -25 + ("Sound Board 2", single YM2608 OPNA, single joy port, stereo out. + -24 is the internal FH / MH version, -25 is the internal FE / FE2 with YM2608B. + Standard and on main board instead for FA / MA and onward); + \- NEC PC-8801-30 & -31 + (-31 is CD-ROM SCSI i/f, -30 is virtually same to PC Engine CD-ROM² drive) + \- NEC PC-8864 + (Network board mapping at $a0-$a3) + \- HAL PCG-8100 + (PCG and 3x DAC_1BIT at I/O $01, $02. PIT at $0c-$0f) + \- HAL GSX-8800 + (2x PSG at I/O $a0-$a3, mono out. Has goofy extra connector on top and a couple jumpers, + guess it may cascade with another board for 2x extra PSGs at $a4-$a7); + \- HIBIKI-8800 + (YM2151 OPM + YM3802-X MIDI controller, stereo out, has own internal XTAL @ 4MHz. + Has an undumped PAL/PROM labeled "HAL-881"); + \- HAL HMB-20 + (same as HIBIKI-8800 board?) + \- JMB-X1 + ("Sound Board X", 2x OPM + 1x SSG. Used by NRTDRV, more info at GH #8709); **************************************************************************************************/ @@ -100,14 +100,14 @@ WRITE_LINE_MEMBER( device_pc8801_exp_interface::int4_w ) { m_slot->m_int4_cb(sta WRITE_LINE_MEMBER( device_pc8801_exp_interface::int5_w ) { m_slot->m_int5_cb(state); } pc8801_exp_device::pc8801_exp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, type, tag, owner, clock) + : device_t(mconfig, type, tag, owner, clock) , device_pc8801_exp_interface(mconfig, *this) { } void pc8801_exp_device::device_start() { - + } diff --git a/src/devices/bus/pc8801/pc8801_exp.h b/src/devices/bus/pc8801/pc8801_exp.h index a03f832f4ba..f3f540a1c9b 100644 --- a/src/devices/bus/pc8801/pc8801_exp.h +++ b/src/devices/bus/pc8801/pc8801_exp.h @@ -32,7 +32,7 @@ public: { m_iospace->install_device(0x00, 0xff, device, map); } - + auto int3_callback() { return m_int3_cb.bind(); } auto int4_callback() { return m_int4_cb.bind(); } auto int5_callback() { return m_int5_cb.bind(); } @@ -45,8 +45,8 @@ protected: private: required_address_space m_iospace; -// device_pc8801_exp_interface *m_exp; - +// device_pc8801_exp_interface *m_exp; + devcb_write_line m_int3_cb; devcb_write_line m_int4_cb; devcb_write_line m_int5_cb; @@ -67,7 +67,7 @@ protected: virtual void interface_post_start() override; pc8801_exp_slot_device *m_slot; - + DECLARE_WRITE_LINE_MEMBER( int3_w ); virtual DECLARE_WRITE_LINE_MEMBER( int4_w ); DECLARE_WRITE_LINE_MEMBER( int5_w ); @@ -81,7 +81,7 @@ public: protected: -// virtual void device_add_mconfig(machine_config &config) override; +// virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; diff --git a/src/devices/bus/pc8801/pcg8100.cpp b/src/devices/bus/pc8801/pcg8100.cpp index f57c614dee2..c2bf07c7f73 100644 --- a/src/devices/bus/pc8801/pcg8100.cpp +++ b/src/devices/bus/pc8801/pcg8100.cpp @@ -2,10 +2,10 @@ // copyright-holders:Angelo Salese /************************************************************************************************** - HAL PCG-8100 + HAL PCG-8100 - Used on a bunch of PC-8001 games, adds a Programmable Character Generator overlay, - a write-only 8253 with channels tied to three DAC1BIT + Used on a bunch of PC-8001 games, adds a Programmable Character Generator overlay, + a write-only 8253 with channels tied to three DAC1BIT **************************************************************************************************/ @@ -15,8 +15,8 @@ DEFINE_DEVICE_TYPE(PCG8100, pcg8100_device, "pcg8100", "HAL Laboratory PCG-8100") -pcg8100_device::pcg8100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : pc8801_exp_device(mconfig, PCG8100, tag, owner, clock) +pcg8100_device::pcg8100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : pc8801_exp_device(mconfig, PCG8100, tag, owner, clock) , m_pit(*this, "pit") , m_dac1bit(*this, "dac1bit%u", 0L) , m_cg_rom(*this, "^^cgrom") @@ -60,7 +60,7 @@ void pcg8100_device::device_start() // Save a local copy of the original data here, card can eventually restore data at later time. for (int i = 0x000; i < 0x400; i++) m_original_rom[i] = m_cg_rom[i | 0x400]; - + save_item(NAME(m_original_rom)); } @@ -73,7 +73,7 @@ void pcg8100_device::device_reset() for (i = 0x000; i < 0x400; i++) m_cg_rom[i | 0x400] = m_original_rom[i]; - + for (i = 0; i < 3; i++) audio_channel(i, false); } @@ -102,7 +102,7 @@ void pcg8100_device::pcg_latch_w(u8 data) } m_pcg_address = (m_pcg_address & 0xff) | ((data & 0x3) << 8); m_pcg_latch = data; - + audio_channel(0, bool(BIT(data, 3))); audio_channel(1, bool(BIT(data, 6))); audio_channel(2, bool(BIT(data, 7))); diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp index c304999cfe4..cd6efcb1b3c 100644 --- a/src/devices/cpu/8x300/8x300.cpp +++ b/src/devices/cpu/8x300/8x300.cpp @@ -189,7 +189,7 @@ void n8x300_cpu_device::device_resolve_objects() m_sc_callback.resolve_safe(); m_wc_callback.resolve_safe(); m_lb_callback.resolve_safe(); - m_rb_callback.resolve_safe(); + m_rb_callback.resolve_safe(); m_mclk_callback.resolve_safe(); m_iv_callback.resolve_safe(); } @@ -631,7 +631,7 @@ void n8x300_cpu_device::execute_run() { xmit_lb(dst, mask, with_sc, with_wc); } - + } break; case 0x07: // JMP diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h index 86db8854478..e4f2a2a3dda 100644 --- a/src/devices/cpu/8x300/8x300.h +++ b/src/devices/cpu/8x300/8x300.h @@ -90,8 +90,8 @@ protected: memory_access<13, 1, -1, ENDIANNESS_BIG>::specific m_program; memory_access< 9, 0, 0, ENDIANNESS_BIG>::specific m_io; - devcb_write_line m_sc_callback; // address latch - devcb_write_line m_wc_callback; // data latch + devcb_write_line m_sc_callback; // address latch + devcb_write_line m_wc_callback; // data latch devcb_write_line m_lb_callback; devcb_write_line m_rb_callback; devcb_write_line m_mclk_callback; diff --git a/src/devices/cpu/cr16c/cr16cdasm.cpp b/src/devices/cpu/cr16c/cr16cdasm.cpp index 1d6521a2568..113f5314113 100644 --- a/src/devices/cpu/cr16c/cr16cdasm.cpp +++ b/src/devices/cpu/cr16c/cr16cdasm.cpp @@ -421,7 +421,7 @@ offs_t cr16c_disassembler::disassemble(std::ostream &stream, offs_t pc, const cr stream << "br "; format_pc_disp24(stream, pc, u32(op2 & 0x000f) << 20 | u32(op2 & 0x0f00) << 8 | op3); return 6 | SUPPORTED; - } + } else { util::stream_format(stream, "b%s ", s_cc[(opcode & 0x00f0) >> 4]); diff --git a/src/devices/cpu/i386/i386segs.hxx b/src/devices/cpu/i386/i386segs.hxx index 5bc3e0c903d..951b25cd66a 100644 --- a/src/devices/cpu/i386/i386segs.hxx +++ b/src/devices/cpu/i386/i386segs.hxx @@ -2479,7 +2479,7 @@ void i386_device::i386_protected_mode_iret(int operand32) inline void i386_device::dri_changed() { int dr; - + if(m_dri_changed_active) return; m_dri_changed_active = true; diff --git a/src/devices/cpu/mips/mips3drc.cpp b/src/devices/cpu/mips/mips3drc.cpp index c92461799fa..8d2c1be7294 100644 --- a/src/devices/cpu/mips/mips3drc.cpp +++ b/src/devices/cpu/mips/mips3drc.cpp @@ -35,7 +35,7 @@ /* Use with STRICT_VERIFY to print debug info to console for extra validation checks */ /* Set to 1 to activate and use MIPS3DRC_STRICT_VERIFY in the drc options */ -#define DEBUG_STRICT_VERIFY 0 +#define DEBUG_STRICT_VERIFY 0 /*************************************************************************** @@ -161,7 +161,7 @@ void mips3_device::mips3drc_set_options(uint32_t options) } /*------------------------------------------------- - mips3drc_get_options - return current DRC options + mips3drc_get_options - return current DRC options -------------------------------------------------*/ uint32_t mips3_device::mips3drc_get_options() diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index ce871860ad8..c1782e3c021 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -1384,7 +1384,7 @@ void floppy_image_device::wspan_write(const std::vector &wspans, std::vec track[si] = floppy_image::MG_E | (ws.start-1); si ++; } - } + } // Check for a neutral zone at the end and reduce it if needed if(ei != track.size() && (track[ei] & floppy_image::MG_MASK) == floppy_image::MG_E) { diff --git a/src/devices/machine/acorn_vidc.cpp b/src/devices/machine/acorn_vidc.cpp index f055d11b886..cf739af4360 100644 --- a/src/devices/machine/acorn_vidc.cpp +++ b/src/devices/machine/acorn_vidc.cpp @@ -13,8 +13,8 @@ * lotustc2: abuses color flipping; * quazer: needs in-flight DMA; - move DAC handling into a separate sub-device(s), - particularly needed for proper VIDC20 mixing and likely for fixing aliasing - issues in VIDC10; + particularly needed for proper VIDC20 mixing and likely for fixing aliasing + issues in VIDC10; - complete VIDC20 emulation (RiscPC/ssfindo.cpp); - Are CRTC values correct? VGA modes have a +1 in display line; diff --git a/src/devices/machine/arm_iomd.cpp b/src/devices/machine/arm_iomd.cpp index 2880c46e714..0fc1c9ad174 100644 --- a/src/devices/machine/arm_iomd.cpp +++ b/src/devices/machine/arm_iomd.cpp @@ -593,8 +593,8 @@ void arm_iomd_device::sdcr_w(u32 data) // TODO: sound DMA reset // eats samples in ppcar -// if (BIT(data, 7)) -// m_sndbuffer_ok[0] = m_sndbuffer_ok[1] = false; +// if (BIT(data, 7)) +// m_sndbuffer_ok[0] = m_sndbuffer_ok[1] = false; } u32 arm_iomd_device::sdst_r() diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp index 518d2281fb2..e09d546cc4c 100644 --- a/src/devices/machine/tms9901.cpp +++ b/src/devices/machine/tms9901.cpp @@ -112,7 +112,7 @@ Clock mode: counts down by 1 every 64 clock ticks. On every update, the value is copied into the read register, but only in interrupt mode. In clock mode, the read register is locked so that it can be read without being changed. - Whenever the counter reaches 0, it is reloaded from the clock register on + Whenever the counter reaches 0, it is reloaded from the clock register on the next update. Setting the clock register is possible via CRU addresses 1 to 14 in clock mode, with bit 1 being the LSB and bit 14 being the MSB. On each bit write diff --git a/src/frontend/mame/ui/filecreate.h b/src/frontend/mame/ui/filecreate.h index bf8d7accbf6..9d47605f5a7 100644 --- a/src/frontend/mame/ui/filecreate.h +++ b/src/frontend/mame/ui/filecreate.h @@ -94,8 +94,8 @@ private: virtual void handle(event const *ev) override; // internal state - std::vector> m_fs; - int * m_result; + std::vector> m_fs; + int * m_result; }; diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h index 464f710dbea..cec1ed67cfe 100644 --- a/src/frontend/mame/ui/ui.h +++ b/src/frontend/mame/ui/ui.h @@ -250,7 +250,7 @@ private: float m_target_font_height; bool m_has_warnings; bool m_unthrottle_mute; - bool m_image_display_enabled; + bool m_image_display_enabled; std::unique_ptr m_machine_info; device_feature_set m_unemulated_features; diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp index 9e37476b6e4..46e193750cc 100644 --- a/src/lib/formats/ap2_dsk.cpp +++ b/src/lib/formats/ap2_dsk.cpp @@ -607,7 +607,7 @@ int a2_16sect_format::identify(util::random_read &io, uint32_t form_factor, cons static const unsigned char a3a2emul_block1[6] = { 0x8d, 0xd0, 0x03, 0x4c, 0xc7, 0xa4 }; static const unsigned char cpm22_block1[8] = { 0xa2, 0x55, 0xa9, 0x00, 0x9d, 0x00, 0x0d, 0xca }; static const unsigned char subnod_block1[8] = { 0x63, 0xaa, 0xf0, 0x76, 0x8d, 0x63, 0xaa, 0x8e }; - + size_t actual; io.read_at(0, sector_data, 256*2, actual); diff --git a/src/lib/formats/fs_coco_os9.cpp b/src/lib/formats/fs_coco_os9.cpp index 8d5f3ee0f4e..3813255482c 100644 --- a/src/lib/formats/fs_coco_os9.cpp +++ b/src/lib/formats/fs_coco_os9.cpp @@ -377,11 +377,11 @@ util::arbitrary_datetime from_os9_date(u32 os9_date, u16 os9_time) { util::arbitrary_datetime dt; memset(&dt, 0, sizeof(dt)); - dt.year = ((os9_date >> 16) & 0xFF) + 1900; - dt.month = (os9_date >> 8) & 0xFF; - dt.day_of_month = (os9_date >> 0) & 0xFF; - dt.hour = (os9_time >> 8) & 0xFF; - dt.minute = (os9_time >> 0) & 0xFF; + dt.year = ((os9_date >> 16) & 0xFF) + 1900; + dt.month = (os9_date >> 8) & 0xFF; + dt.day_of_month = (os9_date >> 0) & 0xFF; + dt.hour = (os9_time >> 8) & 0xFF; + dt.minute = (os9_time >> 0) & 0xFF; return dt; } @@ -561,15 +561,15 @@ void impl::format(const meta_data &meta) m_blockdev.fill(0xE5); // identify geometry info - u8 sectors = 18; // TODO - we need a definitive technique to get the floppy geometry - u8 heads = 1; // TODO - we need a definitive technique to get the floppy geometry - u16 sector_bytes = 256; // TODO - we need a definitive technique to get the floppy geometry - bool is_double_density = true; // TODO - we need a definitive technique to get the floppy geometry + u8 sectors = 18; // TODO - we need a definitive technique to get the floppy geometry + u8 heads = 1; // TODO - we need a definitive technique to get the floppy geometry + u16 sector_bytes = 256; // TODO - we need a definitive technique to get the floppy geometry + bool is_double_density = true; // TODO - we need a definitive technique to get the floppy geometry u32 tracks = m_blockdev.block_count() / sectors / heads; // get attributes from metadata - std::string volume_title = meta.get_string(meta_name::name, "UNTITLED"); - util::arbitrary_datetime creation_datetime = meta.get_date(meta_name::creation_date); + std::string volume_title = meta.get_string(meta_name::name, "UNTITLED"); + util::arbitrary_datetime creation_datetime = meta.get_date(meta_name::creation_date); auto [creation_os9date, creation_os9time] = to_os9_date(creation_datetime); u32 lsn_count = m_blockdev.block_count(); @@ -585,32 +585,32 @@ void impl::format(const meta_data &meta) // volume header auto volume_header = m_blockdev.get(0); volume_header.fill(0x00); - volume_header.w24b(0, lsn_count); // DD.TOT - total secctors - volume_header.w8(3, sectors); // DD.TKS - track size in sectors - volume_header.w16b(4, (allocation_bitmap_bits + 7) / 8); // DD.MAP - allocation bitmap in bytes - volume_header.w16b(6, cluster_size); // DD.BIT - cluster size - volume_header.w24b(8, 1 + allocation_bitmap_lsns); // DD.DIR - root directory LSN - volume_header.w16b(11, owner_id); // DD.OWN - owner ID - volume_header.w8(13, attributes); // DD.ATT - Dattributes - volume_header.w16b(14, disk_id); // DD.DSK - disk ID - volume_header.w8(16, format_flags); // DD.FMT - format flags - volume_header.w16b(17, sectors); // DD.SPT - sectors per track - volume_header.w24b(26, creation_os9date); // DD.DAT - date of creation - volume_header.w16b(29, creation_os9time); // DD.DAT - time of creation - volume_header.wstr(31, to_os9_string(volume_title, 32)); // DD.NAM - title - volume_header.w16b(103, sector_bytes / 256); // sector bytes + volume_header.w24b(0, lsn_count); // DD.TOT - total secctors + volume_header.w8(3, sectors); // DD.TKS - track size in sectors + volume_header.w16b(4, (allocation_bitmap_bits + 7) / 8); // DD.MAP - allocation bitmap in bytes + volume_header.w16b(6, cluster_size); // DD.BIT - cluster size + volume_header.w24b(8, 1 + allocation_bitmap_lsns); // DD.DIR - root directory LSN + volume_header.w16b(11, owner_id); // DD.OWN - owner ID + volume_header.w8(13, attributes); // DD.ATT - Dattributes + volume_header.w16b(14, disk_id); // DD.DSK - disk ID + volume_header.w8(16, format_flags); // DD.FMT - format flags + volume_header.w16b(17, sectors); // DD.SPT - sectors per track + volume_header.w24b(26, creation_os9date); // DD.DAT - date of creation + volume_header.w16b(29, creation_os9time); // DD.DAT - time of creation + volume_header.wstr(31, to_os9_string(volume_title, 32)); // DD.NAM - title + volume_header.w16b(103, sector_bytes / 256); // sector bytes // path descriptor options - volume_header.w8(0x3f + 0x00, 1); // device class - volume_header.w8(0x3f + 0x01, 1); // drive number - volume_header.w8(0x3f + 0x03, 0x20); // device type - volume_header.w8(0x3f + 0x04, 1); // density capability - volume_header.w16b(0x3f + 0x05, tracks); // number of tracks - volume_header.w8(0x3f + 0x07, heads); // number of sides - volume_header.w16b(0x3f + 0x09, sectors); // sectors per track - volume_header.w16b(0x3f + 0x0b, sectors); // sectors on track zero - volume_header.w8(0x3f + 0x0d, 3); // sector interleave factor - volume_header.w8(0x3f + 0x0e, 8); // default sectors per allocation + volume_header.w8(0x3f + 0x00, 1); // device class + volume_header.w8(0x3f + 0x01, 1); // drive number + volume_header.w8(0x3f + 0x03, 0x20); // device type + volume_header.w8(0x3f + 0x04, 1); // density capability + volume_header.w16b(0x3f + 0x05, tracks); // number of tracks + volume_header.w8(0x3f + 0x07, heads); // number of sides + volume_header.w16b(0x3f + 0x09, sectors); // sectors per track + volume_header.w16b(0x3f + 0x0b, sectors); // sectors on track zero + volume_header.w8(0x3f + 0x0d, 3); // sector interleave factor + volume_header.w8(0x3f + 0x0e, 8); // default sectors per allocation // allocation bitmap u32 total_allocated_sectors = 1 + allocation_bitmap_lsns + 1 + 8; diff --git a/src/lib/formats/fsmeta.cpp b/src/lib/formats/fsmeta.cpp index 681d644f18e..41ac767cd11 100644 --- a/src/lib/formats/fsmeta.cpp +++ b/src/lib/formats/fsmeta.cpp @@ -42,10 +42,10 @@ meta_type meta_value::type() const std::optional result; std::visit(overloaded { - [&result](const std::string &) { result = meta_type::string; }, - [&result](std::uint64_t) { result = meta_type::number; }, - [&result](bool) { result = meta_type::flag; }, - [&result](const util::arbitrary_datetime &) { result = meta_type::date; } + [&result](const std::string &) { result = meta_type::string; }, + [&result](std::uint64_t) { result = meta_type::number; }, + [&result](bool) { result = meta_type::flag; }, + [&result](const util::arbitrary_datetime &) { result = meta_type::date; } }, value); return *result; } diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp index 2d0bb031a65..0162dc87c0d 100644 --- a/src/lib/util/cdrom.cpp +++ b/src/lib/util/cdrom.cpp @@ -216,20 +216,20 @@ cdrom_file::cdrom_file(std::string_view inputfile) if (EXTRA_VERBOSE) printf("Track %02d is format %d subtype %d datasize %d subsize %d frames %d extraframes %d pregap %d pgmode %d presize %d postgap %d logofs %d physofs %d chdofs %d logframes %d\n", i+1, - track.trktype, - track.subtype, - track.datasize, - track.subsize, - track.frames, - track.extraframes, - track.pregap, - track.pgtype, - track.pgdatasize, - track.postgap, - track.logframeofs, - track.physframeofs, - track.chdframeofs, - track.logframes); + track.trktype, + track.subtype, + track.datasize, + track.subsize, + track.frames, + track.extraframes, + track.pregap, + track.pgtype, + track.pgdatasize, + track.postgap, + track.logframeofs, + track.physframeofs, + track.chdframeofs, + track.logframes); } // fill out dummy entries for the last track to help our search diff --git a/src/lib/util/cdrom.h b/src/lib/util/cdrom.h index b74b50a8190..8e911e92e91 100644 --- a/src/lib/util/cdrom.h +++ b/src/lib/util/cdrom.h @@ -184,11 +184,11 @@ public: static inline uint32_t lba_to_msf_alt(int lba) { uint32_t ret = 0; - + ret |= ((lba / (60 * 75))&0xff)<<16; ret |= (((lba / 75) % 60)&0xff)<<8; ret |= ((lba % 75)&0xff)<<0; - + return ret; } @@ -210,17 +210,17 @@ private: static constexpr int SYNC_OFFSET = 0x000; /** @brief 12 bytes. */ static constexpr int SYNC_NUM_BYTES = 12; - + /** @brief offset within sector. */ static constexpr int MODE_OFFSET = 0x00f; - + /** @brief offset within sector. */ static constexpr int ECC_P_OFFSET = 0x81c; /** @brief 2 lots of 86. */ static constexpr int ECC_P_NUM_BYTES = 86; /** @brief 24 bytes each. */ static constexpr int ECC_P_COMP = 24; - + /** @brief The ECC q offset. */ static constexpr int ECC_Q_OFFSET = ECC_P_OFFSET + 2 * ECC_P_NUM_BYTES; /** @brief 2 lots of 52. */ diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp index fd26ddaf40e..6bb6a043a04 100644 --- a/src/lib/util/corefile.cpp +++ b/src/lib/util/corefile.cpp @@ -128,7 +128,7 @@ public: virtual std::error_condition length(std::uint64_t &result) noexcept override { result = m_size; return std::error_condition(); } virtual bool eof() const override; - + protected: core_basic_file(std::uint32_t openflags, std::uint64_t length) noexcept : core_text_file(openflags) diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp index 61a3d5e7772..1eee927160d 100644 --- a/src/mame/drivers/4enlinea.cpp +++ b/src/mame/drivers/4enlinea.cpp @@ -706,7 +706,7 @@ ROM_END Running in 487 System I. -*/ +*/ ROM_START( unkdarts ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "diana_iv_video_27-1-92.bin", 0x0000, 0x8000, CRC(f23b5313) SHA1(488cf9bedce7b0c7b474bd93da70181c81fa300b) ) diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 11c95295e22..b439a2c2d4b 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -2619,7 +2619,7 @@ u8 apple2gs_state::c000_r(offs_t offset) (m_rombank ? 0x02 : 0x00) | (m_intcxrom ? 0x01 : 0x00); - case 0x70: // PTRIG - triggers paddles on read or write + case 0x70: // PTRIG - triggers paddles on read or write if (!machine().side_effects_disabled()) { // Zip paddle slowdown (does ZipGS also use the old Zip flag?) diff --git a/src/mame/drivers/cosmos_playc8f.cpp b/src/mame/drivers/cosmos_playc8f.cpp index 92e88f77404..6612321d94b 100644 --- a/src/mame/drivers/cosmos_playc8f.cpp +++ b/src/mame/drivers/cosmos_playc8f.cpp @@ -18,8 +18,8 @@ No Universal Space Amusement Equipment Ltd. Bed Monsters PLAYC8F + SY-MUSIC01 (music) No Universal Space Amusement Equipment Ltd. Colorama 4 Player PLAYC8F + SY-MUSIC01 (music) No Universal Space Amusement Equipment Ltd. / Bromley Incorporated Ghost Hunter PLAYC8E + SY-MUSIC01 (music) - - + + Sound PCB "SY-MUSIC01": ___________________________________________________________________ | ___ __ __ __________________ | diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index b573a2fcb7e..63f42861f9c 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -14181,9 +14181,9 @@ Pang 3b4 - code accesso to $5762b0 and $57a2b0 (PIC) uint16_t cps_state::pang3b4_prot_r() { if ((m_pang3b4_prot & 0xff) <=7) - return (m_pang3b4_prot & 0xff) + 0x20; // Game level + extend + return (m_pang3b4_prot & 0xff) + 0x20; // Game level + extend if (m_pang3b4_prot == 0x17) - return 0x7321; // Guessed from code @0x314 + return 0x7321; // Guessed from code @0x314 return 0xffff; } diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index 95547931791..2d0762cf9ff 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -78,7 +78,7 @@ void fruitpc_state::fruitpc_io(address_map &map) map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); -// map(0x0cf8, 0x0cff).rw(m_pcibus, FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); +// map(0x0cf8, 0x0cff).rw(m_pcibus, FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); } static INPUT_PORTS_START( fruitpc ) diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index 30f18c22a1b..77e76cd389d 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -41,8 +41,8 @@ - C:\GH4\mvs contains movie clips of the emulated games. These are MS-CRAM encoded, 288x208 at 20 fps, stereo MS ADPCM with 11025 Hz sample rate, 36 seconds length. - Mentioning this because SiS 630 has several HW registers dedicated to video playback, - which will be most likely used once we get there. + Mentioning this because SiS 630 has several HW registers dedicated to video playback, + which will be most likely used once we get there. Updates 27/11/2007 (Diego Nappino): The COM1 port is opened at 19200 bps, No parity, 8 bit data, 1 stop bit. diff --git a/src/mame/drivers/gammagic.cpp b/src/mame/drivers/gammagic.cpp index 6505073b515..a9f15baccb7 100644 --- a/src/mame/drivers/gammagic.cpp +++ b/src/mame/drivers/gammagic.cpp @@ -93,7 +93,7 @@ void gammagic_state::gammagic_io(address_map &map) map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); // map(0x03e0, 0x03ef).noprw(); -// map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); +// map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); // map(0x0400, 0xffff).noprw(); } diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 4568fb18c7e..7cef1c0ce42 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1498,10 +1498,10 @@ void goldnpkr_state::lespendu_mux_w(uint8_t data) { m_mux_data = data ^ 0xff; // inverted - if(data == 0x00) + if(data == 0x00) data = 0xff; - membank("bank0")->set_entry(data & 0x07); // for both sets + membank("bank0")->set_entry(data & 0x07); // for both sets } @@ -1862,8 +1862,8 @@ void goldnpkr_state::lespendu_map(address_map &map) map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); - - map(0x5000, 0x5fff).bankr("bank0"); + + map(0x5000, 0x5fff).bankr("bank0"); map(0x6000, 0x7fff).rom(); } @@ -5054,7 +5054,7 @@ ROM_END 1- When the player wins a hand, game will automatically switch to HI-LO for double-up (no need to press the "double" button) - + 2- A card is shown to the player, then the game is to guess the drawn card (BIG to guess bigger than actual card, LO to guess a lower card) @@ -5104,7 +5104,7 @@ ROM_END 1- When the player wins a hand, game will automatically switch to HI-LO for double-up (no need to press the "double" button) - + 2- A card is shown to the player, then the game is to guess the drawn card (BIG to guess bigger than actual card, LO to guess a lower card) @@ -11744,7 +11744,7 @@ ROM_END Le Super Pendu. Voyageur de L'Espace Inc. - + French language hangman style game manufactured in Canada. Conversion kit for modified Bonanza Enterprises hardware. @@ -12285,10 +12285,10 @@ void goldnpkr_state::init_lespendu() ROM0[0x643d] = 0xff; // skip checksum ROM0[0x643f] = 0xff; // skip checksum - ROM0[0x6461] = 0xff; // changing value to store at $01c1 (RAM security patch) + ROM0[0x6461] = 0xff; // changing value to store at $01c1 (RAM security patch) ROM1[0x7aa3] = 0x20; // restore to original call, before RAM security patch - ROM1[0x7aa4] = 0xc3; + ROM1[0x7aa4] = 0xc3; ROM1[0x7aa5] = 0x78; ROM0[0x75de] = 0x1f; // fix lamps bug @@ -12298,13 +12298,13 @@ void goldnpkr_state::init_lespenduj() { uint8_t *ROM0 = memregion("maincpu")->base(); uint8_t *ROM1 = memregion("data")->base(); - + ROM0[0x643d] = 0xff; // skip checksum ROM0[0x643f] = 0xff; // skip checksum - ROM0[0x6461] = 0xff; // changing value to store at $01c1 (RAM security patch) + ROM0[0x6461] = 0xff; // changing value to store at $01c1 (RAM security patch) ROM1[0x7aa3] = 0x20; // restore to original call, before RAM security patch - ROM1[0x7aa4] = 0xc8; + ROM1[0x7aa4] = 0xc8; ROM1[0x7aa5] = 0x78; ROM0[0x766c] = 0x17; // fix lamps bug diff --git a/src/mame/drivers/krz2000.cpp b/src/mame/drivers/krz2000.cpp index 2c4afa6ee63..e03039775cd 100644 --- a/src/mame/drivers/krz2000.cpp +++ b/src/mame/drivers/krz2000.cpp @@ -95,20 +95,20 @@ private: /** * From the K2000/K2000R service manual: - * - * The 68301 processor's 16 megabits (sic) of address space are divided into 16 equal memory blocks, + * + * The 68301 processor's 16 megabits (sic) of address space are divided into 16 equal memory blocks, * numbered 0-15. The first time the K2000 is powered up, Block 0 processes data for the boot * EPROM and setup EPROM, while Block 1 processes data for the PSRAM. Many of the K2000's basic * functions utilize the PSRAM, which accesses the higher address space of Block 1 in the CPU. * This slows down the access time somewhat, since the address space of the CPU is accessed in * sequence, beginning with Block 0. - * + * * To optimize the processing speed, the K2000 performs a one-time software operation when * powered up for the first time. The memory management unit (MMU) in the gate array logic chip * (GAL) located at U35 on the engine board executes a "swap bit" function which makes Block 0 * of the CPU responsible for the PSRAM, and Block 1 responsible for the Boot EPROM and Setup * EPROM. Consequently the PSRAM functions are processed as early as possible. - * + * * Note this "16 equal memory blocks" idea is really just the top hex digit of the address - * i.e.: 0x?FFFFF */ @@ -200,10 +200,10 @@ void k2000_state::k2000_map(address_map &map) // Block 4: PRAM? // "The K2000 comes standard with 116KB, and with the PRAM upgrade, totals 760KB." // Another source says: - // For the K2000 Series, the total memory allocated to all of these objects is - // 120K expandable to 760K with the PRAM option. For the K2500 Series, it is 256k, - // expandable to 1280k with the PRAM option. For the K2600 Series, it is 486k, - // expandable to 1506k with the PRAM option. + // For the K2000 Series, the total memory allocated to all of these objects is + // 120K expandable to 760K with the PRAM option. For the K2500 Series, it is 256k, + // expandable to 1280k with the PRAM option. For the K2600 Series, it is 486k, + // expandable to 1506k with the PRAM option. // These are pretty odd numbers - but it sounds like ~8KB of the RAM space is used // for OS functions, meaning the built-in RAM might only be 128KB in total. // The K2000 schematic shows 2x 1M "NVRAM" chips, one for the low byte, and one for @@ -219,12 +219,12 @@ void k2000_state::k2000_map(address_map &map) // HOBBES1CSb = NAND(CS1', !CA19) = high unless CS1 is high and CA19 is low // 0xFFFC00 is the Address Decoder area that controls which part of memory causes CS1 to be "enabled" (low) // At runtime, - // 0xFFFC00 = 0x50 = - // 0xFFFC01 = 0x3F - // 0xFFFC02 = 0x00 + // 0xFFFC00 = 0x50 = + // 0xFFFC01 = 0x3F + // 0xFFFC02 = 0x00 // 0xFFFC03 = 0x30 // For CS1: - // 0xFFFC04 = 0x60 = 0b0110 0000 = Start address of the memory area for CS1 = A21 + A22 + // 0xFFFC04 = 0x60 = 0b0110 0000 = Start address of the memory area for CS1 = A21 + A22 // 0xFFFC05 = 0x3F = 0b0011 1111 = Size of memory area = M19 + M18 + M17 + M16 + M15-M9 + M8 = 1MB // 0xFFFC06 = 0x00 // 0xFFFC07 = 0x30 = 0b0011 0000 = Area enabled, use external DTACK @@ -237,7 +237,7 @@ void k2000_state::k2000_map(address_map &map) // Internal sample ROM is switched on SBA20,SBA21, which corresponds to CA21,CA22 (one bit off) // meaning the internal address space for accessing the sample ROM is 0x200000 through 0x6fffff (?) // Blocks 2, 3, 4, 5, 6 - // map(0x200000, 0x2fffff).rom().region("pcm", 0); // Block 2: Sample ROM + // map(0x200000, 0x2fffff).rom().region("pcm", 0); // Block 2: Sample ROM // map(0x300000, 0x3fffff).rom().region("pcm", 0x100000); // Block 3: Sample ROM // map(0x400000, 0x4fffff).rom().region("pcm", 0x200000); // Block 4: Sample ROM // Writes to 0x4FFD82, 0x4FFD88, 0x4FFE24 diff --git a/src/mame/drivers/lependu.cpp b/src/mame/drivers/lependu.cpp index 059c4432627..8d15ca1be0c 100644 --- a/src/mame/drivers/lependu.cpp +++ b/src/mame/drivers/lependu.cpp @@ -614,8 +614,8 @@ void lependu_state::init_lependu() /* break the loop at $cc53 that prevents to start a game - $cc53 lda $01c4 - $cc56 bne $cc53 + $cc53 lda $01c4 + $cc56 bne $cc53 */ ROM[0xcc56] = 0xea; ROM[0xcc57] = 0xea; diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 40559220e45..4d81248f82c 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -77,7 +77,7 @@ To Do: excessive slowdown in said games however. - karatour, ladykill, 3kokushi: understand what the irq source 5 is really tied to. All these games also have a vblank delay check outside irq routine, - cfr. PC=1322 in karatour; + cfr. PC=1322 in karatour; - vmetal: ES8712 actually controls a M6585 and an unknown logic selector chip. - split these games into different files, check PCB markings. - Coin lockout; @@ -182,7 +182,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(metro_state::bangball_scanline) /* lev 2-7 (lev 1 seems sound related) */ WRITE_LINE_MEMBER(metro_state::karatour_vblank_irq) { -// printf("%d %d %lld\n", state, m_screen->vpos(), m_screen->frame_number()); +// printf("%d %d %lld\n", state, m_screen->vpos(), m_screen->frame_number()); if (state) { @@ -2847,7 +2847,7 @@ void metro_state::i4100_config_360x224(machine_config &config) { i4100_config(config); -// m_screen->set_size(392, 263); +// m_screen->set_size(392, 263); m_screen->set_visarea(0, 360-1, 0, 224-1); } @@ -2855,7 +2855,7 @@ void metro_state::i4220_config_320x240(machine_config &config) { i4220_config(config); -// m_screen->set_size(320, 240); +// m_screen->set_size(320, 240); m_screen->set_visarea(0, 320-1, 0, 240-1); } @@ -2871,7 +2871,7 @@ void metro_state::i4300_config_384x224(machine_config &config) i4300_config(config); m_vdp3->set_clock(32_MHz_XTAL); -// m_screen->set_size(384, 240); +// m_screen->set_size(384, 240); m_screen->set_visarea(0, 384-1, 0, 224-1); } @@ -2879,7 +2879,7 @@ void metro_state::i4300_config_320x240(machine_config &config) { i4300_config(config); -// m_screen->set_size(384, 240); +// m_screen->set_size(384, 240); m_screen->set_visarea(0, 320-1, 0, 240-1); } diff --git a/src/mame/drivers/paokaipc.cpp b/src/mame/drivers/paokaipc.cpp index dbf4d05099c..7423a2aa1d4 100644 --- a/src/mame/drivers/paokaipc.cpp +++ b/src/mame/drivers/paokaipc.cpp @@ -2,23 +2,23 @@ // copyright-holders: /************************************************************************************************** - Go Go Strike (c) 2007? Paokai + Go Go Strike (c) 2007? Paokai - Originally in fruitpc.cpp, split because definitely doesn't belong + Originally in fruitpc.cpp, split because definitely doesn't belong - Some kind of x86 pc-like hardware, exact CPU type etc. unknown hardware is by Paokai, - motherboard has logos, large chip with logo too, http://www.paokai.com.tw/ + Some kind of x86 pc-like hardware, exact CPU type etc. unknown hardware is by Paokai, + motherboard has logos, large chip with logo too, http://www.paokai.com.tw/ CF card has a Linux partition, partially bootable with m55hipl driver. - - starts with a "LILO boot", fails with a recoverable "undefined video mode" - (press RETURN or SPACE); - - Shows being a "gcc 3.2.2 (Red Hat Linux 3.2.2-5)" distro. - Notice that latter seems mislabeled, and RedHat is actually version 9 - http://rpm.pbone.net/info_idpl_19558085_distro_redhat9_com_gcc-3.2.2-5.i386.rpm.html - - Has pretty verbose terminal log, checks PnP, USB, Pentium f0 0f bug, - assumes "33 MHz system bus" for IDE PIO mode, returns PIIX only during PCI scan - (that's what m55hipl has as default); - - Eventually hangs at a "Setting the clock:" prompt; + - starts with a "LILO boot", fails with a recoverable "undefined video mode" + (press RETURN or SPACE); + - Shows being a "gcc 3.2.2 (Red Hat Linux 3.2.2-5)" distro. + Notice that latter seems mislabeled, and RedHat is actually version 9 + http://rpm.pbone.net/info_idpl_19558085_distro_redhat9_com_gcc-3.2.2-5.i386.rpm.html + - Has pretty verbose terminal log, checks PnP, USB, Pentium f0 0f bug, + assumes "33 MHz system bus" for IDE PIO mode, returns PIIX only during PCI scan + (that's what m55hipl has as default); + - Eventually hangs at a "Setting the clock:" prompt; **************************************************************************************************/ @@ -69,8 +69,8 @@ void paokaipc_state::main_io(address_map &map) map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); -// map(0x0880, 0x0880) extensively accessed at POST, hangs if returns wrong values -// map(0x0cf8, 0x0cff).rw(m_pcibus, FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); +// map(0x0880, 0x0880) extensively accessed at POST, hangs if returns wrong values +// map(0x0cf8, 0x0cff).rw(m_pcibus, FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); } static INPUT_PORTS_START( gogostrk ) @@ -108,9 +108,9 @@ void paokaipc_state::paokaipc(machine_config &config) m_isabus->drq3_callback().set("dma8237_1", FUNC(am9517a_device::dreq3_w)); // FIXME: determine ISA bus clock -// isa8_slot_device &isa1(ISA8_SLOT(config, "isa1", 0, "isa", fruitpc_isa8_cards, "sb15", true)); -// isa1.set_option_device_input_defaults("sb15", DEVICE_INPUT_DEFAULTS_NAME(fruitpc_sb_def)); -// isa1.set_option_machine_config("sb15", fruitpc_sb_conf); +// isa8_slot_device &isa1(ISA8_SLOT(config, "isa1", 0, "isa", fruitpc_isa8_cards, "sb15", true)); +// isa1.set_option_device_input_defaults("sb15", DEVICE_INPUT_DEFAULTS_NAME(fruitpc_sb_def)); +// isa1.set_option_machine_config("sb15", fruitpc_sb_conf); } ROM_START( gogostrk ) diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 03a94a5a490..501b3ccab38 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -1762,7 +1762,7 @@ WRITE_LINE_MEMBER(rainbow_base_state::hdc_read_sector) // Pointer to info + C + H + S uint32_t lbasector = get_and_print_lbasector(this, info, cylinder, sdh & 0x07, sector_number); - + if ((cylinder <= info.cylinders) && // filter invalid ranges (SECTOR_SIZES[(sdh >> 5) & 0x03] == info.sectorbytes) // may not vary in image! ) diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 1e6eff96841..727cb5ca9c8 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -8,11 +8,11 @@ Games supported: * Rise of the Robots (prototype) - * Football Crazy + * Football Crazy ROMs wanted: * Zool (prototype) - * Wiggle + * Wiggle ****************************************************************************/ @@ -179,7 +179,7 @@ private: uint32_t m_speedup_count = 0; uint32_t m_tms_io_regs[0x80]{}; bitmap_ind16 m_update_bitmap; - + uint8_t m_port2_data = 0; uint32_t m_last_watchdog = 0; int m_left_volume = 0; @@ -293,7 +293,7 @@ void rastersp_state::machine_reset() m_irq_status = 0; m_dlba = 0; m_palette_number = 0; - + m_last_watchdog = 0; m_port2_data = 0; m_left_volume = 0; @@ -479,8 +479,8 @@ void rastersp_state::dpylist_w(uint32_t data) void rastersp_state::upload_palette(uint32_t word1, uint32_t word2) { /* - Palette entry format: - ........ ........ ........ ...xxxxx - Blue + Palette entry format: + ........ ........ ........ ...xxxxx - Blue ........ ........ .....xxx xxx..... - Green ........ ........ xxxxx... ........ - Red .......x xxxxxxxx ........ ........ - Entry number @@ -503,28 +503,28 @@ void rastersp_state::upload_palette(uint32_t word1, uint32_t word2) /******************************************************************************* - Display pointer word: + Display pointer word: xxxxxxxx xxxxxxxx xxxxxxxx ........ DLBA pointer (DWORD aligned) - ........ ........ ........ x....... Display enable - ........ ........ ........ ......xx Mode: - 00: 384x288 50Hz overscan - 01: 320x240 64Hz overscan - 02: 320x240 50Hz underscan - 03: invalid - - Control words: - + ........ ........ ........ x....... Display enable + ........ ........ ........ ......xx Mode: + 00: 384x288 50Hz overscan + 01: 320x240 64Hz overscan + 02: 320x240 50Hz underscan + 03: invalid + + Control words: + Set address 0.xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Address Palette update: - 1P0..... ........ ........ ........ P specifies whether palette entry is the bottom (when 0) or top (when 1) 4 bits of palette number + 1P0..... ........ ........ ........ P specifies whether palette entry is the bottom (when 0) or top (when 1) 4 bits of palette number ...01... ........ ........ ........ Palette upload .....10. ........ ........ ........ X address only .......x xxxxxxxx ........ ........ Entry count ........ ........ xxxx.... ........ Palette (top 4 bits if 'P' is 1 or bottom 4 bits if 'P' is 0 - ........ ........ ....xxxx xxxxxxxx Scale (4.8 signed fixed point) + ........ ........ ....xxxx xxxxxxxx Scale (4.8 signed fixed point) Pixel data, 8-bit palettized: 1P0..... ........ ........ ........ P specifies whether palette entry is the bottom (when 0) or top (when 1) 4 bits of palette number @@ -605,7 +605,7 @@ void rastersp_state::update_irq(uint32_t which, uint32_t state) WRITE_LINE_MEMBER( rastersp_state::scsi_irq ) { update_irq(IRQ_SCSI, state); - + if (state && BIT(m_dsp_ctrl_data, 5)) { m_dsp->set_input_line(TMS3203X_IRQ0, ASSERT_LINE); @@ -632,15 +632,15 @@ WRITE_LINE_MEMBER( fbcrazy_state::trackball_rts ) } /* - Mimic trackball unit. This uses a small PIC based interface board - which converts the trackball movement into RS232 data. - The data format is as follows: - Byte 0 : 0100abAB bits 7 & 6 = 01 signifies 1st byte - Byte 1 : 00CDEFGH bits 7 & 6 = 00 signifies 2 or 3rd byte (not identified) - Byte 2 : 00cdefgh - - The trackball X movement is ABCDEFGH and Y movement abcdefgh - We do not have a PCB nor a dump of the PIC :( + Mimic trackball unit. This uses a small PIC based interface board + which converts the trackball movement into RS232 data. + The data format is as follows: + Byte 0 : 0100abAB bits 7 & 6 = 01 signifies 1st byte + Byte 1 : 00CDEFGH bits 7 & 6 = 00 signifies 2 or 3rd byte (not identified) + Byte 2 : 00cdefgh + + The trackball X movement is ABCDEFGH and Y movement abcdefgh + We do not have a PCB nor a dump of the PIC :( */ TIMER_CALLBACK_MEMBER(fbcrazy_state::trackball_timer) { @@ -757,7 +757,7 @@ void rastersp_state::port1_w(uint32_t data) m_dsp->set_input_line(TMS3203X_IRQ2, ASSERT_LINE); m_dsp->set_input_line(TMS3203X_IRQ2, CLEAR_LINE); } - + if (BIT(data, 7) != m_last_watchdog) { m_last_watchdog = BIT(data, 7); @@ -1067,7 +1067,7 @@ void rastersp_state::dsp_ctrl_w(uint32_t data) // ..x. .... - Enable SCSI, UART, and 486 int to DSP m_maincpu->set_input_line(INPUT_LINE_RESET, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE); - + m_dsp_ctrl_data = data; } @@ -1452,7 +1452,7 @@ void rastersp_state::rs_config_base(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); NSCSI_BUS(config, "scsibus", 0); - + WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_seconds(1)); nscsi_connector &connector7(NSCSI_CONNECTOR(config, "scsibus:7", 0)); @@ -1482,7 +1482,7 @@ void rastersp_state::rs_config_base(machine_config &config) DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_rdac, 0); m_ldac->add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC m_rdac->add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC - + SCC85C30(config, m_duart, 8'000'000); m_duart->configure_channels(1'843'200, 0, 1'843'200, 0); m_duart->out_int_callback().set(FUNC(rastersp_state::duart_irq)); @@ -1498,7 +1498,7 @@ void rastersp_state::rastersp(machine_config &config) { rs_config_base(config); m_maincpu->set_addrmap(AS_PROGRAM, &rastersp_state::cpu_map); - + m_dsp->set_addrmap(AS_PROGRAM, &rastersp_state::dsp_map); nscsi_connector &connector0(NSCSI_CONNECTOR(config, "scsibus:0", 0)); diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index cffc258a6fc..1f3336ee888 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -27,7 +27,7 @@ Star Trax --- X unknown Status: - All pinball machines are playable -- Star Trax has no pinball, but instead has many ball bearings (800 was mentioned). Although it +- Star Trax has no pinball, but instead has many ball bearings (800 was mentioned). Although it can be started, and a score attained, it will eventually say PUMP ERROR and stop responding. diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp index 2e12d194267..9beca9ee75f 100644 --- a/src/mame/drivers/savquest.cpp +++ b/src/mame/drivers/savquest.cpp @@ -11,7 +11,7 @@ - Needs proper AWE64 emulation defined as a slot option default, with fallbacks to AWE32 and SB16; - - ISA bus needs IRQ and DMA hookups. + - ISA bus needs IRQ and DMA hookups. \- Will otherwise hang indefinitely after booting, waiting for sound card irqs. There's a C:\sb16\diagnose.exe tool if you want to test this. @@ -19,7 +19,7 @@ - Currently fails because it doesn't find the Voodoo card in the PCI model; - - When switching gfx mode during boot routine it still sets a terminal debug mode (with cut down screen portions) + - When switching gfx mode during boot routine it still sets a terminal debug mode (with cut down screen portions) instead of normal Voodoo drawing. Culprit may be an I/O port reading or a Voodoo bug; - Aforementioned debug mode shows that it can't find several assets on loading; diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index 104aa84b01e..339409a7c39 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -8,7 +8,7 @@ Three board system consisting of a P5TX-LA PC motherboard, a Taito main board an TODO: - program ROM is read via parallel port (for offset write, encrypted) and game port. - It's the first thing that the BIOS does at boot (cfr. accesses at $20x), + It's the first thing that the BIOS does at boot (cfr. accesses at $20x), if these ports are fed with proper values then it sets up PnP then tries a DMA ch. 3 transfer, otherwise it just boots the normal P5TX-LA bootstrap sequence. cfr. PC=e850b, PC=e4fc8, PC=fd84a (reading I/O $0006). diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index 0c6e31c18b7..a800174decc 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -701,52 +701,52 @@ void twinkle_state::twinkle_videomixer_w(offs_t offset, uint16_t data) { case 0x00: /* - Address Register offset - 0x00 Command Register 0, Input Select Register - 0x01 Reserved - 0x02 Command Register 2, Status Register - 0x03 Command Register 3, Output Format Register - 0x04 Command Register 4, Operation Mode Select Register - 0x05 Command Register 5, Input Format Register - 0x06 Command Register 6, Clock Definition Register - 0x07 Command Register 7, Video Timing Definition Register - 0x08 Brightness Adjust Register (range: -64 to +63) - 0x09 Contrast Adjust Register (range: 0 to 198.44%) - 0x0a Saturation Adjust Register (range: 0 to 198.44%) - 0x0b Hue Adjust Register (range: -45 to +44.3) - 0x0c HCLOCK Low Register - 0x0d HCLOCK High Register - 0x0e HDELAY Low Register - 0x0f HDELAY High Register - 0x10 ACTIVE_PIXELS Low Register - 0x11 ACTIVE_PIXELS High Register - 0x12 VDELAY Low Register - 0x13 VDELAY High Register - 0x14 ACTIVE_LINES Low Register - 0x15 ACTIVE_LINES High Register - 0x16 P (subcarrier freq) Register 0 - 0x17 P (subcarrier freq) Register 1 - 0x18 P (subcarrier freq) Register 2 - 0x19 AGC Delay Register - 0x1a Burst Delay Register - 0x1b Sample Rate Conversion Low Register - 0x1c Sample Rate Conversion High Register - 0x1d Command Register 1D, Video Timing Polarity Register - 0x1e-0xfe Reserved - 0xff Software Reset + Address Register offset + 0x00 Command Register 0, Input Select Register + 0x01 Reserved + 0x02 Command Register 2, Status Register + 0x03 Command Register 3, Output Format Register + 0x04 Command Register 4, Operation Mode Select Register + 0x05 Command Register 5, Input Format Register + 0x06 Command Register 6, Clock Definition Register + 0x07 Command Register 7, Video Timing Definition Register + 0x08 Brightness Adjust Register (range: -64 to +63) + 0x09 Contrast Adjust Register (range: 0 to 198.44%) + 0x0a Saturation Adjust Register (range: 0 to 198.44%) + 0x0b Hue Adjust Register (range: -45 to +44.3) + 0x0c HCLOCK Low Register + 0x0d HCLOCK High Register + 0x0e HDELAY Low Register + 0x0f HDELAY High Register + 0x10 ACTIVE_PIXELS Low Register + 0x11 ACTIVE_PIXELS High Register + 0x12 VDELAY Low Register + 0x13 VDELAY High Register + 0x14 ACTIVE_LINES Low Register + 0x15 ACTIVE_LINES High Register + 0x16 P (subcarrier freq) Register 0 + 0x17 P (subcarrier freq) Register 1 + 0x18 P (subcarrier freq) Register 2 + 0x19 AGC Delay Register + 0x1a Burst Delay Register + 0x1b Sample Rate Conversion Low Register + 0x1c Sample Rate Conversion High Register + 0x1d Command Register 1D, Video Timing Polarity Register + 0x1e-0xfe Reserved + 0xff Software Reset */ break; case 0x04: /* - Register data - Uses offset given in the address register offset command. - - Game initialized values: - HCLOCK 853 - HDELAY 126 - ACTIVE_PIXELS 706 - VDELAY 22 - ACTIVE_LINES 16 + Register data + Uses offset given in the address register offset command. + + Game initialized values: + HCLOCK 853 + HDELAY 126 + ACTIVE_PIXELS 706 + VDELAY 22 + ACTIVE_LINES 16 */ break; case 0x08: diff --git a/src/mame/includes/pc8801.h b/src/mame/includes/pc8801.h index 50fb99541ae..d076a0bd8af 100644 --- a/src/mame/includes/pc8801.h +++ b/src/mame/includes/pc8801.h @@ -121,7 +121,7 @@ private: std::unique_ptr m_ext_work_ram; std::unique_ptr m_gvram; - std::array, 400> m_attr_info = {}; + std::array, 400> m_attr_info = {}; uint8_t m_ext_rom_bank = 0; uint8_t m_vram_sel = 0; diff --git a/src/mame/layout/lependu.lay b/src/mame/layout/lependu.lay index 24cde3f64ac..8bcc265a184 100644 --- a/src/mame/layout/lependu.lay +++ b/src/mame/layout/lependu.lay @@ -9,7 +9,7 @@ license:CC0 - + @@ -38,7 +38,7 @@ license:CC0 - + @@ -66,7 +66,7 @@ license:CC0 - + @@ -103,6 +103,6 @@ license:CC0 - + diff --git a/src/mame/layout/lespendu.lay b/src/mame/layout/lespendu.lay index 58fe1704937..30db787db36 100644 --- a/src/mame/layout/lespendu.lay +++ b/src/mame/layout/lespendu.lay @@ -9,7 +9,7 @@ license:CC0 - + @@ -38,7 +38,7 @@ license:CC0 - + @@ -56,21 +56,21 @@ license:CC0 - - + + - + - + @@ -87,7 +87,7 @@ license:CC0 - - + + diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index 81190890414..991962e96e1 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -26,7 +26,7 @@ #define PAGE_WP BIT(page_data, 14) #define PAGE_NONX BIT(page_data, 15) -#define DMAOK 0x04 +#define DMAOK 0x04 @@ -596,7 +596,7 @@ uint8_t abc1600_mac_device::dma_mreq_r(int index, int dmamap, offs_t offset) space().write_byte(virtual_offset, data); } - if (LOG_DMA) logerror("%s DMRQ R:%c %04x:%06x=%02x\n", + if (LOG_DMA) logerror("%s DMRQ R:%c %04x:%06x=%02x\n", machine().describe_context(), rw ? 'R' : 'W', offset, virtual_offset, data); return data; @@ -612,7 +612,7 @@ void abc1600_mac_device::dma_mreq_w(int index, int dmamap, offs_t offset, uint8_ bool rw; offs_t virtual_offset = get_dma_address(dmamap, offset, rw); - if (LOG_DMA) logerror("%s DMRQ W:%c %04x:%06x=%02x\n", + if (LOG_DMA) logerror("%s DMRQ W:%c %04x:%06x=%02x\n", machine().describe_context(), rw ? 'R' : 'W', offset, virtual_offset, data); if (!rw) @@ -631,7 +631,7 @@ uint8_t abc1600_mac_device::dma_iorq_r(int dmamap, offs_t offset) bool rw; offs_t virtual_offset = 0x1fe000 | get_dma_address(dmamap, offset, rw); - if (LOG_DMA) logerror("%s DIORQ R %04x:%06x\n", + if (LOG_DMA) logerror("%s DIORQ R %04x:%06x\n", machine().describe_context(), offset, virtual_offset); return space().read_byte(virtual_offset); @@ -647,7 +647,7 @@ void abc1600_mac_device::dma_iorq_w(int dmamap, offs_t offset, uint8_t data) bool rw; offs_t virtual_offset = 0x1fe000 | get_dma_address(dmamap, offset, rw); - if (LOG_DMA) logerror("%s DIORQ W %04x:%06x=%02x\n", + if (LOG_DMA) logerror("%s DIORQ W %04x:%06x=%02x\n", machine().describe_context(), offset, virtual_offset, data); space().write_byte(virtual_offset, data); diff --git a/src/mame/machine/pc80s31k.cpp b/src/mame/machine/pc80s31k.cpp index 383745c3c89..bb3004c8204 100644 --- a/src/mame/machine/pc80s31k.cpp +++ b/src/mame/machine/pc80s31k.cpp @@ -30,8 +30,8 @@ \- It then tries to read at memory [0xc0ff], set the value read in [0xf012]; \- Expects that ROM [0x0000] is not equal to 0xc3; Bottom line: Is it trying to access some custom HW? - - Hookup a bridge for internal BIOSes (later PC8801 models); - - Save state support (resuming fails latch hookups here); + - Hookup a bridge for internal BIOSes (later PC8801 models); + - Save state support (resuming fails latch hookups here); =================================================================================================== diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp index f2f666896c1..aaef4a2c6fa 100644 --- a/src/mame/video/m92.cpp +++ b/src/mame/video/m92.cpp @@ -112,16 +112,16 @@ void m92_state::videocontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask) be a different motherboard revision (most games use M92-A-B top pcb, a M92-A-A revision could exist...). - There is a further test case with R-Type Leo. The flickering - invulnerability effect when you spawn does not work correctly - with the palette bank hooked up, and also causes a 2nd player - spawning in to have the incorrect palette at first. - - It appears that the only games requiring the palette bank logic - are Major Title 2, Ninja Baseball Bat Man, Dream Soccer '94 - and Gun Force 2. These are also the games with the extended - ROM banking, suggesting a difference on those boards is a more - likely explanation. + There is a further test case with R-Type Leo. The flickering + invulnerability effect when you spawn does not work correctly + with the palette bank hooked up, and also causes a 2nd player + spawning in to have the incorrect palette at first. + + It appears that the only games requiring the palette bank logic + are Major Title 2, Ninja Baseball Bat Man, Dream Soccer '94 + and Gun Force 2. These are also the games with the extended + ROM banking, suggesting a difference on those boards is a more + likely explanation. */ /* diff --git a/src/mame/video/vigilant.cpp b/src/mame/video/vigilant.cpp index dffb29c8885..511f1ee5fdd 100644 --- a/src/mame/video/vigilant.cpp +++ b/src/mame/video/vigilant.cpp @@ -471,6 +471,6 @@ uint32_t vigilant_state::screen_update_bowmen(screen_device &screen, bitmap_ind1 draw_foreground_bowmen(bitmap, cliprect, 0, 0); } draw_sprites(bitmap, bowmenvisiblearea); -// draw_foreground_bowmen(bitmap, cliprect, 1, 0); // priority tiles +// draw_foreground_bowmen(bitmap, cliprect, 1, 0); // priority tiles return 0; } -- cgit v1.2.3