diff --git a/hash/apple2_flop_clcracked.xml b/hash/apple2_flop_clcracked.xml index 181b7d7e595..49d82faa925 100644 --- a/hash/apple2_flop_clcracked.xml +++ b/hash/apple2_flop_clcracked.xml @@ -48307,7 +48307,7 @@ license:CC0 Electronic Courseware Systems - + diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index 0161375eafc..85d11977e84 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -22512,7 +22512,7 @@ license:CC0 - + diff --git a/hash/cdi.xml b/hash/cdi.xml index 1420dccc34c..772f1109981 100644 --- a/hash/cdi.xml +++ b/hash/cdi.xml @@ -1866,7 +1866,7 @@ license:CC0 - + 3156 Coro Coro diff --git a/hash/specpls3_flop.xml b/hash/specpls3_flop.xml index 2f0e5982cb4..640d83b2af6 100644 --- a/hash/specpls3_flop.xml +++ b/hash/specpls3_flop.xml @@ -3,59 +3,88 @@ @@ -1561,7 +1590,7 @@ license:CC0 Artura (alt) 1989 @@ -2004,7 +2033,7 @@ license:CC0 Bestial Warrior (dual-system) 1989 @@ -2645,7 +2674,7 @@ license:CC0 Castlevania - Spectral Interlude 2015 @@ -2659,7 +2688,7 @@ license:CC0 Castlevania - Spectral Interlude (alt) 2015 @@ -2673,7 +2702,7 @@ license:CC0 Castlevania - Spectral Interlude (Italian) 2015 @@ -2687,7 +2716,7 @@ license:CC0 Castlevania - Spectral Interlude (Italian) (alt) 2015 @@ -2701,7 +2730,7 @@ license:CC0 Castlevania - Spectral Interlude (Polish) 2015 @@ -2715,7 +2744,7 @@ license:CC0 Castlevania - Spectral Interlude (Polish) (alt) 2015 @@ -2729,7 +2758,7 @@ license:CC0 Castlevania - Spectral Interlude (Russian) 2015 @@ -2743,7 +2772,7 @@ license:CC0 Castlevania - Spectral Interlude (Russian) (alt) 2015 @@ -2757,7 +2786,7 @@ license:CC0 Castlevania - Spectral Interlude (Spanish) 2015 @@ -2771,7 +2800,7 @@ license:CC0 Castlevania - Spectral Interlude (Spanish) (alt) 2015 @@ -2861,7 +2890,7 @@ license:CC0 @@ -2880,7 +2909,7 @@ license:CC0 @@ -3281,7 +3310,7 @@ license:CC0 Combat School 1987 @@ -3296,7 +3325,7 @@ license:CC0 Combat School (alt) 1987 @@ -4502,7 +4531,7 @@ license:CC0 El Gran Halcon 1991 @@ -5548,7 +5577,7 @@ license:CC0 Funky Fungus 2013 @@ -7089,8 +7118,8 @@ license:CC0 Italia 1990 1990 @@ -8017,7 +8046,7 @@ license:CC0 LC-10 Colour Screen printer v 1.1 (+2a/+3) 1990 @@ -8079,10 +8108,10 @@ license:CC0 LED Storm Rally 2011 1988 @@ -9064,7 +9093,7 @@ license:CC0 Mega Box 1991 @@ -9165,7 +9194,7 @@ license:CC0 Mercs (dual-system) 1991 @@ -9274,7 +9303,7 @@ license:CC0 MicroProse Soccer 1989 @@ -9522,7 +9551,7 @@ license:CC0 Mountain Bike Racer 1990 @@ -9732,7 +9761,7 @@ license:CC0 Erbe Software @@ -9769,7 +9798,7 @@ license:CC0 Navy Moves (Spain) 1988 @@ -9783,8 +9812,8 @@ license:CC0 Navy Moves (Spain, dual-system) 1988 @@ -9861,7 +9890,7 @@ license:CC0 @@ -9887,7 +9916,7 @@ license:CC0 Neighbours (cheat version) (master disk) 1992 @@ -10109,7 +10138,7 @@ license:CC0 Obliterator (dual-system) 1989 @@ -10193,7 +10222,7 @@ license:CC0 Opera Storys 1 1989 @@ -12997,7 +13026,7 @@ license:CC0 Rescate Atlántida (dual-system) 1989 @@ -13044,7 +13073,7 @@ license:CC0 Dinamic Software @@ -13511,7 +13540,7 @@ license:CC0 @@ -13755,7 +13784,7 @@ license:CC0 @@ -13946,7 +13975,7 @@ license:CC0 Simulation Hits (Spain) 1989 @@ -14278,8 +14307,8 @@ license:CC0 Sol Negro 1989 @@ -14385,7 +14414,7 @@ license:CC0 Sootland 1988 @@ -14650,7 +14679,7 @@ license:CC0 St. Dragon 1990 @@ -15348,7 +15377,7 @@ license:CC0 @@ -15637,7 +15666,7 @@ license:CC0 Teenage Mutant Hero Turtles 1990 @@ -15652,7 +15681,7 @@ license:CC0 Teenage Mutant Hero Turtles (3'') 1990 @@ -16853,7 +16882,7 @@ license:CC0 The Prayer of the Warrior 1992 @@ -16872,7 +16901,7 @@ license:CC0 The Prayer of the Warrior (alt) 1992 @@ -17067,7 +17096,7 @@ license:CC0 The Sword of IANNA 2017 @@ -17086,7 +17115,7 @@ license:CC0 The Sword of IANNA (alt) 2017 @@ -17865,7 +17894,7 @@ license:CC0 Tortugas Ninja (unprotected) 1990 @@ -17879,7 +17908,7 @@ license:CC0 Total 1989 @@ -18869,7 +18898,7 @@ license:CC0 @@ -19043,7 +19072,7 @@ license:CC0 Xenophobe 1989 diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 21b49629ca9..581dde4e18c 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -4892,7 +4892,7 @@ license:CC0 Ci-U-Than Trilogy-I: Cozumel (Serie Leyenda) 1990 @@ -4912,7 +4912,7 @@ license:CC0 Ci-U-Than Trilogy-I: Cozumel 1990 @@ -5435,7 +5435,7 @@ license:CC0 Cue Boy 1992 @@ -5449,7 +5449,7 @@ license:CC0 Cuentas Bancarias 1983 @@ -7033,14 +7033,14 @@ license:CC0 David el Gnomo 1985 @@ -7052,10 +7052,10 @@ license:CC0 - + David el Gnomo (vinyl version) 1985 @@ -8990,7 +8990,7 @@ license:CC0 El Paquetazo 1989 @@ -9003,7 +9003,7 @@ license:CC0 @@ -11288,7 +11288,7 @@ license:CC0 Globus 1987 @@ -11600,7 +11600,7 @@ license:CC0 Gup 19?? @@ -14753,7 +14753,7 @@ license:CC0 King Leonard (large case) 1986 @@ -15667,8 +15667,8 @@ license:CC0 La Diosa de Cozumel (Samusoft, Retro Gamer) 2013 @@ -19075,8 +19075,8 @@ license:CC0 Ogerox en los Dominios del Fuego 1988 @@ -19090,7 +19090,7 @@ license:CC0 Ok Computer Program (Radiohead – OK Computer OKNOTOK 1997 2017) 2017 @@ -19759,9 +19759,9 @@ license:CC0 Programa Computado (La Mode - 1984) 1984 @@ -19987,7 +19987,7 @@ license:CC0 Pringlesonic 2022 @@ -23628,7 +23628,7 @@ license:CC0 Renault After Sales 1984 @@ -28800,7 +28800,7 @@ license:CC0 Wander X 1984 @@ -32845,7 +32845,7 @@ license:CC0 MicroHobby (Issue 037) Discoflex 1985 @@ -37480,9 +37480,9 @@ license:CC0 @@ -37512,7 +37512,7 @@ license:CC0 Oráculo Egipcio (type-in, MicroHobby #127) 1987 @@ -37804,7 +37804,7 @@ license:CC0 Rock Animation (type-in, MicroHobby #155) 1987 @@ -37832,8 +37832,8 @@ license:CC0 Telepuzzle (type-in, MicroHobby #157) 1987 @@ -37995,7 +37995,7 @@ license:CC0 Tres en Raya (type-in, MicroHobby #170) 1988 @@ -38036,7 +38036,7 @@ license:CC0 Furax (type-in, MicroHobby #173) 1988 @@ -38100,7 +38100,7 @@ license:CC0 Sky Warrior (type-in, MicroHobby #178) 1988 @@ -71104,7 +71104,7 @@ license:CC0 Fernando Martin Basket Master (concept demo, bootleg) 1987 @@ -91701,7 +91701,7 @@ license:CC0 Legend 1990 @@ -91715,7 +91715,7 @@ license:CC0 Legend (alt) 1990 @@ -100439,7 +100439,7 @@ license:CC0 Monte Dorado 1992 @@ -141105,7 +141105,7 @@ license:CC0 Vega Solaris (English) 1989 Eclipse @@ -141119,7 +141119,7 @@ license:CC0 Vega Solaris (Spanish) 1989 @@ -141158,7 +141158,7 @@ license:CC0 Vega Solaris (Retro Gamer) 2013 @@ -146082,7 +146082,7 @@ license:CC0 Xadom (Microbyte) 1987 @@ -146096,7 +146096,7 @@ license:CC0 Xadom (Power Software) 1983 @@ -156810,7 +156810,7 @@ license:CC0 Libreria de Software Spectrum (Issue 20) (Night) 1987 diff --git a/hash/x37_flop.xml b/hash/x37_flop.xml index 6a764eb308f..c7764b19d51 100644 --- a/hash/x37_flop.xml +++ b/hash/x37_flop.xml @@ -16,7 +16,7 @@ license:CC0 - + diff --git a/src/devices/bus/a2bus/cards.cpp b/src/devices/bus/a2bus/cards.cpp index e6d59172184..b2ace857a5f 100644 --- a/src/devices/bus/a2bus/cards.cpp +++ b/src/devices/bus/a2bus/cards.cpp @@ -143,7 +143,7 @@ void apple2_cards(device_slot_interface &device) device.option_add("q68", A2BUS_Q68); // Stellation Q68 68000 card device.option_add("q68plus", A2BUS_Q68PLUS); // Stellation Q68 Plus 68000 card device.option_add("grafex", A2BUS_GRAFEX); // Grafex card (uPD7220 graphics) - device.option_add("excel9", A2BUS_EXCEL9); // Excel-9 (6809 coprocessor) + device.option_add("excel9", A2BUS_EXCEL9); // Excel-9 (6809 coprocessor) } void apple2e_cards(device_slot_interface &device) diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index ec54475ae45..740906357c5 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -412,12 +412,12 @@ TIMER_CALLBACK_MEMBER(pc9801_86_device::dac_tick) int16_t lsample = queue_pop() << 8; lsample |= queue_pop(); m_ldac->write(lsample); - } break; + } break; case 0x10: { // 16bit right only int16_t rsample = queue_pop() << 8; rsample |= queue_pop(); m_rdac->write(rsample); - } break; + } break; } if((queue_count() < m_irq_rate) && (m_pcm_ctrl & 0x20)) { diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index 3cd380d5eb8..aead54c0a18 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -58,7 +58,7 @@ #include "hp9895.h" #include "formats/hpi_dsk.h" -#define LOG_LEVEL0 (0x1U << 1) +#define LOG_LEVEL0 (0x1U << 1) #define LOG_LEVEL1 (0x3U << 1) #define VERBOSE (LOG_LEVEL1) diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 880e4e110ea..186e398c411 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -20,10 +20,10 @@ #include "formats/naslite_dsk.h" #include "formats/apollo_dsk.h" -#define LOG_LEVEL0 (0x1U << 1) -#define LOG_LEVEL1 (0x3U << 1) -#define LOG_LEVEL2 (0x7U << 1) -#define LOG_LEVEL3 (0xfU << 1) +#define LOG_LEVEL0 (0x1U << 1) +#define LOG_LEVEL1 (0x3U << 1) +#define LOG_LEVEL2 (0x7U << 1) +#define LOG_LEVEL3 (0xfU << 1) #define VERBOSE (LOG_LEVEL0) #include "logmacro.h" diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 63930b308b1..9fb6f98d204 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -1494,16 +1494,16 @@ inline void s3virge_vga_device::write_pixel8(uint32_t base, uint16_t x, uint16_t inline uint32_t s3virge_vga_device::read_pixel32(uint32_t base, uint16_t x, uint16_t y) { return (vga.memory[(base + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 24) | - (vga.memory[(base + 1 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16) | - (vga.memory[(base + 2 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) | - vga.memory[(base + 3 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size]; + (vga.memory[(base + 1 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16) | + (vga.memory[(base + 2 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) | + vga.memory[(base + 3 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size]; } inline uint32_t s3virge_vga_device::read_pixel24(uint32_t base, uint16_t x, uint16_t y) { return (vga.memory[(base + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size]) | - (vga.memory[(base + 1 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) | - (vga.memory[(base + 2 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16); + (vga.memory[(base + 1 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) | + (vga.memory[(base + 2 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16); } inline uint16_t s3virge_vga_device::read_pixel16(uint32_t base, uint16_t x, uint16_t y) diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index e27b85d7fb8..a670bb38aa4 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -17,10 +17,10 @@ #include "emu.h" #include "sc499.h" -#define LOG_LEVEL0 (0x1U << 1) -#define LOG_LEVEL1 (0x3U << 1) -#define LOG_LEVEL2 (0x7U << 1) -#define LOG_LEVEL3 (0xfU << 1) +#define LOG_LEVEL0 (0x1U << 1) +#define LOG_LEVEL1 (0x3U << 1) +#define LOG_LEVEL2 (0x7U << 1) +#define LOG_LEVEL3 (0xfU << 1) #define VERBOSE (LOG_LEVEL0) #include "logmacro.h" diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 6259e814f92..b12ff7fc196 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -584,11 +584,7 @@ void jmfb_device::update_crtc() LOGCRTC("horizontal total %d active %d (mode %x %d/%d)\n", htotal, hactive, m_ramdac_mode, width, hpixels); - int frametotal = (htotal * vtotal); - if (convolution) - frametotal <<= 1; - else - frametotal >>= 1; + int const frametotal = hpixels * vtotal >> (interlace ? 0 : 1); screen().configure( hpixels, vtotal >> (interlace ? 0 : 1), diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index b98dd941318..c6b71b7b1f1 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -218,7 +218,7 @@ void nubus_specpdq_device::device_start() nubus().install_device(slotspace+0x400000, slotspace+0xfbffff, read32s_delegate(*this, FUNC(nubus_specpdq_device::specpdq_r)), write32s_delegate(*this, FUNC(nubus_specpdq_device::specpdq_w))); m_timer = timer_alloc(FUNC(nubus_specpdq_device::vbl_tick), this); - + m_crtc.register_save(*this); m_shiftreg.register_save(*this); diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp index 43835642806..65ff3d5b251 100644 --- a/src/devices/bus/snes/sa1.cpp +++ b/src/devices/bus/snes/sa1.cpp @@ -1352,9 +1352,9 @@ void sns_sa1_device::sa1_hi_w(offs_t offset, u8 data) void sns_sa1_device::sa1_lo_w(offs_t offset, u8 data) { if (offset >= 0x400000 && offset < 0x500000) - sa1_bwram_w(offset & 0xfffff, data, false); // SA-1 BWRAM (not mirrored above) + sa1_bwram_w(offset & 0xfffff, data, false); // SA-1 BWRAM (not mirrored above) else if (offset >= 0x600000 && offset < 0x700000) - sa1_bwram_w(offset & 0xfffff, data, true); // SA-1 BWRAM Bitmap mode + sa1_bwram_w(offset & 0xfffff, data, true); // SA-1 BWRAM Bitmap mode else sa1_hi_w(offset, data); } diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index 1135b1b9f9d..4fc501154da 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -12,7 +12,7 @@ #include "vp550.h" #include "speaker.h" -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/cpu/dsp56156/dsp56mem.cpp b/src/devices/cpu/dsp56156/dsp56mem.cpp index 9329ce12c09..d5bd5e485df 100644 --- a/src/devices/cpu/dsp56156/dsp56mem.cpp +++ b/src/devices/cpu/dsp56156/dsp56mem.cpp @@ -8,10 +8,10 @@ #include "dsp56pcu.h" #define LOG_OUTPUT_FUNC cpustate->device->logerror -#define LOG_INVALID (1 << 1U) -#define LOG_PERIPHERAL_READS (1 << 2U) -#define LOG_PERIPHERAL_WRITES (1 << 3U) -#define LOG_HOST_READS (1 << 4U) +#define LOG_INVALID (1 << 1U) +#define LOG_PERIPHERAL_READS (1 << 2U) +#define LOG_PERIPHERAL_WRITES (1 << 3U) +#define LOG_HOST_READS (1 << 4U) #define VERBOSE (0) #include "logmacro.h" @@ -808,7 +808,7 @@ void dsp56156_device::host_interface_write(uint8_t offset, uint8_t data) /* if (!host_interface_active()) { - LOGMASKED(LOG_INVALID, "%s: Host interface write called without HI being set active by the PBC.\n", cpustate->device->machine().describe_context()); + LOGMASKED(LOG_INVALID, "%s: Host interface write called without HI being set active by the PBC.\n", cpustate->device->machine().describe_context()); } */ @@ -908,7 +908,7 @@ uint8_t dsp56156_device::host_interface_read(uint8_t offset) /* if (!host_interface_active()) { - LOGMASKED(LOG_INVALID, "%s: Host interface write called without HI being set active by the PBC.\n", cpustate->device->machine().describe_context()); + LOGMASKED(LOG_INVALID, "%s: Host interface write called without HI being set active by the PBC.\n", cpustate->device->machine().describe_context()); } */ diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index 735421dba6c..8e4f6c93f82 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -18,7 +18,7 @@ #define LOG_DMA (1U << 5) #define LOG_DMA_HIFREQ (1U << 6) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" /* external int priority masks */ diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp index 613d6495881..d0ab5bbc19d 100644 --- a/src/devices/cpu/lc8670/lc8670.cpp +++ b/src/devices/cpu/lc8670/lc8670.cpp @@ -19,8 +19,8 @@ #include "lc8670.h" #include "lc8670dsm.h" -#define LOG_TIMERS (1U << 1) -#define LOG_IRQ (1U << 2) +#define LOG_TIMERS (1U << 1) +#define LOG_IRQ (1U << 2) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/meters.cpp b/src/devices/machine/meters.cpp index fca2abc6e2a..93ab6fd7fdc 100644 --- a/src/devices/machine/meters.cpp +++ b/src/devices/machine/meters.cpp @@ -2,7 +2,7 @@ // copyright-holders:James Wallace /********************************************************************** - Electromechanical Meter device + Electromechanical Meter device **********************************************************************/ diff --git a/src/devices/machine/meters.h b/src/devices/machine/meters.h index e7dda1802d0..c8dc68a5800 100644 --- a/src/devices/machine/meters.h +++ b/src/devices/machine/meters.h @@ -2,7 +2,7 @@ // copyright-holders:James Wallace /********************************************************************** - Electromechanical Meter device + Electromechanical Meter device **********************************************************************/ diff --git a/src/devices/machine/sis630_gui.cpp b/src/devices/machine/sis630_gui.cpp index 7e5850226f9..24270f95e02 100644 --- a/src/devices/machine/sis630_gui.cpp +++ b/src/devices/machine/sis630_gui.cpp @@ -688,7 +688,7 @@ void sis630_bridge_device::map_extra( // forward to "primary PCI" (host & LPC?) for A8 or A9 blocks for each 1KB blocks in I/O spaces, // (i.e. $100-$3ff, $500-$7ff, $900-$bff etc.) // even if I/O range is inside base and limits -// if (BIT(bridge_control, 2)) +// if (BIT(bridge_control, 2)) // ... } diff --git a/src/devices/machine/sis7001_usb.cpp b/src/devices/machine/sis7001_usb.cpp index 7703c777888..c54f62d9713 100644 --- a/src/devices/machine/sis7001_usb.cpp +++ b/src/devices/machine/sis7001_usb.cpp @@ -2,11 +2,11 @@ // copyright-holders: Angelo Salese /************************************************************************************************** - SiS 7001 USB Host controller + SiS 7001 USB Host controller TODO: - - Stub interface, to be improved; - - PCI values omitted from docs, assumes same as OpenHCI; + - Stub interface, to be improved; + - PCI values omitted from docs, assumes same as OpenHCI; **************************************************************************************************/ @@ -57,13 +57,13 @@ void sis7001_usb_device::io_map(address_map &map) // HcRhDescriptorA, writeable except for 0x4ff map(0x048, 0x04b).lr32(NAME([this]() { return 0x01000000 | m_downstream_ports; })); // ... -// map(0x05c, 0x05c) last item for function 2, missing on function 3 +// map(0x05c, 0x05c) last item for function 2, missing on function 3 // legacy support mode (8-bit each) -// map(0x100, 0x100) control, bit 0 enables emulation mode -// map(0x104, 0x104) input -// map(0x108, 0x108) output -// map(0x10c, 0x10f) status +// map(0x100, 0x100) control, bit 0 enables emulation mode +// map(0x104, 0x104) input +// map(0x108, 0x108) output +// map(0x10c, 0x10f) status } void sis7001_usb_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, @@ -77,7 +77,7 @@ void sis7001_usb_device::device_start() pci_device::device_start(); add_map(512, M_MEM, FUNC(sis7001_usb_device::io_map)); - + // INTD# intr_pin = 4; } @@ -86,7 +86,7 @@ void sis7001_usb_device::device_start() void sis7001_usb_device::device_reset() { pci_device::device_reset(); - + command = 0x0000; status = 0x0000; m_HcFmInterval = 0; diff --git a/src/devices/machine/sis7001_usb.h b/src/devices/machine/sis7001_usb.h index e85a5285bdf..1087b06ce30 100644 --- a/src/devices/machine/sis7001_usb.h +++ b/src/devices/machine/sis7001_usb.h @@ -8,11 +8,11 @@ #include "pci.h" -class sis7001_usb_device : public pci_device +class sis7001_usb_device : public pci_device { public: sis7001_usb_device( - const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, int num_ports ) : sis7001_usb_device(mconfig, tag, owner, clock) { @@ -31,7 +31,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; -// virtual void reset_all_mappings() override; +// virtual void reset_all_mappings() override; virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; @@ -39,7 +39,7 @@ protected: virtual void config_map(address_map &map) override; void io_map(address_map &map); - + private: u8 m_downstream_ports; u32 m_HcFmInterval = 0; diff --git a/src/devices/machine/sis7018_audio.cpp b/src/devices/machine/sis7018_audio.cpp index a9eb4416188..ac87ab46ac2 100644 --- a/src/devices/machine/sis7018_audio.cpp +++ b/src/devices/machine/sis7018_audio.cpp @@ -2,11 +2,11 @@ // copyright-holders: Angelo Salese /************************************************************************************************** - SiS 7018 Audio device (AC97 complaint) + SiS 7018 Audio device (AC97 complaint) TODO: - - Stub interface, to be improved; - - Should be easy to at least inherit SB16/MIDI/game port devices; + - Stub interface, to be improved; + - Should be easy to at least inherit SB16/MIDI/game port devices; **************************************************************************************************/ @@ -48,12 +48,12 @@ void sis7018_audio_device::config_map(address_map &map) { pci_device::config_map(map); // map(0x003e, 0x003f) max latency min=0x02, max=0x18 - + map(0x40, 0xe3).rw(FUNC(sis7018_audio_device::unmap_log_r), FUNC(sis7018_audio_device::unmap_log_w)); // PMC capability identifier map(0xdc, 0xdf).r(FUNC(sis7018_audio_device::pmc_id_r)); -// map(0xe0, 0xe3).r(FUNC(sis7018_audio_device::pmc_status_r), FUNC(sis7018_audio_device::pmc_control_w)); +// map(0xe0, 0xe3).r(FUNC(sis7018_audio_device::pmc_status_r), FUNC(sis7018_audio_device::pmc_control_w)); } u8 sis7018_audio_device::capptr_r() @@ -85,7 +85,7 @@ void sis7018_audio_device::io_map(address_map &map) void sis7018_audio_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) { -// io_space->install_device(0, 0x03ff, *this, &sis7018_audio_device::io_map); +// io_space->install_device(0, 0x03ff, *this, &sis7018_audio_device::io_map); // TODO: legacy handling, including game port } @@ -101,7 +101,7 @@ void sis7018_audio_device::device_start() void sis7018_audio_device::device_reset() { pci_device::device_reset(); - + command = 0x0000; status = 0x0000; // INTB# diff --git a/src/devices/machine/sis7018_audio.h b/src/devices/machine/sis7018_audio.h index c9e9a6918b5..d72794e05c6 100644 --- a/src/devices/machine/sis7018_audio.h +++ b/src/devices/machine/sis7018_audio.h @@ -8,7 +8,7 @@ #include "pci.h" -class sis7018_audio_device : public pci_device +class sis7018_audio_device : public pci_device { public: sis7018_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -20,7 +20,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; -// virtual void reset_all_mappings() override; +// virtual void reset_all_mappings() override; virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; @@ -32,11 +32,11 @@ protected: private: virtual u8 capptr_r() override; - + u32 pmc_id_r(); -// void pmc_status_r(); -// u32 pmc_control(offs_t offset, u32 data, u32 mem_mask = ~0); - +// void pmc_status_r(); +// u32 pmc_control(offs_t offset, u32 data, u32 mem_mask = ~0); + u8 unmap_log_r(offs_t offset); void unmap_log_w(offs_t offset, u8 data); }; diff --git a/src/devices/machine/sis950_lpc.cpp b/src/devices/machine/sis950_lpc.cpp index 3a75f35156d..fa62813840b 100644 --- a/src/devices/machine/sis950_lpc.cpp +++ b/src/devices/machine/sis950_lpc.cpp @@ -91,7 +91,7 @@ void sis950_lpc_device::device_reset() m_flash_control = 0x40; m_keybc_reg = 0x51; m_dma_channel = -1; -// m_cur_eop = false; +// m_cur_eop = false; m_dma_high_byte = 0; m_init_reg = 0; m_rtc_reg = 0x10; diff --git a/src/devices/machine/sis950_lpc.h b/src/devices/machine/sis950_lpc.h index 4e994110b9b..a91f442a653 100644 --- a/src/devices/machine/sis950_lpc.h +++ b/src/devices/machine/sis950_lpc.h @@ -156,7 +156,7 @@ private: bool m_at_spkrdata = 0; uint8_t m_channel_check = 0; int m_dma_channel = -1; -// bool m_cur_eop = false; +// bool m_cur_eop = false; uint16_t m_dma_high_byte = 0; DECLARE_WRITE_LINE_MEMBER(cpu_a20_w); diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp index 35c5d5625a8..f5dba9ef6d7 100644 --- a/src/devices/machine/ticket.cpp +++ b/src/devices/machine/ticket.cpp @@ -18,7 +18,7 @@ #define DEBUG_TICKET 0 -#define VERBOSE (DEBUG_TICKET) +#define VERBOSE (DEBUG_TICKET) #include "logmacro.h" diff --git a/src/mame/drivers/cosmos_playc8f.cpp b/src/mame/drivers/cosmos_playc8f.cpp index 6ec19fc7c88..2e0c204ada2 100644 --- a/src/mame/drivers/cosmos_playc8f.cpp +++ b/src/mame/drivers/cosmos_playc8f.cpp @@ -61,7 +61,7 @@ ||..| HN74HC245AN ______ ________________ | ||__| ···· |:::::::::::::::| COSMOS PLAYC8F PCB | |___________________________Power conn__________________________________________________| - + Sound PCB "SY-MUSIC01": ___________________________________________________________________ diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 57a20308712..c8b7cc75b65 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -1527,7 +1527,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( ffight ) PORT_INCLUDE( cps1_3b ) - + /* The button below is not officially documented, pressing it will allow you to escape from grabs and choke holds instantly. */ diff --git a/src/mame/drivers/ds90.cpp b/src/mame/drivers/ds90.cpp index 6b7a4ec7fe1..f3f8e8e0f19 100644 --- a/src/mame/drivers/ds90.cpp +++ b/src/mame/drivers/ds90.cpp @@ -2,7 +2,7 @@ // copyright-holders:Curt Coder /* - + Luxor X37 prototype (Luxor DS90-10 + ABC 1600 video) diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index e0564c892f0..83c108f589b 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -187,7 +187,7 @@ DEVICE_INPUT_DEFAULTS_END /* TIMER_CALLBACK_MEMBER(kcgd_state::vsync_tick) { - m_maincpu->set_input_line(INPUT_LINE_EVNT, ASSERT_LINE); + m_maincpu->set_input_line(INPUT_LINE_EVNT, ASSERT_LINE); } */ diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index 77d76bec7af..d61a265f7a3 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -192,7 +192,7 @@ void igs_string_device::dump(const char *filename, u32 string_addr, u32 xor_addr fclose(f); return; } - + printf("igs_string addr = %x, %x (%d bits)\n", string_addr, xor_addr, is_16bits ? 16 : 8); const u8 * const string_base = (const u8 *)memregion(":maincpu")->base() + string_addr; diff --git a/src/mame/drivers/jpmsru.cpp b/src/mame/drivers/jpmsru.cpp index dd940de5136..98fcb7276ec 100644 --- a/src/mame/drivers/jpmsru.cpp +++ b/src/mame/drivers/jpmsru.cpp @@ -496,7 +496,7 @@ void jpmsru_state::out_logicext_w(offs_t offset, uint8_t data) switch(offset) { case 0: out_lamp_ext_w(m_logicext_addr, m_logicext_data); break; /* j_lc has solely lamps as outputs and is the only dumped - game to use this, so keep things simple for now */ + game to use this, so keep things simple for now */ case 1: m_logicext_data = data; break; case 2: case 3: @@ -930,7 +930,7 @@ static INPUT_PORTS_START( j_ewsbl ) PORT_MODIFY("IN0") PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* No stake jumper, 50p coin pulses meter 1 160 times if this is on and prizes - are doubled as well, which doesn't make sense with 10p coins */ + are doubled as well, which doesn't make sense with 10p coins */ PORT_MODIFY("IN2") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) // No coin tube switch diff --git a/src/mame/drivers/marblmd2.cpp b/src/mame/drivers/marblmd2.cpp index b92ee024062..ce546f69890 100644 --- a/src/mame/drivers/marblmd2.cpp +++ b/src/mame/drivers/marblmd2.cpp @@ -2,22 +2,22 @@ // copyright-holders:David Haywood /* - Supported Games: + Supported Games: - Marble Madness II (prototype) + Marble Madness II (prototype) - Not Dumped: + Not Dumped: - Marble Man: Marble Madness II (earlier version of the game before it was changed to use Joysticks) + Marble Man: Marble Madness II (earlier version of the game before it was changed to use Joysticks) - ------------------------------------------- + ------------------------------------------- - TODO: - - Issues in service mode (eg. RAM check fails) could just be prototype issues - - verify XTALs, clocks, volume balance, dipswitches etc. + TODO: + - Issues in service mode (eg. RAM check fails) could just be prototype issues + - verify XTALs, clocks, volume balance, dipswitches etc. - Non-Bugs: - - objects appear over text boxes during scroll before levels, verified to happen on hardware + Non-Bugs: + - objects appear over text boxes during scroll before levels, verified to happen on hardware */ diff --git a/src/mame/drivers/microdar.cpp b/src/mame/drivers/microdar.cpp index 402eb007777..cfff2aa9da2 100644 --- a/src/mame/drivers/microdar.cpp +++ b/src/mame/drivers/microdar.cpp @@ -391,7 +391,7 @@ ROM_END /** Compumatic Minidart. - Microdar V6 PCB. 24MHz xtal. Atmel AT89S51 intead of the usual REF34VA and a custom chip labeled "Toronto 2707" + Microdar V6 PCB. 24MHz xtal. Atmel AT89S51 intead of the usual REF34VA and a custom chip labeled "Toronto 2707" (but referred as REF0097 on the manual) instead of the REF0096. */ ROM_START(minidart) @@ -468,7 +468,7 @@ ROM_END | PALCE16V8H-25->| | |_| |_| ________ ________ ________ ________ | | | | | 24LC04B |ULN2803A |ULN2803A HEF4094BP TD62783AP | | 74HC273N 74HC273N |_| _____ __ __ __ ________ ________ | | - | __ __ __ __ ____ | | | | | | | | HEF4094BP TD62783AP | | + | __ __ __ __ ____ | | | | | | | | HEF4094BP TD62783AP | | || | | | | | | | | | _____80C31| | | | | | | ________ ________ | | || | | | | | | | EPROM| || | |_| |_| |_| HEF4094BP TD62783AP | | ||_| |_| |_| |_| | || || | 3 x 74HC273N ________ ________ | | diff --git a/src/mame/drivers/mpu4bwb.cpp b/src/mame/drivers/mpu4bwb.cpp index 6be1c28f2f2..b83eba3fb4d 100644 --- a/src/mame/drivers/mpu4bwb.cpp +++ b/src/mame/drivers/mpu4bwb.cpp @@ -1392,7 +1392,7 @@ GAME_CUSTOM( 199?, m4sky, 0, bwboki_chr_cheat, mpu4impcoin_j // unusual 1.8 hopper error on sets below GAME_CUSTOM( 199?, m4sky__a, m4sky, bwboki_chr_cheat, mpu4impcoin_jackpot15_20p_90pc, init_m4default_big, "sk_sj___.5_0", 0x0000, 0x040000, CRC(45ae0423) SHA1(94d5b3d4aacb69a18ff3f45681eb5f7fba7657e8), "BWB",u8"Sky Sports Super Soccer (BWB) (MPU4) (20/25/30p stake £10/£15 jackpot) (set 1)" ) // % key GAME_CUSTOM( 199?, m4sky__b, m4sky, bwboki_chr_cheat, mpu4impcoin_jackpot15_20p_90pc, init_m4default_big, "sk_sj_k_.5_0", 0x0000, 0x040000, CRC(e1bab980) SHA1(1c8b127809422ab0baf1875ca907f18269a0cc17), "BWB",u8"Sky Sports Super Soccer (BWB) (MPU4) (20/25/30p stake £10/£15 jackpot) (set 2)" ) // % key -GAME_CUSTOM( 199?, m4sky__c, m4sky, bwboki_chr_cheat, mpu4impcoin_jackpot15_20p, init_m4default_big, "sk_sja__.5_0", 0x0000, 0x040000, CRC(b2a16ef7) SHA1(9012dcc320e8af8fef53e0dc91d3bcd6cbafa5ee), "BWB",u8"Sky Sports Super Soccer (BWB) (MPU4) (20/25/30p stake £10/£15 jackpot) (set 3)" ) +GAME_CUSTOM( 199?, m4sky__c, m4sky, bwboki_chr_cheat, mpu4impcoin_jackpot15_20p, init_m4default_big, "sk_sja__.5_0", 0x0000, 0x040000, CRC(b2a16ef7) SHA1(9012dcc320e8af8fef53e0dc91d3bcd6cbafa5ee), "BWB",u8"Sky Sports Super Soccer (BWB) (MPU4) (20/25/30p stake £10/£15 jackpot) (set 3)" ) GAME_CUSTOM( 199?, m4sky__d, m4sky, bwboki_chr_cheat, mpu4impcoin_jackpot15_20p, init_m4default_big, "sk_sjs__.5_0", 0x0000, 0x040000, CRC(d176431f) SHA1(8ca90ef61486fc5a5b6527f913cd05b42ceabe3e), "BWB",u8"Sky Sports Super Soccer (BWB) (MPU4) (20/25/30p stake £10/£15 jackpot) (set 4)" ) // Datapak diff --git a/src/mame/drivers/mpu4mod2sw.cpp b/src/mame/drivers/mpu4mod2sw.cpp index 21a6d1df563..7e51323f2c1 100644 --- a/src/mame/drivers/mpu4mod2sw.cpp +++ b/src/mame/drivers/mpu4mod2sw.cpp @@ -2297,8 +2297,8 @@ GAME_CUSTOM( 199?, m4redunk, 0, "redx_20_.8", 0x0000, 0x010000, CRC(b5e8d /********************************************************************************************************* Super Play - - set was originally called "Black Bull" and as 'Czech' region - - dipswitches probably all different (has coinage dip?) + - set was originally called "Black Bull" and as 'Czech' region + - dipswitches probably all different (has coinage dip?) *********************************************************************************************************/ @@ -2343,7 +2343,7 @@ GAME(199?, m4blkbul, 0, mod2_alt_cheatchr_pal - + diff --git a/src/mame/layout/mpu4.lay b/src/mame/layout/mpu4.lay index 2a08a54ed16..2a4a3e34799 100644 --- a/src/mame/layout/mpu4.lay +++ b/src/mame/layout/mpu4.lay @@ -30,7 +30,7 @@ license:CC0 - + @@ -287,7 +287,7 @@ license:CC0 - + @@ -318,7 +318,7 @@ license:CC0 - + diff --git a/src/mame/machine/mpu4_characteriser_pal.h b/src/mame/machine/mpu4_characteriser_pal.h index ddc3a93b0d1..bd1aa7a563f 100644 --- a/src/mame/machine/mpu4_characteriser_pal.h +++ b/src/mame/machine/mpu4_characteriser_pal.h @@ -785,7 +785,7 @@ public: // "JC8 4.4" // "JC8 4.2" // Pot Black Casino "PO 1.2" - // "PO 1.1" + // "PO 1.1" // Fortune Club "CFO 1.2" static constexpr uint8_t fortune_characteriser_prot[8] = { 0x00, 0x70, 0x10, 0x60, 0x20, 0x50, 0x10, 0x00 }; // guessed based on lamp positions in Pot Black Casino and Jewel in the Crown @@ -1229,7 +1229,7 @@ public: // games with sequence starting 00 0c 50 60 4c 10 60 0c 78 74 00 6c 38 34 48 // High Rise "HII 0.3" - // "HIR 3.1" + // "HIR 3.1" // "HIR 3.0" //static constexpr uint8_t hirise_characteriser_prot[8] = { 0x00, 0x68, 0x08, 0x60, 0x40, 0x28, 0x68, 0x60 }; static constexpr uint8_t hirise_characteriser_prot[8] = { 0x00, 0x68, 0x08, 0x60, 0x20, 0x48, 0x08, 0x00 }; // matches bootleg diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index a2c305e2989..3a493289b5a 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -49,9 +49,9 @@ // MACROS / CONSTANTS //************************************************************************** -#define LOG_VIA (1U << 1) -#define LOG_SCP (1U << 2) -#define LOG_BITS (1U << 3) +#define LOG_VIA (1U << 1) +#define LOG_SCP (1U << 2) +#define LOG_BITS (1U << 3) #ifdef USE_SCP #define VERBOSE (LOG_SCP) diff --git a/src/mame/video/spectrum.cpp b/src/mame/video/spectrum.cpp index 39390e2f436..67bdb5a0422 100644 --- a/src/mame/video/spectrum.cpp +++ b/src/mame/video/spectrum.cpp @@ -26,10 +26,10 @@ TIMER_CALLBACK_MEMBER(spectrum_state::finish_screen_update) the screen is redrawn entirely. Consider this timer a tmp solution till screen.cpp provides better support for such case. Validation: - https://mametesters.org/view.php?id=8264 - https://mametesters.org/view.php?id=8265 - https://github.com/mamedev/mame/pull/9670#issuecomment-1118576555 - https://github.com/mamedev/mame/pull/9750 + https://mametesters.org/view.php?id=8264 + https://mametesters.org/view.php?id=8265 + https://github.com/mamedev/mame/pull/9670#issuecomment-1118576555 + https://github.com/mamedev/mame/pull/9750 */ m_screen->update_now(); m_finish_screen_update_timer->adjust(m_screen->time_until_pos(m_screen->visible_area().bottom(), m_screen->visible_area().right() + 1)); diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp index b99858dd69e..ba374178470 100644 --- a/src/osd/sdl/sdlmain.cpp +++ b/src/osd/sdl/sdlmain.cpp @@ -503,7 +503,7 @@ void sdl_osd_interface::init(running_machine &machine) // bgfx does not work with wayland if ((strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0) && ((strcmp(options().video(), "auto") == 0) || (strcmp(options().video(), "bgfx") == 0))) fatalerror("Error: BGFX video does not work with wayland videodriver. Please change either of the options."); - + osd_sdl_info(); defines_verbose();