From 2519765abd843add31aee697625feb15d1b8d8b6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 26 Mar 2023 04:13:23 +1100 Subject: cpu/nec: Fixed build; also, srcclean --- hash/msx2_flop.xml | 6 +- hash/pcecd.xml | 28 ++--- src/devices/bus/abckb/abc77.cpp | 2 +- src/devices/bus/abckb/abc77.h | 2 +- src/devices/bus/abckb/abc99.cpp | 4 +- src/devices/bus/c64/buscard2.cpp | 112 +++++++++--------- src/devices/bus/c64/buscard2.h | 2 +- src/devices/bus/msx/cart/slotexpander.cpp | 2 +- src/devices/bus/msx/slot/disk.cpp | 2 +- src/devices/bus/s100/vectordualmode.cpp | 20 ++-- src/devices/cpu/interdata16/dasm16.cpp | 2 +- src/devices/cpu/m68000/m68000.cpp | 4 +- src/devices/cpu/m68000/m68000.h | 26 ++--- src/devices/cpu/m68000/m68000.lst | 2 +- src/devices/cpu/mips/mips1.h | 2 +- src/devices/cpu/nec/necinstr.hxx | 4 +- src/devices/cpu/z180/z180csio.cpp | 2 +- src/devices/machine/e0516.cpp | 8 +- src/devices/machine/e0516.h | 2 +- src/devices/machine/pccard.cpp | 4 +- src/devices/machine/psion_asic5.cpp | 8 +- src/devices/machine/psion_asic9.cpp | 8 +- src/devices/sound/cdda.cpp | 2 +- src/devices/sound/l7a1045_l6028_dsp_a.cpp | 8 +- src/emu/emumem_hedr.ipp | 4 +- src/emu/emumem_hedw.ipp | 4 +- src/lib/formats/lw30_dsk.cpp | 4 +- src/lib/formats/lw30_dsk.h | 4 +- src/mame/apple/heathrow.cpp | 2 +- src/mame/apple/macii.cpp | 18 +-- src/mame/atari/stkbd.cpp | 2 +- src/mame/atari/stmmu.cpp | 8 +- src/mame/atari/stvideo.cpp | 34 +++--- src/mame/atari/stvideo.h | 2 +- src/mame/capcom/mitchell.cpp | 2 +- src/mame/luxor/abc1600.cpp | 16 +-- src/mame/mame.lst | 2 +- src/mame/misc/brglitz.cpp | 4 +- src/mame/misc/playcenter.cpp | 4 +- src/mame/nintendo/n64_v.cpp | 10 +- src/mame/psion/psion3a.cpp | 6 +- src/mame/seibu/bloodbro_ms.cpp | 14 +-- src/mame/shared/xbox_pci.cpp | 28 ++--- src/mame/shared/xbox_pci.h | 2 +- src/mame/sinclair/neogs.cpp | 10 +- src/mame/vectorgraphic/v4_kbd.cpp | 182 +++++++++++++++--------------- src/osd/sdl/android_main.cpp | 2 +- 47 files changed, 313 insertions(+), 313 deletions(-) diff --git a/hash/msx2_flop.xml b/hash/msx2_flop.xml index aedff8763f3..2805e6ab4d2 100644 --- a/hash/msx2_flop.xml +++ b/hash/msx2_flop.xml @@ -11051,7 +11051,7 @@ The following floppies came with the machines. - @@ -11082,7 +11082,7 @@ The following floppies came with the machines. - @@ -11113,7 +11113,7 @@ The following floppies came with the machines. - diff --git a/hash/pcecd.xml b/hash/pcecd.xml index f31e0517c6a..b46ca7894af 100644 --- a/hash/pcecd.xml +++ b/hash/pcecd.xml @@ -1914,7 +1914,7 @@ Hangs on FMV playback (skippable thru Run button), [SCSI] timing sensitive Aoki Ookami to Shiroki Mejika - Genchou Hishi (Japan) 1993 Koei - @@ -2807,7 +2807,7 @@ Doesn't survive a soft reset KO Seiki Beast - Gaia Fukkatsu Kanketsu Hen (Japan) 1994 Pack-In-Video - @@ -2862,7 +2862,7 @@ Sets high transfer length (0xfc), stalls, [SCSI] timing sensitive Lady Phantom (Japan) 1991 Laser Soft - @@ -3857,7 +3857,7 @@ Crashes when "left option" is selected in main menu (with no save in [BRAM]) Nobunaga no Yabou - Bushou Fuuunroku (Japan) 1993 Koei - @@ -3876,7 +3876,7 @@ Unsupported [セーブくん] joypad slot peripheral Nobunaga no Yabou - Zenkokuban (Japan) 1993 Koei - @@ -4301,7 +4301,7 @@ Unsupported [セーブくん] joypad slot peripheral Psychic Detective Series Vol. III - Aya - Auto Demo (Japan) 1992 Data West - @@ -4653,7 +4653,7 @@ Hangs at 3 minutes mark (verify, [ADPCM] or [SCSI]) Renny Blaster (Japan) 1995 NEC Avenue - @@ -4942,7 +4942,7 @@ Hangs on technique screen after level select (assuming you pick them up in stage Sangokushi III (Japan) 1993 Koei - @@ -5571,7 +5571,7 @@ Offset [CRTC] screen Space Invaders - The Original Game (Japan) 1995 NEC Avenue - @@ -5702,7 +5702,7 @@ Crashes with [redbook] static if attract mode opening isn't skipped Steam Heart's (Japan) 1996 TGL - The Pro Yakyuu (Japan) 1990 Intec - @@ -6544,7 +6544,7 @@ Verify sound mixing, [PSG] covers [ADPCM] Travelers! Densetsu wo Buttobase (Japan) 1994 Victor Entertainment - @@ -7053,7 +7053,7 @@ Hangs or resets after giving yes to "Is it OK?" prompt (fixed) Ys IV - The Dawn of Ys (Japan, HCD3051-4-1108-R1F) 1993 Hudson - @@ -7072,7 +7072,7 @@ Cuts off [ADPCM] playbacks, uses half irq Ys IV - The Dawn of Ys (Japan, HCD3051-5-1116-R1P) 1993 Hudson - diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index 1f5b244b833..ebf129e3ec7 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -45,7 +45,7 @@ Notes: TODO: - - serial input is not working, fails systest1600 keyboard test + - serial input is not working, fails systest1600 keyboard test */ diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 1467c4dc4c2..779e3e1fdb8 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -27,7 +27,7 @@ // ======================> abc77_device class abc77_device : public device_t, - public abc_keyboard_interface + public abc_keyboard_interface { public: // construction/destruction diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index aa758c4f9b4..340fb5bf317 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -43,8 +43,8 @@ Notes: TODO: - - watchdog clock - - output leds + - watchdog clock + - output leds */ diff --git a/src/devices/bus/c64/buscard2.cpp b/src/devices/bus/c64/buscard2.cpp index 99cd898c2cc..b6e8cf27ea7 100644 --- a/src/devices/bus/c64/buscard2.cpp +++ b/src/devices/bus/c64/buscard2.cpp @@ -63,12 +63,12 @@ DEFINE_DEVICE_TYPE(C64_BUSCARD2, c64_buscard2_device, "c64_buscard2", "C64 BusCa //------------------------------------------------- ROM_START( buscard2 ) - ROM_REGION( 0x2000, "rom", 0 ) - ROM_LOAD( "v2.12.bin", 0x0000, 0x2000, CRC(1c9b2edb) SHA1(04f0a248370281fd42389928e32d11aba597cf01) ) + ROM_REGION( 0x2000, "rom", 0 ) + ROM_LOAD( "v2.12.bin", 0x0000, 0x2000, CRC(1c9b2edb) SHA1(04f0a248370281fd42389928e32d11aba597cf01) ) - ROM_REGION( 0x200, "prom", 0 ) - ROM_LOAD( "82s129.1", 0x000, 0x100, NO_DUMP ) - ROM_LOAD( "82s129.2", 0x100, 0x100, NO_DUMP ) + ROM_REGION( 0x200, "prom", 0 ) + ROM_LOAD( "82s129.1", 0x000, 0x100, NO_DUMP ) + ROM_LOAD( "82s129.2", 0x100, 0x100, NO_DUMP ) ROM_END @@ -78,7 +78,7 @@ ROM_END const tiny_rom_entry *c64_buscard2_device::device_rom_region() const { - return ROM_NAME( buscard2 ); + return ROM_NAME( buscard2 ); } @@ -87,30 +87,30 @@ const tiny_rom_entry *c64_buscard2_device::device_rom_region() const //------------------------------------------------- static INPUT_PORTS_START( buscard2 ) - PORT_START("S1") - PORT_DIPNAME( 0x03, 0x00, "Device #4" ) PORT_DIPLOCATION("S1:1,2") - PORT_DIPSETTING( 0x00, "Serial" ) - PORT_DIPSETTING( 0x01, "Parallel w/conv." ) - PORT_DIPSETTING( 0x02, "IEEE" ) - PORT_DIPSETTING( 0x03, "Parallel" ) - PORT_DIPNAME( 0x04, 0x04, "Device #5" ) PORT_DIPLOCATION("S1:3") - PORT_DIPSETTING( 0x00, "IEEE" ) - PORT_DIPSETTING( 0x04, "Serial" ) - PORT_DIPNAME( 0x08, 0x08, "Device #6" ) PORT_DIPLOCATION("S1:4") - PORT_DIPSETTING( 0x00, "IEEE" ) - PORT_DIPSETTING( 0x08, "Serial" ) - PORT_DIPNAME( 0x10, 0x10, "Device #7" ) PORT_DIPLOCATION("S1:5") - PORT_DIPSETTING( 0x00, "IEEE" ) - PORT_DIPSETTING( 0x10, "Serial" ) - PORT_DIPNAME( 0x20, 0x20, "Device #8" ) PORT_DIPLOCATION("S1:6") - PORT_DIPSETTING( 0x00, "IEEE" ) - PORT_DIPSETTING( 0x20, "Serial" ) - PORT_DIPNAME( 0x40, 0x40, "Device #9" ) PORT_DIPLOCATION("S1:7") - PORT_DIPSETTING( 0x00, "IEEE" ) - PORT_DIPSETTING( 0x40, "Serial" ) - PORT_DIPNAME( 0x80, 0x80, "Device #10" ) PORT_DIPLOCATION("S1:8") - PORT_DIPSETTING( 0x00, "IEEE" ) - PORT_DIPSETTING( 0x80, "Serial" ) + PORT_START("S1") + PORT_DIPNAME( 0x03, 0x00, "Device #4" ) PORT_DIPLOCATION("S1:1,2") + PORT_DIPSETTING( 0x00, "Serial" ) + PORT_DIPSETTING( 0x01, "Parallel w/conv." ) + PORT_DIPSETTING( 0x02, "IEEE" ) + PORT_DIPSETTING( 0x03, "Parallel" ) + PORT_DIPNAME( 0x04, 0x04, "Device #5" ) PORT_DIPLOCATION("S1:3") + PORT_DIPSETTING( 0x00, "IEEE" ) + PORT_DIPSETTING( 0x04, "Serial" ) + PORT_DIPNAME( 0x08, 0x08, "Device #6" ) PORT_DIPLOCATION("S1:4") + PORT_DIPSETTING( 0x00, "IEEE" ) + PORT_DIPSETTING( 0x08, "Serial" ) + PORT_DIPNAME( 0x10, 0x10, "Device #7" ) PORT_DIPLOCATION("S1:5") + PORT_DIPSETTING( 0x00, "IEEE" ) + PORT_DIPSETTING( 0x10, "Serial" ) + PORT_DIPNAME( 0x20, 0x20, "Device #8" ) PORT_DIPLOCATION("S1:6") + PORT_DIPSETTING( 0x00, "IEEE" ) + PORT_DIPSETTING( 0x20, "Serial" ) + PORT_DIPNAME( 0x40, 0x40, "Device #9" ) PORT_DIPLOCATION("S1:7") + PORT_DIPSETTING( 0x00, "IEEE" ) + PORT_DIPSETTING( 0x40, "Serial" ) + PORT_DIPNAME( 0x80, 0x80, "Device #10" ) PORT_DIPLOCATION("S1:8") + PORT_DIPSETTING( 0x00, "IEEE" ) + PORT_DIPSETTING( 0x80, "Serial" ) INPUT_PORTS_END @@ -120,7 +120,7 @@ INPUT_PORTS_END ioport_constructor c64_buscard2_device::device_input_ports() const { - return INPUT_PORTS_NAME( buscard2 ); + return INPUT_PORTS_NAME( buscard2 ); } @@ -130,18 +130,18 @@ ioport_constructor c64_buscard2_device::device_input_ports() const void c64_buscard2_device::device_add_mconfig(machine_config &config) { - MOS6532_NEW(config, m_riot, 0); + MOS6532_NEW(config, m_riot, 0); - PIA6821(config, m_pia, 0); + PIA6821(config, m_pia, 0); - IEEE488(config, m_bus, 0); - ieee488_slot_device::add_cbm_defaults(config, nullptr); + IEEE488(config, m_bus, 0); + ieee488_slot_device::add_cbm_defaults(config, nullptr); - CENTRONICS(config, m_centronics, centronics_devices, nullptr); - m_centronics->busy_handler().set(FUNC(c64_buscard2_device::busy_w)); + CENTRONICS(config, m_centronics, centronics_devices, nullptr); + m_centronics->busy_handler().set(FUNC(c64_buscard2_device::busy_w)); - C64_EXPANSION_SLOT(config, m_exp, DERIVED_CLOCK(1, 1), c64_expansion_cards, nullptr); - m_exp->set_passthrough(); + C64_EXPANSION_SLOT(config, m_exp, DERIVED_CLOCK(1, 1), c64_expansion_cards, nullptr); + m_exp->set_passthrough(); } @@ -155,17 +155,17 @@ void c64_buscard2_device::device_add_mconfig(machine_config &config) //------------------------------------------------- c64_buscard2_device::c64_buscard2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, C64_BUSCARD2, tag, owner, clock), - device_c64_expansion_card_interface(mconfig, *this), - m_riot(*this, "riot"), - m_pia(*this, "pia"), - m_bus(*this, IEEE488_TAG), - m_centronics(*this, "centronics"), - m_exp(*this, "exp"), - m_s1(*this, "S1"), - m_rom(*this, "rom"), - m_prom(*this, "prom"), - m_busy(1) + device_t(mconfig, C64_BUSCARD2, tag, owner, clock), + device_c64_expansion_card_interface(mconfig, *this), + m_riot(*this, "riot"), + m_pia(*this, "pia"), + m_bus(*this, IEEE488_TAG), + m_centronics(*this, "centronics"), + m_exp(*this, "exp"), + m_s1(*this, "S1"), + m_rom(*this, "rom"), + m_prom(*this, "prom"), + m_busy(1) { } @@ -176,8 +176,8 @@ c64_buscard2_device::c64_buscard2_device(const machine_config &mconfig, const ch void c64_buscard2_device::device_start() { - // state saving - save_item(NAME(m_busy)); + // state saving + save_item(NAME(m_busy)); } @@ -196,7 +196,7 @@ void c64_buscard2_device::device_reset() uint8_t c64_buscard2_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { - return m_exp->cd_r(offset, data, sphi2, ba, roml, romh, io1, io2); + return m_exp->cd_r(offset, data, sphi2, ba, roml, romh, io1, io2); } @@ -206,7 +206,7 @@ uint8_t c64_buscard2_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2, in void c64_buscard2_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { - m_exp->cd_w(offset, data, sphi2, ba, roml, romh, io1, io2); + m_exp->cd_w(offset, data, sphi2, ba, roml, romh, io1, io2); } @@ -216,7 +216,7 @@ void c64_buscard2_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2, int b int c64_buscard2_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw) { - return m_exp->game_r(offset, sphi2, ba, rw, m_slot->loram(), m_slot->hiram()); + return m_exp->game_r(offset, sphi2, ba, rw, m_slot->loram(), m_slot->hiram()); } @@ -226,5 +226,5 @@ int c64_buscard2_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw) int c64_buscard2_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { - return m_exp->exrom_r(offset, sphi2, ba, rw, m_slot->loram(), m_slot->hiram()); + return m_exp->exrom_r(offset, sphi2, ba, rw, m_slot->loram(), m_slot->hiram()); } diff --git a/src/devices/bus/c64/buscard2.h b/src/devices/bus/c64/buscard2.h index 0121d03e97c..faa11e0a8a7 100644 --- a/src/devices/bus/c64/buscard2.h +++ b/src/devices/bus/c64/buscard2.h @@ -27,7 +27,7 @@ // ======================> c64_buscard2_device class c64_buscard2_device : public device_t, - public device_c64_expansion_card_interface + public device_c64_expansion_card_interface { public: // construction/destruction diff --git a/src/devices/bus/msx/cart/slotexpander.cpp b/src/devices/bus/msx/cart/slotexpander.cpp index 215fab148ac..1b5b791a583 100644 --- a/src/devices/bus/msx/cart/slotexpander.cpp +++ b/src/devices/bus/msx/cart/slotexpander.cpp @@ -150,7 +150,7 @@ void msx_cart_slotexpander_device::secondary_slot_w(u8 data) m_view1.select((data >> 2) & 0x03); m_view2.select((data >> 4) & 0x03); m_view3.select((data >> 6) & 0x03); - m_secondary_slot = data; + m_secondary_slot = data; } } // anonymous namespace diff --git a/src/devices/bus/msx/slot/disk.cpp b/src/devices/bus/msx/slot/disk.cpp index 42e96396fef..38f80cb3d43 100644 --- a/src/devices/bus/msx/slot/disk.cpp +++ b/src/devices/bus/msx/slot/disk.cpp @@ -1350,7 +1350,7 @@ void msx_slot_disk11_wd2793_device::control_w(u8 data) set_drive_access_led_state(0, 0); set_drive_access_led_state(1, BIT(m_control, 6)); // Wild guess based on other floppy interfaces break; - + default: m_current_floppy = nullptr; set_drive_access_led_state(0, 0); diff --git a/src/devices/bus/s100/vectordualmode.cpp b/src/devices/bus/s100/vectordualmode.cpp index 00e80cadef5..c1aec1d746a 100644 --- a/src/devices/bus/s100/vectordualmode.cpp +++ b/src/devices/bus/s100/vectordualmode.cpp @@ -116,12 +116,12 @@ uint8_t s100_vector_dualmode_device::s100_sinp_r(offs_t offset) } data = (write_protect ? 0x01 : 0) - | (ready ? 0x02 : 0) - | (track0 ? 0x04 : 0) - | (write_fault ? 0x08 : 0) - | (seek_complete ? 0x10 : 0) - | (loss_of_sync ? 0x20 : 0) - | 0xc0; + | (ready ? 0x02 : 0) + | (track0 ? 0x04 : 0) + | (write_fault ? 0x08 : 0) + | (seek_complete ? 0x10 : 0) + | (loss_of_sync ? 0x20 : 0) + | 0xc0; } else if (offset == 0xc1) { // status (1) port bool floppy_disk_selected; bool controller_busy = m_sector_timer->enabled(); @@ -135,10 +135,10 @@ uint8_t s100_vector_dualmode_device::s100_sinp_r(offs_t offset) motor_on = m_motor_on_timer->enabled(); } data = (floppy_disk_selected ? 0x01 : 0) - | (controller_busy ? 0x02 : 0) - | (motor_on ? 0x04 : 0) - | (type_of_hard_disk ? 0x08 : 0) - | 0xf0; + | (controller_busy ? 0x02 : 0) + | (motor_on ? 0x04 : 0) + | (type_of_hard_disk ? 0x08 : 0) + | 0xf0; } else if (offset == 0xc2) { // data port data = m_ram[m_cmar]; if (!machine().side_effects_disabled()) { diff --git a/src/devices/cpu/interdata16/dasm16.cpp b/src/devices/cpu/interdata16/dasm16.cpp index b47a7ba6fa6..0ebe83e99f0 100644 --- a/src/devices/cpu/interdata16/dasm16.cpp +++ b/src/devices/cpu/interdata16/dasm16.cpp @@ -32,7 +32,7 @@ interdata16_disassembler::interdata16_disassembler() u32 interdata16_disassembler::opcode_alignment() const { return 2; -} +} namespace { diff --git a/src/devices/cpu/m68000/m68000.cpp b/src/devices/cpu/m68000/m68000.cpp index cbefca3a3f4..f4f1680898c 100644 --- a/src/devices/cpu/m68000/m68000.cpp +++ b/src/devices/cpu/m68000/m68000.cpp @@ -122,7 +122,7 @@ void m68000_device::execute_run() if(m_post_run) do_post_run(); else - break; + break; } if(m_icount < 0) { @@ -405,7 +405,7 @@ void m68000_device::init_decode_table() u16 cvalue = 0; do { - // logerror("%04x/%04x %04x %4d\n", value, mask, cvalue, state); + // logerror("%04x/%04x %04x %4d\n", value, mask, cvalue, state); if(m_decode_table[value | cvalue] == S_ILLEGAL) m_decode_table[value | cvalue] = state; else if(((value | cvalue) & 0xf0ff) != 0x6000) diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index e7d24913c32..ee8c344fdb7 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -316,7 +316,7 @@ protected: m_aluo = r; } - inline void alu_and(u16 a, u16 b) { + inline void alu_and(u16 a, u16 b) { u16 r = b & a; m_isr = m_sr & SR_X; if(!r) @@ -326,7 +326,7 @@ protected: m_aluo = r; } - inline void alu_andx(u16 a, u16 b) { + inline void alu_andx(u16 a, u16 b) { u16 r = b & a; m_isr = m_sr & SR_X ? SR_X|SR_C : 0; if(!r) @@ -336,7 +336,7 @@ protected: m_aluo = r; } - inline void alu_and8(u16 a, u16 b) { + inline void alu_and8(u16 a, u16 b) { u16 r = b & a; m_isr = m_sr & SR_X; if(!(r & 0xff)) @@ -346,7 +346,7 @@ protected: m_aluo = r; } - inline void alu_and8x(u8 a, u8 b) { + inline void alu_and8x(u8 a, u8 b) { u8 r = b & a; m_isr = m_sr & SR_X ? SR_X|SR_C : 0; if(!r) @@ -356,7 +356,7 @@ protected: m_aluo = r; } - inline void alu_or(u16 a, u16 b) { + inline void alu_or(u16 a, u16 b) { u16 r = b | a; m_isr = m_sr & SR_X; if(!r) @@ -366,7 +366,7 @@ protected: m_aluo = r; } - inline void alu_or8(u8 a, u8 b) { + inline void alu_or8(u8 a, u8 b) { u8 r = b | a; m_isr = m_sr & SR_X; if(!r) @@ -376,7 +376,7 @@ protected: m_aluo = r; } - inline void alu_eor(u16 a, u16 b) { + inline void alu_eor(u16 a, u16 b) { u16 r = b ^ a; m_isr = m_sr & SR_X; if(!r) @@ -386,7 +386,7 @@ protected: m_aluo = r; } - inline void alu_eor8(u8 a, u8 b) { + inline void alu_eor8(u8 a, u8 b) { u8 r = b ^ a; m_isr = m_sr & SR_X; if(!r) @@ -396,7 +396,7 @@ protected: m_aluo = r; } - inline void alu_ext(u16 a) { + inline void alu_ext(u16 a) { u16 r = s8(a); m_isr = 0; if(!r) @@ -406,7 +406,7 @@ protected: m_aluo = r; } - inline void alu_not(u16 a) { + inline void alu_not(u16 a) { u16 r = ~a; m_isr = 0; if(!r) @@ -416,7 +416,7 @@ protected: m_aluo = r; } - inline void alu_not8(u8 a) { + inline void alu_not8(u8 a) { u8 r = ~a; m_isr = 0; if(!r) @@ -513,7 +513,7 @@ protected: m_isr |= SR_X|SR_C; if((r & 0x80) && !(r1 & 0x80)) m_isr |= SR_V; - m_aluo = r; + m_aluo = r; } inline void alu_sbcd8(u8 a, u8 b) { @@ -533,7 +533,7 @@ protected: m_isr |= SR_X|SR_C; if(!(r & 0x80) && (r1 & 0x80)) m_isr |= SR_V; - m_aluo = r; + m_aluo = r; } inline void alu_sla0(u16 a) { diff --git a/src/devices/cpu/m68000/m68000.lst b/src/devices/cpu/m68000/m68000.lst index 0c39aa8e84e..7de86766341 100644 --- a/src/devices/cpu/m68000/m68000.lst +++ b/src/devices/cpu/m68000/m68000.lst @@ -55,7 +55,7 @@ 01b8 f1ff bclr dd adr16 01b9 f1ff bclr dd adr32 01c0 f1f8 bset dd ds -01c8 f1f8 movep.l dd das +01c8 f1f8 movep.l dd das 01d0 f1f8 bset dd ais 01d8 f1f8 bset dd aips 01e0 f1f8 bset dd pais diff --git a/src/devices/cpu/mips/mips1.h b/src/devices/cpu/mips/mips1.h index 36c591b92b9..78e9b3808e2 100644 --- a/src/devices/cpu/mips/mips1.h +++ b/src/devices/cpu/mips/mips1.h @@ -165,7 +165,7 @@ protected: // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; virtual bool memory_translate(int spacenum, int intention, offs_t &address, address_space *&target_space) override; - bool memory_translate(int intention, offs_t &address, bool debug); + bool memory_translate(int intention, offs_t &address, bool debug); // device_disasm_interface overrides virtual std::unique_ptr create_disassembler() override; diff --git a/src/devices/cpu/nec/necinstr.hxx b/src/devices/cpu/nec/necinstr.hxx index 6854642a6d8..11abacbedb0 100644 --- a/src/devices/cpu/nec/necinstr.hxx +++ b/src/devices/cpu/nec/necinstr.hxx @@ -46,7 +46,7 @@ OP( 0x0f, i_pre_nec ) { uint32_t ModRM, tmp, tmp2; case 0x31 : // INS reg1,reg2 ModRM = fetch(); tmp = GetRMByte(0xc0 | (ModRM & 7)) & 0x0f; - tmp2 = (GetRMByte(0xc0 |(ModRM >> 3) & 7) & 0x0f) + 1; + tmp2 = (GetRMByte(0xc0 | ((ModRM >> 3) & 7)) & 0x0f) + 1; PutMemW(DS1, Wreg(IY), (GetMemW(DS1, Wreg(IY)) & ~(((1 << tmp2) - 1) << tmp)) | ((Wreg(AW) & ((1 << tmp2) - 1)) << tmp)); if (tmp + tmp2 > 15) { Wreg(IY) += 2; @@ -68,7 +68,7 @@ OP( 0x0f, i_pre_nec ) { uint32_t ModRM, tmp, tmp2; case 0x33 : // EXT reg1,reg2 ModRM = fetch(); tmp = GetRMByte(0xc0 | (ModRM & 7)) & 0x0f; - tmp2 = (GetRMByte(0xc0 |(ModRM >> 3) & 7) & 0x0f) + 1; + tmp2 = (GetRMByte(0xc0 | ((ModRM >> 3) & 7)) & 0x0f) + 1; Wreg(AW) = GetMemW(DS0, Wreg(IX)) >> tmp; if (tmp + tmp2 > 15) { Wreg(IX) += 2; diff --git a/src/devices/cpu/z180/z180csio.cpp b/src/devices/cpu/z180/z180csio.cpp index 08a437ec547..20c230f76b7 100644 --- a/src/devices/cpu/z180/z180csio.cpp +++ b/src/devices/cpu/z180/z180csio.cpp @@ -207,7 +207,7 @@ WRITE_LINE_MEMBER(z180csio_device::cks_wr) if (m_cks_in != state) { m_cks_in = state; - if ((m_cntr & Z180_CNTR_SS) == 0x07) + if ((m_cntr & Z180_CNTR_SS) == 0x07) clock_edge(m_cks_in); } } diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp index 4b63f068df9..3297f3a4242 100644 --- a/src/devices/machine/e0516.cpp +++ b/src/devices/machine/e0516.cpp @@ -123,7 +123,7 @@ WRITE_LINE_MEMBER( e0516_device::cs_w ) if ((m_state == STATE_DATA_WRITE) && (m_bits_left == 0) && (get_address() != 7)) { LOG("E05-16 '%s' Write Register %u : %02x\n", tag(), get_address(), m_data_latch); - + // write latched data to register set_clock_register(get_address(), bcd_to_integer(m_data_latch)); } @@ -167,7 +167,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w ) m_bits_left--; if ((m_state == STATE_DATA_READ) && (m_bits_left == 56) && !m_read_outsel()) return; - + if (m_state == STATE_ADDRESS) { LOG("E05-16 '%s' Command Bit %u\n", tag(), m_dio); @@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w ) if (BIT(m_reg_latch, 0)) { m_state = STATE_DATA_READ; - + if (get_address() == 7) { LOG("E05-16 '%s' Continuous Read-Out Mode\n", tag()); @@ -320,7 +320,7 @@ WRITE_LINE_MEMBER( e0516_device::dio_w ) READ_LINE_MEMBER( e0516_device::dio_r ) { if (m_cs || (m_state == STATE_HI_Z)) - { + { // high impedance return 0; } diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h index 190d8fa07ca..2168060f535 100644 --- a/src/devices/machine/e0516.h +++ b/src/devices/machine/e0516.h @@ -51,7 +51,7 @@ protected: TIMER_CALLBACK_MEMBER(timer_tick); - devcb_read_line m_read_outsel; + devcb_read_line m_read_outsel; devcb_write_line m_write_sec; devcb_write_line m_write_min; devcb_write_line m_write_hrs; diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp index 021979a68d6..ee8aa508a83 100644 --- a/src/devices/machine/pccard.cpp +++ b/src/devices/machine/pccard.cpp @@ -100,7 +100,7 @@ uint8_t pccard_slot_device::read_memory_byte(offs_t offset) if (BIT(offset, 0)) data = m_pccard->read_memory(offset / 2, 0xff00) >> 8; else - data = m_pccard->read_memory(offset / 2, 0x00ff) >> 0; + data = m_pccard->read_memory(offset / 2, 0x00ff) >> 0; } return data; @@ -115,7 +115,7 @@ uint8_t pccard_slot_device::read_reg_byte(offs_t offset) if (BIT(offset, 0)) data = m_pccard->read_reg(offset / 2, 0xff00) >> 8; else - data = m_pccard->read_reg(offset / 2, 0x00ff) >> 0; + data = m_pccard->read_reg(offset / 2, 0x00ff) >> 0; } return data; diff --git a/src/devices/machine/psion_asic5.cpp b/src/devices/machine/psion_asic5.cpp index 8bd69f7e776..9e002b6f4af 100644 --- a/src/devices/machine/psion_asic5.cpp +++ b/src/devices/machine/psion_asic5.cpp @@ -158,8 +158,8 @@ void psion_asic5_device::data_w(uint16_t data) break; //case 0x07: // Control register - // m = data; - // break; + // m = data; + // break; default: LOG("%s data_w: unknown control %02x data %02x\n", machine().describe_context(), m_sibo_control, data); @@ -211,8 +211,8 @@ uint8_t psion_asic5_device::data_r() break; //case 0x07: // Control register - // m = data; - // break; + // m = data; + // break; default: LOG("%s data_r: unknown control %02x data %02x\n", machine().describe_context(), m_sibo_control, data); diff --git a/src/devices/machine/psion_asic9.cpp b/src/devices/machine/psion_asic9.cpp index 3f78e177dc3..13584e0049d 100644 --- a/src/devices/machine/psion_asic9.cpp +++ b/src/devices/machine/psion_asic9.cpp @@ -406,10 +406,10 @@ bool psion_asic9_device::is_protected(offs_t offset) { //if (m_a9_protection_mode && (offset <= m_a9_protection_lower || offset > m_a9_protection_upper)) //{ - // LOG("%s is_protected: %05x < %05x <= %05x\n", machine().describe_context(), m_a9_protection_lower, offset, m_a9_protection_upper); - // m_a9_status |= 0x0002; // A9MProtectedModeNMI - // update_interrupts(); - // return true; + // LOG("%s is_protected: %05x < %05x <= %05x\n", machine().describe_context(), m_a9_protection_lower, offset, m_a9_protection_upper); + // m_a9_status |= 0x0002; // A9MProtectedModeNMI + // update_interrupts(); + // return true; //} return false; } diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp index 0dd1b3ee449..92708f48321 100644 --- a/src/devices/sound/cdda.cpp +++ b/src/devices/sound/cdda.cpp @@ -193,7 +193,7 @@ void cdda_device::get_audio_data(write_stream_view &bufL, write_stream_view &buf { /* CD-DA data on the disc is big-endian */ m_audio_data[0] = s16(big_endianize_int16( audio_cache[ m_audio_bptr ] )); - bufL.put_int(sampindex + i, m_audio_data[0], 32768); + bufL.put_int(sampindex + i, m_audio_data[0], 32768); m_audio_bptr++; m_audio_data[1] = s16(big_endianize_int16( audio_cache[ m_audio_bptr ] )); bufR.put_int(sampindex + i, m_audio_data[1], 32768); diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.cpp b/src/devices/sound/l7a1045_l6028_dsp_a.cpp index 2efa232b572..e2e7287ed93 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.cpp +++ b/src/devices/sound/l7a1045_l6028_dsp_a.cpp @@ -78,14 +78,14 @@ TODO: - Sample format needs to be double checked; - Octave Control/BPM/Pitch, xrally Network BGM wants 66150 Hz which is definitely too fast for - most fatfurwa samples; + most fatfurwa samples; - Key Off for looping samples (fatfurwa should stop all samples when user insert a credit, cfr. reg[0] readback); - Most non-looping samples are setup to repeat twice on different channels (cfr. fatfurwa); - Fix relative sample end positions (non-loop); - ADSR (registers 2 & 4?); - How DMA really works? - + **************************************************************************************************/ #include "emu.h" @@ -125,7 +125,7 @@ void l7a1045_sound_device::device_start() assert(!(m_rom.length() & (m_rom.length() - 1))); // Allocate the stream -// m_stream = stream_alloc(0, 2, 66150); //clock() / 384); +// m_stream = stream_alloc(0, 2, 66150); //clock() / 384); // TODO: confirm frequency m_stream = stream_alloc(0, 2, 44100); @@ -350,7 +350,7 @@ uint16_t l7a1045_sound_device::sound_data_r(offs_t offset) // TODO: fatfurwa reads offset == 2, ANDs with 0xf and compares against a sample buffer value if it's bigger, smaller or equal // Returning 0xffff here for looping samples and they will silence out when user insert a coin ... - + current_addr = vptr->start + vptr->pos; if(offset == 0) res = (current_addr & 0xf) << 12; // TODO: frac diff --git a/src/emu/emumem_hedr.ipp b/src/emu/emumem_hedr.ipp index c6f965d378e..4ddf2d8ede1 100644 --- a/src/emu/emumem_hedr.ipp +++ b/src/emu/emumem_hedr.ipp @@ -489,7 +489,7 @@ template void handler_entry_read_dispatc mappings.emplace_back(mapping{ original, replacement }); target->unref(); target = replacement; - + } else { // New one goes under the old one // both are passthrough and new one has lower priority @@ -498,7 +498,7 @@ template void handler_entry_read_dispatc handler_entry_read *recursive = static_cast *>(original)->get_subhandler(); recursive->ref(); - + passthrough_patch(handler, mappings, recursive); handler_entry_read *replacement = static_cast *>(original)->instantiate(recursive); diff --git a/src/emu/emumem_hedw.ipp b/src/emu/emumem_hedw.ipp index 3f473d914e8..37c09ccfe11 100644 --- a/src/emu/emumem_hedw.ipp +++ b/src/emu/emumem_hedw.ipp @@ -489,7 +489,7 @@ template void handler_entry_write_dispat mappings.emplace_back(mapping{ original, replacement }); target->unref(); target = replacement; - + } else { // New one goes under the old one // both are passthrough and new one has lower priority @@ -498,7 +498,7 @@ template void handler_entry_write_dispat handler_entry_write *recursive = static_cast *>(original)->get_subhandler(); recursive->ref(); - + passthrough_patch(handler, mappings, recursive); handler_entry_write *replacement = static_cast *>(original)->instantiate(recursive); diff --git a/src/lib/formats/lw30_dsk.cpp b/src/lib/formats/lw30_dsk.cpp index 1818453ce1d..36427b8bb26 100644 --- a/src/lib/formats/lw30_dsk.cpp +++ b/src/lib/formats/lw30_dsk.cpp @@ -2,8 +2,8 @@ // copyright-holders:Bartman/Abyss /*************************************************************************** - Brother LW-30 Disk image format - see https://github.com/BartmanAbyss/brother-diskconv for disk conversion tool + Brother LW-30 Disk image format + see https://github.com/BartmanAbyss/brother-diskconv for disk conversion tool ***************************************************************************/ #include "lw30_dsk.h" diff --git a/src/lib/formats/lw30_dsk.h b/src/lib/formats/lw30_dsk.h index ec5dff380b1..54a370f804a 100644 --- a/src/lib/formats/lw30_dsk.h +++ b/src/lib/formats/lw30_dsk.h @@ -2,8 +2,8 @@ // copyright-holders:Bartman/Abyss /*************************************************************************** - Brother LW-30 Disk image format - see https://github.com/BartmanAbyss/brother-diskconv for disk conversion tool + Brother LW-30 Disk image format + see https://github.com/BartmanAbyss/brother-diskconv for disk conversion tool ***************************************************************************/ #ifndef MAME_FORMATS_LW30_DSK_H diff --git a/src/mame/apple/heathrow.cpp b/src/mame/apple/heathrow.cpp index e16911a20c4..83c06520d62 100644 --- a/src/mame/apple/heathrow.cpp +++ b/src/mame/apple/heathrow.cpp @@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE(GRAND_CENTRAL, grandcentral_device, "grndctrl", "Apple Grand 15000 : IWM/SWIM 10000 : SCSI - DMA is at 8xxx (audio DMA at 88xx) + DMA is at 8xxx (audio DMA at 88xx) ATA is at 20000 */ void heathrow_device::map(address_map &map) diff --git a/src/mame/apple/macii.cpp b/src/mame/apple/macii.cpp index a2488b7e487..bc55873f9d2 100644 --- a/src/mame/apple/macii.cpp +++ b/src/mame/apple/macii.cpp @@ -4,12 +4,12 @@ mac.cpp Macintosh II ("Becks, Cabernet, Ikki, Little Big Mac, Paris, Reno, Uzi, Milwaukee") - Macintosh II FDHD (Codenames not known) - Macintosh IIx ("Spock, Stratos") - Macintosh IIcx ("Atlantic, Cobra, Aurora") - Macintosh SE/30 ("Fafnir, Green Jade") + Macintosh II FDHD (Codenames not known) + Macintosh IIx ("Spock, Stratos") + Macintosh IIcx ("Atlantic, Cobra, Aurora") + Macintosh SE/30 ("Fafnir, Green Jade") - Driver by R. Belmont and O. Galibert, based on work by Nathan Woods, Ernesto Corvi, and Raphael Nabet + Driver by R. Belmont and O. Galibert, based on work by Nathan Woods, Ernesto Corvi, and Raphael Nabet ****************************************************************************/ @@ -269,7 +269,7 @@ void mac_state::mac_install_memory(offs_t memory_begin, offs_t memory_end, } /* - Interrupt handling + Interrupt handling */ void mac_state::field_interrupts() @@ -383,8 +383,8 @@ Here's an example of the address expressed in binary: 0101 1000 0000 00d0 0rrr 000n Note: Asserting the DACK signal applies only to write operations to - the output data register and read operations from the input - data register. + the output data register and read operations from the input + data register. Symbolic Memory Location Location NCR 5380 Internal Register @@ -408,7 +408,7 @@ Note: Asserting the DACK signal applies only to write operations to scsiRd+sBSR $580050 Bus and Status Register scsiRd+sIDR $580060 Input Data Register scsiRd+sRESET $580070 Reset Parity/Interrupt - */ + */ uint16_t mac_state::macplus_scsi_r(offs_t offset, uint16_t mem_mask) { diff --git a/src/mame/atari/stkbd.cpp b/src/mame/atari/stkbd.cpp index d1b9988c9a3..40a44f8ab99 100644 --- a/src/mame/atari/stkbd.cpp +++ b/src/mame/atari/stkbd.cpp @@ -179,7 +179,7 @@ uint8_t st_kbd_device::port4_r() { // bit description // 0-3 JOY 0 or mouse XB/XA/YA/YB - // 4-7 JOY 1 + // 4-7 JOY 1 if(m_joy_disabled) return 0xff; diff --git a/src/mame/atari/stmmu.cpp b/src/mame/atari/stmmu.cpp index 046a7a27cc8..3769fddd57e 100644 --- a/src/mame/atari/stmmu.cpp +++ b/src/mame/atari/stmmu.cpp @@ -164,11 +164,11 @@ void st_mmu_device::dma_mode_w(uint16_t data) m_dma_mode & MODE_SECTOR_COUNT ? 'C' : '.', m_dma_mode & MODE_FDC_HDC_CS ? 'h' : 'f', (m_dma_mode >> 1) & 3); - + while(m_fdc_drq && (m_dma_mode & MODE_FDC_HDC_ACK)) fdc_transfer(); while(m_hdc_drq && !(m_dma_mode & MODE_FDC_HDC_ACK)) - hdc_transfer(); + hdc_transfer(); } uint8_t st_mmu_device::dma_address_h_r() @@ -311,11 +311,11 @@ void st_mmu_device::fifo_schedule_block_transfer_from_ram() logerror("%s\n", l); } } - + if(m_block_count == 32) { m_block_count = 0; m_sector_count --; - } + } } diff --git a/src/mame/atari/stvideo.cpp b/src/mame/atari/stvideo.cpp index 73adbcd53f9..71f15d5c94b 100644 --- a/src/mame/atari/stvideo.cpp +++ b/src/mame/atari/stvideo.cpp @@ -202,7 +202,7 @@ phase 3 phase 1: - left border on ste? + left border on ste? [:video] [454400 28400 13309964 112/420 000/221 s:h- de:-v- 50Hz] glue sync [:video] [454399 28399 13309963 111/420 000/222 s:-- de:-v- 71Hz] glue sync @@ -210,7 +210,7 @@ phase 1: [:video] [454431 28401 13309965 113/420 002/222 s:-- de:-v- 50Hz] glue sync [:video] [454431 28401 13309965 113/420 002/222 s:-- de:-v- 50Hz] res = 0 (0) - +2 on ws1/ws3 but not on ws2/ws4. move, exg, move. test at hdec=16 + +2 on ws1/ws3 but not on ws2/ws4. move, exg, move. test at hdec=16 [:video] [454575 28410 13309974 122/420 011/222 s:-- de:-v- 60Hz] glue sync [:video] [454575 28410 13309974 122/420 011/222 s:-- de:-v- 60Hz] sync = 0 (1) @@ -219,7 +219,7 @@ phase 1: [:video] [454656 28416 13309980 128/420 017/222 s:-- de:-v- 50Hz] glue sync [:video] [454656 28416 13309980 000/421 017/222 s:-- de:-v- 50Hz] hde 1 - screen stop on ws2, test at hdec=44 + screen stop on ws2, test at hdec=44 [:video] [455087 28442 13310006 026/421 043/222 s:-- de:hvd 71Hz] glue sync [:video] [455087 28442 13310006 026/421 043/222 s:-- de:hvd 71Hz] res = 2 (2) @@ -230,7 +230,7 @@ phase 1: [:video] [455119 28444 13310008 028/421 045/222 s:-- de:-v- 50Hz] glue sync [:video] [455119 28444 13310008 028/421 045/222 s:-- de:-v- 50Hz] res = 0 (0) - right border is still active, test at hdec=97 + right border is still active, test at hdec=97 [:video] [455927 28495 13310059 079/421 096/222 s:-- de:-v- 71Hz] glue sync [:video] [455927 28495 13310059 079/421 096/222 s:-- de:-v- 71Hz] res = 2 (2) @@ -240,7 +240,7 @@ phase 1: -> detect as ws2 - phase ? + phase ? [:video] [454407 28400 53239859 53239860 112/420 001/222 s:-- de:-v- 71Hz] glue sync [:video] [454407 28400 53239859 53239860 112/420 001/222 s:-- de:-v- 71Hz] res = 2 (2) @@ -482,7 +482,7 @@ void st_video_device::de_set(bool level) m_load_end = (now & ~15) + 16 + 8; if(v) - logerror("%s de %d lc=%d le=%d delta=%d\n", context(now), m_de, m_load_current/4, m_load_end/4, m_load_current - now); + logerror("%s de %d lc=%d le=%d delta=%d\n", context(now), m_de, m_load_current/4, m_load_end/4, m_load_current - now); } TIMER_CALLBACK_MEMBER(st_video_device::de_event) @@ -548,7 +548,7 @@ void st_video_device::shifter_handle_load() if(v) logerror("%s load rd=%x adr=%06x\n", context(m_shifter_update_time), m_rdelay, m_adr_live); - } + } if(m_reload) { if(v) @@ -602,7 +602,7 @@ void st_video_device::shifter_sync(u64 now) x += 2; m_shifter_update_time += 4; } - + break; } @@ -631,7 +631,7 @@ void st_video_device::shifter_sync(u64 now) x += 1; m_shifter_update_time += 2; } - + break; } @@ -653,7 +653,7 @@ void st_video_device::shifter_sync(u64 now) x += 1; m_shifter_update_time += 1; } - + break; } } @@ -872,7 +872,7 @@ void st_video_device::glue_determine_next_event() logerror("%s next hsc %d hdec %d targetting %d.%d\n", context(), hsc_next, hdec_next, gt >> 1, gt & 1); } - next_event(((glue_tick + delta) << 3) + m_phase->read() - 32); + next_event(((glue_tick + delta) << 3) + m_phase->read() - 32); } TIMER_CALLBACK_MEMBER(st_video_device::timer_event) @@ -917,12 +917,12 @@ u8 st_video_device::adr_live_l_r() { shifter_sync(); logerror("%s adr %06x - %06x\n", context(), m_adr_base, m_adr_live); - u32 pc = machine().root_device().subdevice("m68000")->pcbase(); - if(pc == 0x8644) - v = false; // level 16 - if(pc == 0x84f0) - v = false; // main menu - // v = true; + u32 pc = machine().root_device().subdevice("m68000")->pcbase(); + if(pc == 0x8644) + v = false; // level 16 + if(pc == 0x84f0) + v = false; // main menu + // v = true; return m_adr_live; } diff --git a/src/mame/atari/stvideo.h b/src/mame/atari/stvideo.h index 72e95c39888..9e66a5f9276 100644 --- a/src/mame/atari/stvideo.h +++ b/src/mame/atari/stvideo.h @@ -86,7 +86,7 @@ private: u8 res_r(); void palette_w(offs_t offset, u16 data, u16 mem_mask); - u16 palette_r(offs_t offset); + u16 palette_r(offs_t offset); void hsync_on(); void hsync_off(u64 glue_tick); diff --git a/src/mame/capcom/mitchell.cpp b/src/mame/capcom/mitchell.cpp index 823bbfb82f9..f743395de5b 100644 --- a/src/mame/capcom/mitchell.cpp +++ b/src/mame/capcom/mitchell.cpp @@ -465,7 +465,7 @@ void mstworld_state::gfxctrl_w(uint8_t data) { logerror("PC %04x: gfxctrl_w %02x\n", m_maincpu->pc(), data); - // popmessage("%02x", data); + // popmessage("%02x", data); // bit 0 is unknown (used, maybe back color enable?) diff --git a/src/mame/luxor/abc1600.cpp b/src/mame/luxor/abc1600.cpp index ea623af4247..d62b677f5dc 100644 --- a/src/mame/luxor/abc1600.cpp +++ b/src/mame/luxor/abc1600.cpp @@ -36,20 +36,20 @@ TODO: - - systest1600 failures - - CIO timer - - RTC (seconds advance too slowly) - - DMA - - bootpar writes console bauds without high order byte (9600=>128) + - systest1600 failures + - CIO timer + - RTC (seconds advance too slowly) + - DMA + - bootpar writes console bauds without high order byte (9600=>128) - loadsys1 core dump (/etc/mkfs -b 1024 -v 69000 /dev/sa40) - - crashes after reset + - crashes after reset - CIO - optimize timers! - connect RS-232 printer port - Z80 SCC/DART interrupt chain - [:2a:chb] - TX FIFO is full, discarding data - [:] SCC write 000003 - [:2a:chb] void z80scc_channel::data_write(uint8_t): Data Register Write: 17 ' ' + [:] SCC write 000003 + [:2a:chb] void z80scc_channel::data_write(uint8_t): Data Register Write: 17 ' ' */ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 0f2e5e5b354..64e97a82ca9 100755 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -14805,7 +14805,7 @@ lw840 // Brother LW-840ic (c) 1997 Brother Industries, anzterm // Burroughs EF315-I220 @source:burroughs/td831.cpp -td831 // (c) 1976 Burroughs +td831 // (c) 1976 Burroughs @source:camputers/camplynx.cpp lynx128k // diff --git a/src/mame/misc/brglitz.cpp b/src/mame/misc/brglitz.cpp index 59afb59bfac..810ddcd2265 100644 --- a/src/mame/misc/brglitz.cpp +++ b/src/mame/misc/brglitz.cpp @@ -35,7 +35,7 @@ | |M74HC373B1 | | __________ | | : |M74HC373B1 __________ _____| - | : CN11 |M74HC373B1 |o o || + | : CN11 |M74HC373B1 |o o || | : __________ __________ |o o |CN10 | : |M74HC244B1 |M74HC373B1 __________ |o_o_|| | : |M74HC373B1 ___ | @@ -95,7 +95,7 @@ #include "speaker.h" -namespace +namespace { class brglitz_state : public driver_device diff --git a/src/mame/misc/playcenter.cpp b/src/mame/misc/playcenter.cpp index c2831519739..80edd670164 100644 --- a/src/mame/misc/playcenter.cpp +++ b/src/mame/misc/playcenter.cpp @@ -12,8 +12,8 @@ VT82C686A, built-in SoundBlaster Pro with AC'97 codec support). -Unknown RAM size, AMD K6 processor (unknown speed). -PCI Ethernet card (unknown chipset). - -Trident Blade3D/MVP4 AGP video. - -Elo Touch CTR-231000 touch screen (87C51-based, undumped). + -Trident Blade3D/MVP4 AGP video. + -Elo Touch CTR-231000 touch screen (87C51-based, undumped). "K6" version: -Unknown AMD K6 CPU based hardware. "Celeron" version: diff --git a/src/mame/nintendo/n64_v.cpp b/src/mame/nintendo/n64_v.cpp index 7d986c36792..ff7ae8e708c 100644 --- a/src/mame/nintendo/n64_v.cpp +++ b/src/mame/nintendo/n64_v.cpp @@ -1445,15 +1445,15 @@ std::string n64_rdp::disassemble(const uint64_t *cmd_buf) case 0x0a: // Tri_Tex { const int32_t lft = (cmd_buf[0] >> 55) & 0x1; - buffer << disassemble_vertices("Tri_Tex", lft, cmd_buf); - buffer << disassemble_stw(cmd_buf); + buffer << disassemble_vertices("Tri_Tex", lft, cmd_buf); + buffer << disassemble_stw(cmd_buf); break; } case 0x0b: // Tri_TexZ { const int32_t lft = (cmd_buf[0] >> 55) & 0x1; buffer << disassemble_vertices("Tri_TexZ", lft, cmd_buf); - buffer << disassemble_stw(cmd_buf); + buffer << disassemble_stw(cmd_buf); break; } case 0x0c: // Tri_Shade @@ -1475,7 +1475,7 @@ std::string n64_rdp::disassemble(const uint64_t *cmd_buf) const int32_t lft = (cmd_buf[0] >> 23) & 0x1; buffer << disassemble_vertices("Tri_TexShade", lft, cmd_buf); buffer << disassemble_rgb(cmd_buf); - buffer << disassemble_stw(cmd_buf); + buffer << disassemble_stw(cmd_buf); break; } case 0x0f: // Tri_TexShadeZ @@ -1483,7 +1483,7 @@ std::string n64_rdp::disassemble(const uint64_t *cmd_buf) const int32_t lft = (cmd_buf[0] >> 23) & 0x1; buffer << disassemble_vertices("Tri_TexShadeZ", lft, cmd_buf); buffer << disassemble_rgb(cmd_buf); - buffer << disassemble_stw(cmd_buf); + buffer << disassemble_stw(cmd_buf); break; } case 0x24: diff --git a/src/mame/psion/psion3a.cpp b/src/mame/psion/psion3a.cpp index 71ad5126654..f0d92278dd1 100644 --- a/src/mame/psion/psion3a.cpp +++ b/src/mame/psion/psion3a.cpp @@ -227,10 +227,10 @@ INPUT_PORTS_END //static INPUT_PORTS_START( psion3c_de ) -// PORT_INCLUDE(psion3a_de) +// PORT_INCLUDE(psion3a_de) // -// PORT_MODIFY("COL2") -// PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9)) PORT_NAME("Notiz") +// PORT_MODIFY("COL2") +// PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9)) PORT_NAME("Notiz") //INPUT_PORTS_END diff --git a/src/mame/seibu/bloodbro_ms.cpp b/src/mame/seibu/bloodbro_ms.cpp index 9f8de8d6fef..f61a8843110 100644 --- a/src/mame/seibu/bloodbro_ms.cpp +++ b/src/mame/seibu/bloodbro_ms.cpp @@ -151,13 +151,13 @@ static const gfx_layout tiles16x16x4_layout = static const gfx_layout tiles8x8x4_layout = { - 8,8, - RGN_FRAC(1,1), - 4, - { 0,8,16,24 }, - { 0,1,2,3,4,5,6,7 }, - { STEP8(0,32) }, - 16 * 16 + 8,8, + RGN_FRAC(1,1), + 4, + { 0,8,16,24 }, + { 0,1,2,3,4,5,6,7 }, + { STEP8(0,32) }, + 16 * 16 }; static GFXDECODE_START( gfx_bloodbro_ms ) diff --git a/src/mame/shared/xbox_pci.cpp b/src/mame/shared/xbox_pci.cpp index f6f55af9bba..a097e049ad2 100644 --- a/src/mame/shared/xbox_pci.cpp +++ b/src/mame/shared/xbox_pci.cpp @@ -510,23 +510,23 @@ void mcpx_isalpc_device::set_virtual_line(int line, int state) return; } // support up to 8 drq lines - line = line - 16; - if (line < 8) - { - switch (line) - { - case 0: + line = line - 16; + if (line < 8) + { + switch (line) + { + case 0: m_dma8237_1->dreq0_w(state); - break; - case 1: + break; + case 1: m_dma8237_1->dreq1_w(state); - break; - case 2: + break; + case 2: m_dma8237_1->dreq2_w(state); - break; - case 3: + break; + case 3: m_dma8237_1->dreq3_w(state); - break; + break; case 5: m_dma8237_2->dreq1_w(state); break; @@ -537,7 +537,7 @@ void mcpx_isalpc_device::set_virtual_line(int line, int state) m_dma8237_2->dreq3_w(state); break; } - } + } // next would be the 8 dack lines line = line - 8; } diff --git a/src/mame/shared/xbox_pci.h b/src/mame/shared/xbox_pci.h index d8b64e33543..6638df3c54d 100644 --- a/src/mame/shared/xbox_pci.h +++ b/src/mame/shared/xbox_pci.h @@ -160,7 +160,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irq14); DECLARE_WRITE_LINE_MEMBER(irq15); DECLARE_WRITE_LINE_MEMBER(dma2_hreq_w) { m_dma8237_2->hack_w(state); } - DECLARE_WRITE_LINE_MEMBER(dma1_eop_w) { m_dma_eop = state; if (m_dma_channel != -1) signal_dma_end(m_dma_channel, state & 1); } + DECLARE_WRITE_LINE_MEMBER(dma1_eop_w) { m_dma_eop = state; if (m_dma_channel != -1) signal_dma_end(m_dma_channel, state & 1); } DECLARE_WRITE_LINE_MEMBER(dma1_dack0_w) { set_dma_channel(0, state); } DECLARE_WRITE_LINE_MEMBER(dma1_dack1_w) { set_dma_channel(1, state); } DECLARE_WRITE_LINE_MEMBER(dma1_dack2_w) { set_dma_channel(2, state); } diff --git a/src/mame/sinclair/neogs.cpp b/src/mame/sinclair/neogs.cpp index 7b1be94a31a..290e9e67ecb 100644 --- a/src/mame/sinclair/neogs.cpp +++ b/src/mame/sinclair/neogs.cpp @@ -2,7 +2,7 @@ // copyright-holders:Andrei I. Holub /******************************************************************************************* - Sound card NeoGS appropriate for playing trackers (MOD) and compressed (MP3) music on + Sound card NeoGS appropriate for playing trackers (MOD) and compressed (MP3) music on Spectrum-compatible computers with ZXBUS slot. Hardware: @@ -19,9 +19,9 @@ Hardware: - Parallel working (NeoGS play music independently from ZX). Refs: - http://nedopc.com/gs/ngs_eng.php - https://github.com/psbhlw/gs-firmware - https://8bit.yarek.pl/interface/zx.generalsound/index.html + http://nedopc.com/gs/ngs_eng.php + https://github.com/psbhlw/gs-firmware + https://8bit.yarek.pl/interface/zx.generalsound/index.html TODO: - ZXBUS @@ -166,7 +166,7 @@ const tiny_rom_entry *neogs_device::device_rom_region() const void neogs_device::device_start() { if (!m_ram->started()) - throw device_missing_dependencies(); + throw device_missing_dependencies(); memory_region *rom = memregion("maincpu"); m_bank_rom->configure_entries(0, rom->bytes() / 0x8000, rom->base(), 0x8000); diff --git a/src/mame/vectorgraphic/v4_kbd.cpp b/src/mame/vectorgraphic/v4_kbd.cpp index f77aaf4fece..0f400af7326 100644 --- a/src/mame/vectorgraphic/v4_kbd.cpp +++ b/src/mame/vectorgraphic/v4_kbd.cpp @@ -15,107 +15,107 @@ PCB 251 Doesn't say Key Tronic, but clearly Key Tronic. Row 1 -1 help -2 F1 -3 F2 -4 F3 -5 F4 -6 F5 -7 F6 -8 F7 -9 F8 -10 F9 -11 F10 -12 F11 -13 F12 -14 F13 -15 F14 -16 up -17 down -18 left -19 right +1 help +2 F1 +3 F2 +4 F3 +5 F4 +6 F5 +7 F6 +8 F7 +9 F8 +10 F9 +11 F10 +12 F11 +13 F12 +14 F13 +15 F14 +16 up +17 down +18 left +19 right Row 2 -20 esc -21 1 -22 2 -23 3 -24 4 -25 5 -26 6 -27 7 -28 8 -29 9 -30 0 -31 - -32 = -33 ` -34 del -35 10-key 7 -36 10-key 8 -37 10-key 9 -38 10-key - +20 esc +21 1 +22 2 +23 3 +24 4 +25 5 +26 6 +27 7 +28 8 +29 9 +30 0 +31 - +32 = +33 ` +34 del +35 10-key 7 +36 10-key 8 +37 10-key 9 +38 10-key - Row 3 -39 tab -40 q -41 w -42 e -43 r -44 t -45 y -46 u -47 i -48 o -49 p -50 [ -51 ] -52 backspace -53 10-key 4 -54 10-key 5 -55 10-key 6 -56 10-key , +39 tab +40 q +41 w +42 e +43 r +44 t +45 y +46 u +47 i +48 o +49 p +50 [ +51 ] +52 backspace +53 10-key 4 +54 10-key 5 +55 10-key 6 +56 10-key , Row 4 -57 ctrl -58 caps lock -59 a -60 s -61 d -62 f -63 g -64 h -65 j -66 k -67 l -68 ; -69 ' -70 return -71 \ -72 10-key 1 -73 10-key 2 -74 10-key 3 +57 ctrl +58 caps lock +59 a +60 s +61 d +62 f +63 g +64 h +65 j +66 k +67 l +68 ; +69 ' +70 return +71 \ +72 10-key 1 +73 10-key 2 +74 10-key 3 Row 5 -75 left shift -76 z -77 x -78 c -79 v -80 b -81 n -82 m -83 , -84 . -85 / -86 right shift -87 line feed -88 10-key 0 -89 10-key . -90 10-key enter +75 left shift +76 z +77 x +78 c +79 v +80 b +81 n +82 m +83 , +84 . +85 / +86 right shift +87 line feed +88 10-key 0 +89 10-key . +90 10-key enter Row 6 -91 space +91 space 1. https://archive.org/details/7200-0001-vector-4-technical-information-sep-82 diff --git a/src/osd/sdl/android_main.cpp b/src/osd/sdl/android_main.cpp index e4b7a81ea25..00879ecbe27 100644 --- a/src/osd/sdl/android_main.cpp +++ b/src/osd/sdl/android_main.cpp @@ -5,7 +5,7 @@ extern "C" int SDL_main(int argc, char *argv[]); // Using this in main library to prevent linker removing SDL_main int dummy_main(int argc, char** argv) { - return SDL_main(argc, argv); + return SDL_main(argc, argv); } #endif /* __ANDROID__ */ -- cgit v1.2.3