From f55e7d697c7cd7f988b3220f476fb735476252be Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 23 Feb 2025 03:32:59 +1100 Subject: [PATCH] srcclean and cleanup. --- hash/zx81_cass.xml | 2 +- src/devices/bus/centronics/adaptator.h | 2 +- src/devices/bus/pci/zr36057.cpp | 54 ++++++++-------- src/devices/cpu/tlcs900/tmp94c241.cpp | 12 ++-- src/devices/sound/gt155.cpp | 16 ++--- src/devices/video/zr36060.cpp | 46 ++++++------- src/lib/formats/cassimg.cpp | 4 +- src/lib/formats/tzx_cas.cpp | 2 +- src/mame/acorn/aristmk5.cpp | 2 +- src/mame/alesis/midiverb.cpp | 4 +- src/mame/casio/wk1800.cpp | 48 +++++++------- src/mame/ibm/ibm3477.cpp | 2 +- src/mame/igt/fortune1.cpp | 72 ++++++++++----------- src/mame/konami/hornet.cpp | 2 +- src/mame/konami/k001005.cpp | 4 +- src/mame/konami/k053246_k053247_k055673.cpp | 2 +- src/mame/layout/videopkr.lay | 32 ++++----- src/mame/linn/linndrum.cpp | 8 +-- src/mame/matsushita/kn5000.cpp | 42 ++++++------ src/mame/misc/truco.cpp | 38 +++++------ src/mame/nintendo/nes_vt32.cpp | 2 +- src/mame/nintendo/nes_vt369_vtunknown.cpp | 2 +- src/mame/oberheim/dmx.cpp | 20 +++--- src/mame/oberheim/xpander.cpp | 14 ++-- src/mame/paia/midi2cv8.cpp | 4 +- src/mame/sfrj/pmp11.cpp | 6 +- src/mame/sigma/sigmab31.cpp | 2 +- src/mame/toaplan/toaplan1_m.cpp | 2 +- src/mame/toaplan/toaplan1_v.cpp | 2 +- src/mame/tvgames/spg29x_lexibook_jg7425.cpp | 2 +- src/mame/tvgames/xavix.cpp | 12 ++-- 31 files changed, 231 insertions(+), 231 deletions(-) diff --git a/hash/zx81_cass.xml b/hash/zx81_cass.xml index da6d6d89cf5..bc7514613d5 100644 --- a/hash/zx81_cass.xml +++ b/hash/zx81_cass.xml @@ -1052,7 +1052,7 @@ RAND USR 16530 JRS Software - + diff --git a/src/devices/bus/centronics/adaptator.h b/src/devices/bus/centronics/adaptator.h index 3226284027e..b2c031475d9 100644 --- a/src/devices/bus/centronics/adaptator.h +++ b/src/devices/bus/centronics/adaptator.h @@ -34,7 +34,7 @@ protected: private: required_device_array m_joy; - u8 m_ddr; + u8 m_ddr; }; // device type definition diff --git a/src/devices/bus/pci/zr36057.cpp b/src/devices/bus/pci/zr36057.cpp index 57fbf9f056e..a286850b645 100644 --- a/src/devices/bus/pci/zr36057.cpp +++ b/src/devices/bus/pci/zr36057.cpp @@ -183,14 +183,14 @@ void zr36057_device::asr_map(address_map &map) LOG("\tVSPOL %d VSTART %d VEND %d\n", m_vfe.vspol, m_vfe.vstart, m_vfe.vend); }) ); -// map(0x008, 0x00b) VFE Config, Video Scaler and Pixel Format -// map(0x00c, 0x00f) Video Display Top -// map(0x010, 0x013) Video Display Bottom -// map(0x014, 0x017) Video Display Stride, Status and Frame Grab -// map(0x018, 0x01b) Video Display Configuration -// map(0x01c, 0x01f) Masking Map Top -// map(0x020, 0x023) Masking Map Bottom -// map(0x024, 0x027) Overlay Control +// map(0x008, 0x00b) VFE Config, Video Scaler and Pixel Format +// map(0x00c, 0x00f) Video Display Top +// map(0x010, 0x013) Video Display Bottom +// map(0x014, 0x017) Video Display Stride, Status and Frame Grab +// map(0x018, 0x01b) Video Display Configuration +// map(0x01c, 0x01f) Masking Map Top +// map(0x020, 0x023) Masking Map Bottom +// map(0x024, 0x027) Overlay Control map(0x028, 0x02b).lrw32( NAME([this] (offs_t offset) { return (m_softreset << 24) | (m_pci_waitstate_control << 16) | m_gpio_ddr; @@ -243,11 +243,11 @@ void zr36057_device::asr_map(address_map &map) } }) ); -// map(0x030, 0x033) MPEG Code Source Address -// map(0x034, 0x037) MPEG Code Transfer Control -// map(0x038, 0x03b) MPEG Code Memory Pointer -// map(0x03c, 0x03f) Interrupt Status -// map(0x040, 0x043) Interrupt Control +// map(0x030, 0x033) MPEG Code Source Address +// map(0x034, 0x037) MPEG Code Transfer Control +// map(0x038, 0x03b) MPEG Code Memory Pointer +// map(0x03c, 0x03f) Interrupt Status +// map(0x040, 0x043) Interrupt Control map(0x044, 0x047).lrw32( NAME([this] (offs_t offset) { LOG("I2C R\n"); @@ -264,15 +264,15 @@ void zr36057_device::asr_map(address_map &map) } }) ); -// map(0x100, 0x103) JPEG Mode and Control -// map(0x104, 0x107) JPEG Process Control -// map(0x108, 0x10b) Vertical Sync Parameters (as sync master) -// map(0x10c, 0x10f) Horizontal Sync Parameters (as sync master) -// map(0x110, 0x113) Field Horizontal Active Portion -// map(0x114, 0x117) Field Vertical Active Portion -// map(0x118, 0x11b) Field Process Parameters -// map(0x11c, 0x11f) JPEG Code Base Address -// map(0x120, 0x123) JPEG Code FIFO Threshold +// map(0x100, 0x103) JPEG Mode and Control +// map(0x104, 0x107) JPEG Process Control +// map(0x108, 0x10b) Vertical Sync Parameters (as sync master) +// map(0x10c, 0x10f) Horizontal Sync Parameters (as sync master) +// map(0x110, 0x113) Field Horizontal Active Portion +// map(0x114, 0x117) Field Vertical Active Portion +// map(0x118, 0x11b) Field Process Parameters +// map(0x11c, 0x11f) JPEG Code Base Address +// map(0x120, 0x123) JPEG Code FIFO Threshold map(0x124, 0x124).lrw8( NAME([this] (offs_t offset) { LOG("JPEG Codec Guest ID R\n"); @@ -308,7 +308,7 @@ void zr36057_device::asr_map(address_map &map) ); map(0x200, 0x2ff).rw(FUNC(zr36057_device::postoffice_r), FUNC(zr36057_device::postoffice_w)); -// map(0x300, 0x303) Still Transfer +// map(0x300, 0x303) Still Transfer } // TODO: PostOffice accesses thru GuestBus are dictated with PCI clock cycles, asynchronous @@ -317,10 +317,10 @@ void zr36057_device::asr_map(address_map &map) // This should eventually be expressed in a osd_work_queue, with guestbus address_space roughly as: // for (int i = 0; i < 8; i++) // { -// if () -// map(0 | (i << 2), 3 | (i << 2)).flags().m(m_guest[i], map); -// else -// map(0 | (i << 2), 3 | (i << 2)).flags(); +// if () +// map(0 | (i << 2), 3 | (i << 2)).flags().m(m_guest[i], map); +// else +// map(0 | (i << 2), 3 | (i << 2)).flags(); // } u32 zr36057_device::postoffice_r(offs_t offset) { diff --git a/src/devices/cpu/tlcs900/tmp94c241.cpp b/src/devices/cpu/tlcs900/tmp94c241.cpp index bf76eaa5897..e0bfc8dd07b 100644 --- a/src/devices/cpu/tlcs900/tmp94c241.cpp +++ b/src/devices/cpu/tlcs900/tmp94c241.cpp @@ -1104,8 +1104,8 @@ void tmp94c241_device::tlcs900_handle_timers() { case 0: /* Not yet implemented. - - For the 8 bit timers: TIO, TO0TRG, invalid and TO2TRG - - For all 16 bit timers: TIA + - For the 8 bit timers: TIO, TO0TRG, invalid and TO2TRG + - For all 16 bit timers: TIA */ break; case 1: m_timer_change[timer_index] += ((m_timer_pre >> s1) - (old_pre >> s1)); break; @@ -1167,10 +1167,10 @@ void tmp94c241_device::tlcs900_handle_timers() uint8_t interrupt) { /* - timer_id 4 => m_timer_16[0] m_timer_change[4] - timer_id 6 => m_timer_16[1] m_timer_change[5] - timer_id 8 => m_timer_16[2] m_timer_change[6] - timer_id A => m_timer_16[3] m_timer_change[7] + timer_id 4 => m_timer_16[0] m_timer_change[4] + timer_id 6 => m_timer_16[1] m_timer_change[5] + timer_id 8 => m_timer_16[2] m_timer_change[6] + timer_id A => m_timer_16[3] m_timer_change[7] */ uint8_t timer_index = (timer_id - 4)/2; diff --git a/src/devices/sound/gt155.cpp b/src/devices/sound/gt155.cpp index 940bf051d78..f613a568183 100644 --- a/src/devices/sound/gt155.cpp +++ b/src/devices/sound/gt155.cpp @@ -3,16 +3,16 @@ /*************************************************************************** - Casio GT155 (HG51B155FD) + Casio GT155 (HG51B155FD) - This is the sound generator and DSP used in various higher-end - "A-Squared Sound Source" keyboards and pianos between roughly 1994-2001. + This is the sound generator and DSP used in various higher-end + "A-Squared Sound Source" keyboards and pianos between roughly 1994-2001. + + TODO: + - verify per-voice lowpass filter behavior + - DSP (architecture/instruction set seems to be the same as the standalone + "GD277" DSP used in other contemporary keyboards) - TODO: - - verify per-voice lowpass filter behavior - - DSP (architecture/instruction set seems to be the same as the standalone - "GD277" DSP used in other contemporary keyboards) - ***************************************************************************/ #include "emu.h" diff --git a/src/devices/video/zr36060.cpp b/src/devices/video/zr36060.cpp index 35db120b5ea..29c19dfdaad 100644 --- a/src/devices/video/zr36060.cpp +++ b/src/devices/video/zr36060.cpp @@ -35,33 +35,33 @@ void zr36060_device::device_reset() void zr36060_device::regs_map(address_map &map) { -// map(0x000, 0x000) LOAD Parameters -// map(0x001, 0x001) Code FIFO Status (r/o) -// map(0x002, 0x002) Code Interface -// map(0x003, 0x003) Codec Mode +// map(0x000, 0x000) LOAD Parameters +// map(0x001, 0x001) Code FIFO Status (r/o) +// map(0x002, 0x002) Code Interface +// map(0x003, 0x003) Codec Mode -// map(0x005, 0x005) Maximum Block Code -// map(0x006, 0x006) Markers Enable -// map(0x007, 0x007) Interrupt Mask -// map(0x008, 0x008) Interrupt Status (r/o) -// map(0x009, 0x00c) Target Net Code Volume -// map(0x00d, 0x010) Target Data Code Volume -// map(0x011, 0x012) Scale Factor -// map(0x013, 0x015) Allocation Factor -// map(0x016, 0x019) Accumulated Code Volume -// map(0x01a, 0x01d) Accumulated Total Activity -// map(0x01e, 0x021) Accumulated Truncated Bits +// map(0x005, 0x005) Maximum Block Code +// map(0x006, 0x006) Markers Enable +// map(0x007, 0x007) Interrupt Mask +// map(0x008, 0x008) Interrupt Status (r/o) +// map(0x009, 0x00c) Target Net Code Volume +// map(0x00d, 0x010) Target Data Code Volume +// map(0x011, 0x012) Scale Factor +// map(0x013, 0x015) Allocation Factor +// map(0x016, 0x019) Accumulated Code Volume +// map(0x01a, 0x01d) Accumulated Total Activity +// map(0x01e, 0x021) Accumulated Truncated Bits map(0x022, 0x022).lr8(NAME([this] (offs_t offset) { LOG("Read Device ID\n"); return 0x33; })); map(0x023, 0x023).lr8(NAME([this] (offs_t offset) { LOG("Read Revision ID\n"); return 0x01; })); -// map(0x024, 0x025) Test Control +// map(0x024, 0x025) Test Control -// map(0x030, 0x030) Video Control -// map(0x031, 0x031) Video Polarity -// map(0x032, 0x032) Scaling -// map(0x033, 0x035) Background Color -// map(0x036, 0x041) Sync Generator -// map(0x042, 0x049) Active Area -// map(0x04a, 0x051) SUBIMG Window +// map(0x030, 0x030) Video Control +// map(0x031, 0x031) Video Polarity +// map(0x032, 0x032) Scaling +// map(0x033, 0x035) Background Color +// map(0x036, 0x041) Sync Generator +// map(0x042, 0x049) Active Area +// map(0x04a, 0x051) SUBIMG Window map(0x060, 0x3ff).ram(); // JPEG Markers Array } diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp index fc953c2bdf2..11545793e18 100644 --- a/src/lib/formats/cassimg.cpp +++ b/src/lib/formats/cassimg.cpp @@ -887,8 +887,8 @@ cassette_image::error cassette_image::legacy_construct(const LegacyWaveFiller *l without knowing how much data available in the image. Having wrong header with size bigger than image couses illegal access beyond image data. Desired state is: - length = args.fill_wave(&samples[pos], args.chunk_size, chunk.get()); - aslo the fix for tap is commented out in 'tap_cas_fill_wave' + length = args.fill_wave(&samples[pos], args.chunk_size, chunk.get()); + aslo the fix for tap is commented out in 'tap_cas_fill_wave' */ length = args.fill_wave(&samples[pos], sample_count - pos, chunk.get()); if (length < 0) diff --git a/src/lib/formats/tzx_cas.cpp b/src/lib/formats/tzx_cas.cpp index 39fe054e017..d2622f0a51f 100644 --- a/src/lib/formats/tzx_cas.cpp +++ b/src/lib/formats/tzx_cas.cpp @@ -870,7 +870,7 @@ static int tap_cas_fill_wave(int16_t *buffer, int length, const uint8_t *bytes) length -= data_size; if (length < 0) { - data_size += length; // Take as much as we can. + data_size += length; // Take as much as we can. } */ size += tzx_cas_handle_block(&p, bytes, 1000, data_size, 2168, pilot_length, 667, 735, 855, 1710, 8); diff --git a/src/mame/acorn/aristmk5.cpp b/src/mame/acorn/aristmk5.cpp index 5a00dadb367..454341f5f81 100644 --- a/src/mame/acorn/aristmk5.cpp +++ b/src/mame/acorn/aristmk5.cpp @@ -1580,7 +1580,7 @@ static INPUT_PORTS_START( aristmk5 ) PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_GAMBLE_DOOR) PORT_CODE(KEYCODE_B) PORT_TOGGLE PORT_NAME("Bill acceptor door") PORT_BIT(0x00c00000, IP_ACTIVE_HIGH, IPT_UNUSED) // Unused mechanical security switch - PORT_START("P3") + PORT_START("P3") PORT_BIT(0x00000002, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_READ_LINE_MEMBER(FUNC(aristmk5_state::hopper_r)) PORT_BIT(0x000000f8, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CUSTOM_MEMBER(FUNC(aristmk5_state::coin_r)) diff --git a/src/mame/alesis/midiverb.cpp b/src/mame/alesis/midiverb.cpp index 6dbc0f1adaf..9efb96887d1 100644 --- a/src/mame/alesis/midiverb.cpp +++ b/src/mame/alesis/midiverb.cpp @@ -244,8 +244,8 @@ void midiverb_dsp_device::sound_stream_update(sound_stream &stream, const std::v } LOG_DSP("%04X %02x - DSP OP: %d %s (%04x), A: %6d, R: %6d, bus: %6d, ram: %6d @ %04x", - rom_address, pc, op, OP_NAME[op], ram_offset_delta, m_accum, - m_reg, bus_value, m_ram[m_ram_offset], m_ram_offset); + rom_address, pc, op, OP_NAME[op], ram_offset_delta, m_accum, + m_reg, bus_value, m_ram[m_ram_offset], m_ram_offset); if (mode_rc0) LOG_DSP(" [ADC]"); if (ld_dac) diff --git a/src/mame/casio/wk1800.cpp b/src/mame/casio/wk1800.cpp index 9a44b0706d9..103ad490cde 100644 --- a/src/mame/casio/wk1800.cpp +++ b/src/mame/casio/wk1800.cpp @@ -2,29 +2,29 @@ // copyright-holders:Devin Acker /* - Casio WK-1600/1800 series keyboards + Casio WK-1600/1800 series keyboards - Models on this hardware: - - CTK-711EX (1998) - 61 keys, 5MB wave ROM - - CTK-811EX (1998), CTK-731 (1999) - 61 keys, 5MB wave ROM, floppy drive - - WK-1600, WK-1630 (2000) - 73 keys, 8MB wave ROM - - WK-1800 (2000) - 73 keys, 8MB wave ROM, floppy drive - - AP-60R (1999), AP-65R (2001) - 88 keys, 8MB wave ROM, floppy drive + Models on this hardware: + - CTK-711EX (1998) + 61 keys, 5MB wave ROM + - CTK-811EX (1998), CTK-731 (1999) + 61 keys, 5MB wave ROM, floppy drive + - WK-1600, WK-1630 (2000) + 73 keys, 8MB wave ROM + - WK-1800 (2000) + 73 keys, 8MB wave ROM, floppy drive + - AP-60R (1999), AP-65R (2001) + 88 keys, 8MB wave ROM, floppy drive - TODO: - - fix floppy controller hookup for wk1800. current issues: - - pressing the Disk button with the drive empty starts the drive motor, - then the firmware waits forever on some status bit that is never set - - pressing the Disk button with a disk inserted results in several 'forced abort' - errors from the H8 DMA controller - - wk1800 firmware seems to rely on different TS bit behavior from the HD63266 - compared to a standard uPD765 - - add software list for style/program disks + TODO: + - fix floppy controller hookup for wk1800. current issues: + - pressing the Disk button with the drive empty starts the drive motor, + then the firmware waits forever on some status bit that is never set + - pressing the Disk button with a disk inserted results in several 'forced abort' + errors from the H8 DMA controller + - wk1800 firmware seems to rely on different TS bit behavior from the HD63266 + compared to a standard uPD765 + - add software list for style/program disks */ #include "emu.h" @@ -244,8 +244,8 @@ void wk1600_state::wk1600_map(address_map &map) void wk1800_state::wk1800_map(address_map &map) { common_map(map); -// map(0x40000, 0x40003).mirror(0x1fffc).m(m_fdc, FUNC(hd63266f_device::map)); -// map(0x60000, 0x7ffff).rw(m_fdc, FUNC(hd63266f_device::dma_r), FUNC(hd63266f_device::dma_w)); +// map(0x40000, 0x40003).mirror(0x1fffc).m(m_fdc, FUNC(hd63266f_device::map)); +// map(0x60000, 0x7ffff).rw(m_fdc, FUNC(hd63266f_device::dma_r), FUNC(hd63266f_device::dma_w)); map(0x80000, 0xbffff).mirror(0x40000).ram().share("nvram"); } @@ -327,7 +327,7 @@ void wk1600_state::wk1600(machine_config &config) GT155(config, m_gt155, 24.576_MHz_XTAL); m_gt155->add_route(0, "lspeaker", 1.0); m_gt155->add_route(1, "rspeaker", 1.0); -} +} /**************************************************************************/ [[maybe_unused]] static void wk1800_floppies(device_slot_interface &device) diff --git a/src/mame/ibm/ibm3477.cpp b/src/mame/ibm/ibm3477.cpp index 97b0264b30f..f6b50ae0998 100644 --- a/src/mame/ibm/ibm3477.cpp +++ b/src/mame/ibm/ibm3477.cpp @@ -11,7 +11,7 @@ Skeleton driver for IBM InfoWindow 3477 terminal. | |_____| |____| | | ____________ ___ ___ ___ ___ | | _________ |38F5768 | | <-SN74LS74AN | | | | - | CXK58257M-10LL |TC110G17AF | | | | <-SN75112N | | + | CXK58257M-10LL |TC110G17AF | | | | <-SN75112N | | | | | | | | | | | | <-SN7510BN| | ____ ____ | | |__| |__| |__| |__| | | |___| |___| |___________| _________ ____ | diff --git a/src/mame/igt/fortune1.cpp b/src/mame/igt/fortune1.cpp index af6418d9dce..8468207bce3 100644 --- a/src/mame/igt/fortune1.cpp +++ b/src/mame/igt/fortune1.cpp @@ -68,8 +68,8 @@ There are three well known platforms: Fortune I, Baby and Baby with I8051 microcontroller. - - + + Fortune I Platform (Original IGT) ================================= This is a three board system: Main, Interface & Sound board. @@ -93,7 +93,7 @@ Configurable 50Hz-60Hz V-Sync through hardware jumper. * Interface - + I/O System Buffered, latched & optocoupled. @@ -104,32 +104,32 @@ 1x 1408 DAC 1x 8.0000 MHz. Crystal - + Baby Platform (Recreativos Franco) ================================== - + This is a single board system: Integrates all Fortune I hardware. Replaces the I8039 sound uP with an I8751 uP. Adds 1x AY-3-8910 sound processor. - - + + Baby with I8051 Platform (CODERE Argentina) =========================================== - + The same Baby platform which replaces the I8039 main cpu uP daugther board with: - 1x INTEL I8051 CPU Main CPU. - 1x 27C256 Program ROM. - 1x NEC D4364 SRAM Data RAM. - 1x Dallas DS1216 Battery + Timekeeper SRAM Socket. - 1x Dallas DS12321 Watchdog. + 1x INTEL I8051 CPU Main CPU. + 1x 27C256 Program ROM. + 1x NEC D4364 SRAM Data RAM. + 1x Dallas DS1216 Battery + Timekeeper SRAM Socket. + 1x Dallas DS12321 Watchdog. 1x AM8255APC PPI. 1x SN74HCT373 Octal D-type transparent latch with 3-state outputs. 1x SN74HCT138 3-line to 8-line Inverting Decoder/demultiplexer. 1x SN74HCT00 Quadruple independent 2-input NAND gates. 1x 8.00000 MHZ. Crystal System Clock - + ******************************************************************************** Main CPU Memory Map @@ -457,7 +457,7 @@ protected: required_device m_gfxdecode; output_finder<28> m_digits; output_finder<14> m_lamps; - optional_device m_hopper; + optional_device m_hopper; }; @@ -490,21 +490,21 @@ protected: void bpoker_wd_reset_w(offs_t offset, uint8_t data); uint8_t bp_timekeep_r(offs_t offset); void bp_timekeep_w(offs_t offset, uint8_t data); - + private: uint8_t baby_sound_p0_r(); void baby_sound_p0_w(uint8_t data); uint8_t baby_sound_p1_r(); void baby_sound_p3_w(uint8_t data); void babypkr_palette(palette_device &palette) const; - + void i8751_map(address_map &map) ATTR_COLD; void i8751_io_port(address_map &map) ATTR_COLD; void i8051_sound_mem(address_map &map) ATTR_COLD; void i8051_sound_port(address_map &map) ATTR_COLD; required_device m_aysnd; - optional_device m_watchdog; + optional_device m_watchdog; optional_device m_rtc; output_finder<3> m_top_lamps; @@ -795,14 +795,14 @@ void videopkr_state::videopkr_io_w(offs_t offset, uint8_t data) m_hp_1 = (~m_p24_data >> 6) & 1; m_hp_2 = (~m_p24_data >> 5) & 1; m_dvrt = (~m_p24_data >> 7) & 1; - + if((m_p24_data & 0x60)==0x60) m_hopper->motor_w(true); else m_hopper->motor_w(false); - + //popmessage("hopper %02x", m_p24_data & 0x60); - + break; } @@ -958,7 +958,7 @@ uint8_t videopkr_state::sound_io_r() break; } } - + return m_sound_latch; } @@ -1063,7 +1063,7 @@ void babypkr_state::bpoker_p1_data_w(uint8_t data) m_ant_cio = m_c_io; m_ant_jckp = m_jckp; - + } uint8_t babypkr_state::bp_io_port_r(offs_t offset) @@ -1071,7 +1071,7 @@ uint8_t babypkr_state::bp_io_port_r(offs_t offset) uint8_t valor = 0; uint8_t hf, co; uint16_t kbdin; - + hf = ((ioport("IN1")->read() & 0x10 ) >> 4) & 1; // Hopper full detection co = 0x10 * ((ioport("IN1")->read() & 0x20 ) >> 5); // Coin Out detection kbdin = ((ioport("IN1")->read() & 0xaf ) << 8) + ioport("IN0")->read(); @@ -1094,7 +1094,7 @@ uint8_t babypkr_state::bp_io_port_r(offs_t offset) case 0x0400: valor = 0x0e; break; // Hold 5 case 0x0800: valor = 0x06; break; // Bet } - + if ((valor == 0x00) & hf ) { valor = 0x0f; @@ -1102,7 +1102,7 @@ uint8_t babypkr_state::bp_io_port_r(offs_t offset) valor += co; - return valor; + return valor; } void babypkr_state::bp_io_port_w(offs_t offset, uint8_t data) @@ -1118,8 +1118,8 @@ void babypkr_state::bp_io_port_w(offs_t offset, uint8_t data) m_p24_data = data; m_hp_1 = (m_p24_data >> 6) & 1; m_hp_2 = (m_p24_data >> 5) & 1; - m_dvrt = (~m_p24_data >> 7) & 1; - + m_dvrt = (~m_p24_data >> 7) & 1; + // bit 5 - bit 6 -> Hopper if((data&0x60)==0x60) m_hopper->motor_w(true); @@ -1279,7 +1279,7 @@ void babypkr_state::i8751_io_port(address_map &map) map(0x4900, 0x49ff).rw(FUNC(babypkr_state::bp_timekeep_r), FUNC(babypkr_state::bp_timekeep_w)); map(0x8000, 0x80ff).rw(FUNC(babypkr_state::bp_io_port_r), FUNC(babypkr_state::bp_io_port_w)); map(0x9000, 0x9000).w(FUNC(babypkr_state::prog_w)); // replaces PROG line in i8039 used to clear interrupt flip flop - map(0xa000, 0xa0ff).rw(FUNC(babypkr_state::bp_video_io_r), FUNC(babypkr_state::bp_video_io_w)); // partial video RAM address + map(0xa000, 0xa0ff).rw(FUNC(babypkr_state::bp_video_io_r), FUNC(babypkr_state::bp_video_io_w)); // partial video RAM address map(0xb000, 0xb0ff).rw(FUNC(babypkr_state::bp_color_io_r), FUNC(babypkr_state::bp_color_io_w)); // Idem to color RAM map(0xc000, 0xc003).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf000, 0xf000).w(FUNC(babypkr_state::bpoker_wd_reset_w)); @@ -1437,7 +1437,7 @@ static INPUT_PORTS_START( babydad ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_READ_LINE_DEVICE_MEMBER("hopper", FUNC(ticket_dispenser_device::line_r)) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_GAMBLE_KEYOUT ) // over 400 Coins/Credits - + PORT_START("IN2") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) INPUT_PORTS_END @@ -1471,13 +1471,13 @@ static INPUT_PORTS_START( bpoker ) PORT_START("PPI_PA") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("SET") PORT_CODE(KEYCODE_A) // Change field value / Last Operations PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("NEXT") PORT_CODE(KEYCODE_S) // Select next field / Paper Cut (Ticket printer) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("INIT") PORT_CODE(KEYCODE_D) // Set NVRAM data / Set Time / Set Machine Number & Series + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("INIT") PORT_CODE(KEYCODE_D) // Set NVRAM data / Set Time / Set Machine Number & Series PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("BOOK") PORT_CODE(KEYCODE_F) // Bookeeping / Enter / Exit PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("PERIOD") PORT_CODE(KEYCODE_G) // Operator Key / NVRAM Clear / Close and Report period PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("pa-5") PORT_CODE(KEYCODE_J) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("pa-6") PORT_CODE(KEYCODE_K) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("pa-7") PORT_CODE(KEYCODE_L) - + PORT_START("PPI_PC") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("pc-4") PORT_CODE(KEYCODE_E) // /BUSY (Ticket printer) @@ -1604,7 +1604,7 @@ void videopkr_state::videopkr(machine_config &config) // sound hardware SPEAKER(config, "speaker").front_center(); MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.275); - + HOPPER(config, m_hopper, attotime::from_msec(150)); } @@ -1687,15 +1687,15 @@ void babypkr_state::bpoker(machine_config &config) maincpu.set_vblank_int("screen", FUNC(babypkr_state::irq0_line_assert)); maincpu.port_in_cb<0>().set_constant(0); maincpu.port_out_cb<1>().set(FUNC(babypkr_state::bpoker_p1_data_w)); - + NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(600)); // Dallas DS1232: TD(2) -> float = 600ms) Verified DS1215(config, m_rtc); - + screen_device &screen(*subdevice("screen")); screen.set_size(32*16, 32*8); screen.set_visarea(3*16, 31*16-1, 0*8, 29*8-1); - + i8255_device &ppi(I8255A(config, "ppi")); //ppi.out_pa_callback().set_constant(0); ppi.in_pb_callback().set_ioport("PPI_PA"); diff --git a/src/mame/konami/hornet.cpp b/src/mame/konami/hornet.cpp index c1d047efa1a..bda20bc23d0 100644 --- a/src/mame/konami/hornet.cpp +++ b/src/mame/konami/hornet.cpp @@ -998,7 +998,7 @@ void terabrst_state::gn680_memmap(address_map &map) /*****************************************************************************/ -template +template void hornet_state::sharc_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_shared_sharc_r), FUNC(konppc_device::cgboard_shared_sharc_w)); diff --git a/src/mame/konami/k001005.cpp b/src/mame/konami/k001005.cpp index 8d9cb1583a1..e4dff199495 100644 --- a/src/mame/konami/k001005.cpp +++ b/src/mame/konami/k001005.cpp @@ -788,7 +788,7 @@ uint32_t k001005_device::read(address_space &space, offs_t offset, uint32_t mem_ { //osd_printf_debug("FIFO_r1: %08X\n", m_fifo_read_ptr); uint16_t const value = m_fifo[m_fifo_read_ptr] & 0xffff; - + if (!machine().side_effects_disabled()) { if (m_status != 1 && m_status != 2) @@ -802,7 +802,7 @@ uint32_t k001005_device::read(address_space &space, offs_t offset, uint32_t mem_ { dsp->set_flag_input(1, ASSERT_LINE); } - + m_fifo_read_ptr++; m_fifo_read_ptr &= 0x7ff; } diff --git a/src/mame/konami/k053246_k053247_k055673.cpp b/src/mame/konami/k053246_k053247_k055673.cpp index f633521dc68..a070f1ecdab 100644 --- a/src/mame/konami/k053246_k053247_k055673.cpp +++ b/src/mame/konami/k053246_k053247_k055673.cpp @@ -517,7 +517,7 @@ void k053247_device::zdrawgfxzoom32GP( dst_x = cliprect.min_x; } if (int delta_max_x = dst_lastx - cliprect.max_x; delta_max_x > 0) dst_w -= delta_max_x; - + int dst_skipy = 0; if (int delta_min_y = cliprect.min_y - dst_y; delta_min_y > 0) { diff --git a/src/mame/layout/videopkr.lay b/src/mame/layout/videopkr.lay index 5f3b450f007..8a800e79bf8 100644 --- a/src/mame/layout/videopkr.lay +++ b/src/mame/layout/videopkr.lay @@ -198,25 +198,25 @@ copyright-holders: Roberto Fresca, Grull Osgo. diff --git a/src/mame/linn/linndrum.cpp b/src/mame/linn/linndrum.cpp index 2614c3a3e39..2613e06dc62 100644 --- a/src/mame/linn/linndrum.cpp +++ b/src/mame/linn/linndrum.cpp @@ -169,8 +169,8 @@ u8 linndrum_state::keyboard_r(offs_t offset) if (selected != 0x3f || d7 == 0) { LOGMASKED(LOG_KEYBOARD, - "Offset: %02x, keys: %02x, debounce: %d, play: %d\n", - offset, selected, d6, d7); + "Offset: %02x, keys: %02x, debounce: %d, play: %d\n", + offset, selected, d6, d7); } return (d7 << 7) | (d6 << 6) | selected; @@ -267,14 +267,14 @@ void linndrum_state::trigger_w(offs_t offset, u8 data) { assert(offset >= 0 && offset < NUM_VOICE_TRIGGERS); LOGMASKED(LOG_TRIGGERS, "Trigger %s (%02x), data: %02x, data enabled: %d\n", - VOICE_TRIGGER_NAMES[offset], offset, data, m_data_out_enabled); + VOICE_TRIGGER_NAMES[offset], offset, data, m_data_out_enabled); // TODO: Implement. } void linndrum_state::trigger_beep_w(int state) { LOGMASKED(LOG_TRIGGERS, "Trigger BEEP: %d, data enabled: %d\n", - state, m_data_out_enabled); + state, m_data_out_enabled); // TODO: Implement. } diff --git a/src/mame/matsushita/kn5000.cpp b/src/mame/matsushita/kn5000.cpp index 709da7a3675..053f0cc2fdc 100644 --- a/src/mame/matsushita/kn5000.cpp +++ b/src/mame/matsushita/kn5000.cpp @@ -201,28 +201,28 @@ static INPUT_PORTS_START(kn5000) PORT_DIPSETTING( 0x06, "Other") /* - Actual full list of regions (but it is unclear if there's any - other hardware difference among them): + Actual full list of regions (but it is unclear if there's any + other hardware difference among them): - PORT_DIPSETTING( 0x04, "(M): U.S.A.") - PORT_DIPSETTING( 0x06, "(MC): Canada") - PORT_DIPSETTING( 0x04, "(XM): Mexico") - PORT_DIPSETTING( 0x06, "(EN): Norway, Sweden, Denmark, Finland") - PORT_DIPSETTING( 0x06, "(EH): Holland, Belgium") - PORT_DIPSETTING( 0x06, "(EF): France, Italy") - PORT_DIPSETTING( 0x06, "(EZ): Germany") - PORT_DIPSETTING( 0x06, "(EW): Switzerland") - PORT_DIPSETTING( 0x06, "(EA): Austria") - PORT_DIPSETTING( 0x06, "(EP): Spain, Portugal, Greece, South Africa") - PORT_DIPSETTING( 0x06, "(EK): United Kingdom") - PORT_DIPSETTING( 0x06, "(XL): New Zealand") - PORT_DIPSETTING( 0x06, "(XR): Australia") - PORT_DIPSETTING( 0x06, "(XS): Malaysia") - PORT_DIPSETTING( 0x06, "(MD): Saudi Arabia, Hong Kong, Kuwait") - PORT_DIPSETTING( 0x06, "(XT): Taiwan") - PORT_DIPSETTING( 0x02, "(X): Thailand, Indonesia, Iran, U.A.E., Panama, Argentina, Peru, Brazil") - PORT_DIPSETTING( 0x06, "(XP): Philippines") - PORT_DIPSETTING( 0x06, "(XW): Singapore") + PORT_DIPSETTING( 0x04, "(M): U.S.A.") + PORT_DIPSETTING( 0x06, "(MC): Canada") + PORT_DIPSETTING( 0x04, "(XM): Mexico") + PORT_DIPSETTING( 0x06, "(EN): Norway, Sweden, Denmark, Finland") + PORT_DIPSETTING( 0x06, "(EH): Holland, Belgium") + PORT_DIPSETTING( 0x06, "(EF): France, Italy") + PORT_DIPSETTING( 0x06, "(EZ): Germany") + PORT_DIPSETTING( 0x06, "(EW): Switzerland") + PORT_DIPSETTING( 0x06, "(EA): Austria") + PORT_DIPSETTING( 0x06, "(EP): Spain, Portugal, Greece, South Africa") + PORT_DIPSETTING( 0x06, "(EK): United Kingdom") + PORT_DIPSETTING( 0x06, "(XL): New Zealand") + PORT_DIPSETTING( 0x06, "(XR): Australia") + PORT_DIPSETTING( 0x06, "(XS): Malaysia") + PORT_DIPSETTING( 0x06, "(MD): Saudi Arabia, Hong Kong, Kuwait") + PORT_DIPSETTING( 0x06, "(XT): Taiwan") + PORT_DIPSETTING( 0x02, "(X): Thailand, Indonesia, Iran, U.A.E., Panama, Argentina, Peru, Brazil") + PORT_DIPSETTING( 0x06, "(XP): Philippines") + PORT_DIPSETTING( 0x06, "(XW): Singapore") */ PORT_START("CPR_SEG0") diff --git a/src/mame/misc/truco.cpp b/src/mame/misc/truco.cpp index 8800502b9dd..ffd34b8ba4b 100644 --- a/src/mame/misc/truco.cpp +++ b/src/mame/misc/truco.cpp @@ -42,7 +42,7 @@ mask that hides them. Once activated, a supervisor key appears, providing two new inputs for adding and removing credits, functioning as key-in and key-out. - The gambling mode features a selectable risk level, allowing players to multiply their winnings but at the cost of + The gambling mode features a selectable risk level, allowing players to multiply their winnings but at the cost of increasing the amount of credits at risk. Another hidden mode, likely used during development for debugging, enables the player to set their cards in the game, @@ -293,17 +293,17 @@ Game harcoded switches: - - 9Eh: 1 = No timeout / 0 = Game Timeout + + 9Eh: 1 = No timeout / 0 = Game Timeout ACh: 1 = Gamble Mode / 2 = Arcade Mode - 88h: 0 = Normal / 1 = Choose Cards + 88h: 0 = Normal / 1 = Choose Cards ABh: 0 = Input P0 No Masked / 1 = Masked (Default): Enables Service/Books key that show the counters. ***************************************************************************************************************** TODO: - + - Find the function of the P1-4 input line. - Find the function of the JP2-2 from PIA PB0 @@ -365,8 +365,8 @@ private: void pia_ca2_w(int state); void portb_w(uint8_t data); - uint8_t pia_ca1_r(); - uint8_t pia_cb1_r(); + uint8_t pia_ca1_r(); + uint8_t pia_cb1_r(); void palette(palette_device &palette) const; @@ -417,19 +417,19 @@ uint32_t truco_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, videoram += 0x80; } return 0; -} +} /******************************************* * Read/Write Handlers * *******************************************/ -uint8_t truco_state::pia_ca1_r() +uint8_t truco_state::pia_ca1_r() { return m_coin->read() & 1; } -uint8_t truco_state::pia_cb1_r() +uint8_t truco_state::pia_cb1_r() { return m_coin->read() & 1; } @@ -445,14 +445,14 @@ void truco_state::pia_ca2_w(int state) setting 1.6 seconds as WD timeout. */ m_watchdog->watchdog_reset(); - + /* Game harcoded switches: - - 9Eh: 1 = No timeout / 0 = Game Timeout - ACh: 1 = Gamble Mode / 2 = Arcade Mode - 88h: 0 = Normal / 1 = Choose Cards - ABh: 0 = Input P0 No Masked / 1 = Masked (Default) + + 9Eh: 1 = No timeout / 0 = Game Timeout + ACh: 1 = Gamble Mode / 2 = Arcade Mode + 88h: 0 = Normal / 1 = Choose Cards + ABh: 0 = Input P0 No Masked / 1 = Masked (Default) */ m_ram->write(0x88, BIT(m_settings->read(), 1) & 1); m_ram->write(0x9e, BIT(m_settings->read(), 2) & 1); @@ -500,7 +500,7 @@ static INPUT_PORTS_START( truco ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE ) PORT_NAME("Keyout enable Key") // Connected to JAMMA S17 (P2 START) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) // Connected to JAMMA S14 (SERVICE SW) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("P1-4")PORT_CODE(KEYCODE_D) // still not clear... Connected to JAMMA C26 (P2 SELECT) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN) // Connected to JAMMA S16 (COIN2) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN) // Connected to JAMMA S16 (COIN2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_TILT ) PORT_NAME("Tilt / Keyout") // 'tilt' line. once turned the key behaves as keyout. PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) // Connected to JAMMA C22 (P1 BUTTON1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) // Connected to JAMMA C18/21 (JOY UP & JOY RIGHT) @@ -575,7 +575,7 @@ void truco_state::truco(machine_config &config) WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(1600)); // 1.6 seconds RAM(config, m_ram).set_default_size("32K"); - NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); + NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); pia6821_device &pia(PIA6821(config, "pia0")); pia.readpa_handler().set_ioport("P1"); @@ -586,7 +586,7 @@ void truco_state::truco(machine_config &config) pia.readcb1_handler().set(FUNC(truco_state::pia_cb1_r)); pia.irqa_handler().set_inputline(m_maincpu, M6809_IRQ_LINE); pia.irqb_handler().set_inputline(m_maincpu, M6809_IRQ_LINE); - + // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(60); diff --git a/src/mame/nintendo/nes_vt32.cpp b/src/mame/nintendo/nes_vt32.cpp index 19b87054110..ce3066d0002 100644 --- a/src/mame/nintendo/nes_vt32.cpp +++ b/src/mame/nintendo/nes_vt32.cpp @@ -366,7 +366,7 @@ ROM_START( fcpocket ) ROM_LOAD( "s29gl01gp.bin", 0x00000, 0x8000000, CRC(8703b18a) SHA1(07943443294e80ca93f83181c8bdbf950b87c52f) ) // 2nd half = 0x00 (so 64MByte of content) ROM_END -ROM_START( matet300 ) +ROM_START( matet300 ) ROM_REGION( 0x2000000, "mainrom", 0 ) ROM_LOAD( "tetris.bin", 0x00000, 0x2000000, CRC(73cbd40a) SHA1(5996c97cebd6cec42a0ba1fba9517adf1af00098) ) ROM_END diff --git a/src/mame/nintendo/nes_vt369_vtunknown.cpp b/src/mame/nintendo/nes_vt369_vtunknown.cpp index d2290c63ea0..5405f6217bf 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown.cpp +++ b/src/mame/nintendo/nes_vt369_vtunknown.cpp @@ -932,7 +932,7 @@ ROM_START( lexi30 ) ROM_LOAD( "lexi30.u3", 0x00000, 0x800000, CRC(0d4307ea) SHA1(0d7cf492f796b0bb871deebaca38a3ff3b2ed1e6) ) ROM_END -ROM_START( matet10 ) +ROM_START( matet10 ) ROM_REGION( 0x200000, "mainrom", 0 ) ROM_LOAD( "tetriskeychain_p25q16sh_856015.bin", 0x00000, 0x200000, CRC(7a7251ea) SHA1(7ace8482a54f6b06982a90328779c21266d864fa) ) ROM_IGNORE(0x300) diff --git a/src/mame/oberheim/dmx.cpp b/src/mame/oberheim/dmx.cpp index 3147753f48b..ddf08e68060 100644 --- a/src/mame/oberheim/dmx.cpp +++ b/src/mame/oberheim/dmx.cpp @@ -248,7 +248,7 @@ void dmx_voice_card_vca_device::start(int trigger_mode) m_selected_rc_inv = 1; LOGMASKED(LOG_VOLUME, "Selected gain: %f, 1/RC: %f\n", - m_selected_gain, m_selected_rc_inv); + m_selected_gain, m_selected_rc_inv); } void dmx_voice_card_vca_device::decay() @@ -296,7 +296,7 @@ void dmx_voice_card_vca_device::sound_stream_update(sound_stream &stream, const out.put(i, m_selected_gain * in.get(i)); LOGMASKED(LOG_SAMPLES, "%s VCA - just gain: %f. Samples: %f, %f.\n", - tag(), m_selected_gain, in.get(0), in.get(n - 1)); + tag(), m_selected_gain, in.get(0), in.get(n - 1)); return; } @@ -322,7 +322,7 @@ void dmx_voice_card_vca_device::sound_stream_update(sound_stream &stream, const m_decay_done = true; LOGMASKED(LOG_SAMPLES_DECAY, "%s VCA - in decay: %f. Samples: %f, %f.\n", - tag(), gain, in.get(0), in.get(n - 1)); + tag(), gain, in.get(0), in.get(n - 1)); } void dmx_voice_card_vca_device::init_gain_and_decay_variations(const dmx_voice_card_config &config) @@ -355,7 +355,7 @@ void dmx_voice_card_vca_device::init_gain_and_decay_variations(const dmx_voice_c for (int i = 0; i < m_gain.size(); ++i) { LOGMASKED(LOG_VOLUME, "%s: Gain variation %d: %f uA, %f\n", - tag(), i, m_gain[i] * 1e6F, m_gain[i] / MAX_IREF); + tag(), i, m_gain[i] * 1e6F, m_gain[i] / MAX_IREF); m_gain[i] /= MAX_IREF; // Normalize. } @@ -375,7 +375,7 @@ void dmx_voice_card_vca_device::init_gain_and_decay_variations(const dmx_voice_c { m_decay_rc_inv.push_back(1.0F / ((R8 + r) * c3)); LOGMASKED(LOG_VOLUME, "%s: Decay 1/RC variation %d: %f\n", - tag(), m_decay_rc_inv.size() - 1, m_decay_rc_inv.back()); + tag(), m_decay_rc_inv.size() - 1, m_decay_rc_inv.back()); } } } @@ -637,7 +637,7 @@ void dmx_voice_card_device::compute_pitch_variations() m_sample_t[i] = attotime::from_double(t_high + t_low); LOGMASKED(LOG_PITCH, "%s Pitch variation %d: %f (%f, %f)\n", - tag(), i, 1.0 / m_sample_t[i].as_double(), t_high, t_low); + tag(), i, 1.0 / m_sample_t[i].as_double(), t_high, t_low); } if (m_config.pitch_control) @@ -659,7 +659,7 @@ void dmx_voice_card_device::select_pitch() m_timer->adjust(sampling_t, 0, sampling_t); LOGMASKED(LOG_PITCH, "Setting sampling frequency: %f\n", - 1.0 / sampling_t.as_double()); + 1.0 / sampling_t.as_double()); } bool dmx_voice_card_device::is_decay_enabled() const @@ -1044,7 +1044,7 @@ private: { RES_K(100), RES_K(6.8) }, // R24, R23 - VC_PERC2 { RES_K(8.2), RES_K(20) }, // R20, R19 - VC_CYMBAL { RES_K(10), RES_K(10) }, // R26, R25 - METRONOME_INDEX - // ECO 304 values (see update_metronome()). + // ECO 304 values (see update_metronome()). }; static constexpr const int VOICE_TO_FADER_MAP[NUM_MIXED_VOICES] = @@ -1165,7 +1165,7 @@ void dmx_state::update_metronome() m_metronome->level_w(level); LOGMASKED(LOG_METRONOME, "Metronome update - on:%d, mix:%d, level:%d\n", - m_metronome_on, m_metronome_mix, level); + m_metronome_on, m_metronome_mix, level); } void dmx_state::metronome_mix_w(u8 data) @@ -1351,7 +1351,7 @@ void dmx_state::update_mix_level(int voice) m_right_mixer->set_input_gain(voice, gain_right); LOGMASKED(LOG_FADERS, "Voice %d volume changed to: %d (gain L:%f, R:%f), HPF cutoff: %.2f Hz\n", - voice, pot_percent, gain_left, gain_right, 1.0F / (2 * float(M_PI) * r_gnd * rc_c)); + voice, pot_percent, gain_left, gain_right, 1.0F / (2 * float(M_PI) * r_gnd * rc_c)); } void dmx_state::memory_map(address_map &map) diff --git a/src/mame/oberheim/xpander.cpp b/src/mame/oberheim/xpander.cpp index ec7a496784f..f5b21a97967 100644 --- a/src/mame/oberheim/xpander.cpp +++ b/src/mame/oberheim/xpander.cpp @@ -601,7 +601,7 @@ void xpander_state::voice_update_cv(u8 voice, u8 cv_index, float cv, bool fast) m_cv[voice][cv_index] = cv; m_fast[voice][cv_index] = fast; LOGMASKED(LOG_DAC, "Voice %d - CV %s: %f, fast: %d\n", - voice, CV_NAMES[cv_index], cv, fast); + voice, CV_NAMES[cv_index], cv, fast); } void xpander_state::voice_update_resonance_cv(u8 voice, float cv) @@ -613,7 +613,7 @@ void xpander_state::voice_update_resonance_cv(u8 voice, float cv) m_cv[voice][RES_CV_INDEX] = cv; LOGMASKED(LOG_DAC, "Voice %d - CV %s: %f\n", - voice, CV_NAMES[RES_CV_INDEX], cv); + voice, CV_NAMES[RES_CV_INDEX], cv); } void xpander_state::voice_dac_enable_w(offs_t offset, u8 data) @@ -680,7 +680,7 @@ void xpander_state::voice_dac_enable_w(offs_t offset, u8 data) if (is_hres) // Turns on U814. { dac_v += -RES_K(10) / RES_K(30.1) * m_dac_fine_v - -RES_K(10) / RES_K(17.4) * m_dac_vref; + -RES_K(10) / RES_K(17.4) * m_dac_vref; } const u8 sh_address = (offset >> 1) & 0x07; // A1-A3. @@ -723,7 +723,7 @@ void xpander_state::voice_dac_clear_w(u8 data) m_dac_data = ((data & LOW7_MASK) << 7) | (m_dac_data & LOW7_MASK); m_allow_fast = BIT(data, 7); LOGMASKED(LOG_DAC_VERBOSE, "DAC clear %02x: %04x - %d\n", - data, m_dac_data, m_allow_fast); + data, m_dac_data, m_allow_fast); } void xpander_state::voice_dac_w(offs_t offset, u8 data) @@ -945,13 +945,13 @@ DECLARE_INPUT_CHANGED_MEMBER(xpander_state::encoder_moved) static constexpr const int WRAP_BUFFER = 3; const bool overflowed = newval <= WRAP_BUFFER && - oldval >= NUM_ENCODER_POSITIONS - WRAP_BUFFER; + oldval >= NUM_ENCODER_POSITIONS - WRAP_BUFFER; const bool underflowed = newval >= NUM_ENCODER_POSITIONS - WRAP_BUFFER && - oldval <= WRAP_BUFFER; + oldval <= WRAP_BUFFER; m_encoder_dir[encoder] = ((newval > oldval) || overflowed) && !underflowed; LOGMASKED(LOG_ENCODERS, "Encoder %d changed from: %d to: %d (o: %d, u: %d), dir: %d\n", - encoder, oldval, newval, overflowed, underflowed, bool(m_encoder_dir[encoder])); + encoder, oldval, newval, overflowed, underflowed, bool(m_encoder_dir[encoder])); } DECLARE_INPUT_CHANGED_MEMBER(xpander_state::memory_protect_changed) diff --git a/src/mame/paia/midi2cv8.cpp b/src/mame/paia/midi2cv8.cpp index 056f9c016cd..28d459ae698 100644 --- a/src/mame/paia/midi2cv8.cpp +++ b/src/mame/paia/midi2cv8.cpp @@ -179,8 +179,8 @@ void midi2cv8_state::update_active_cv() m_cv_display_fractional[physical_output] = cv_millis % 1000; LOGMASKED(LOG_CVS, "CV %d - %d: %f - %d @ %f\n", - physical_output + 1, m_selected_output_mux, cv, cv_millis, - machine().time().as_double()); + physical_output + 1, m_selected_output_mux, cv, cv_millis, + machine().time().as_double()); } bool midi2cv8_state::compute_cv(float *cv) const diff --git a/src/mame/sfrj/pmp11.cpp b/src/mame/sfrj/pmp11.cpp index 08b162faa65..119fe41bf85 100644 --- a/src/mame/sfrj/pmp11.cpp +++ b/src/mame/sfrj/pmp11.cpp @@ -30,7 +30,7 @@ private: required_device m_maincpu; required_device m_uart1; required_device m_uart2; - required_device m_fdc; + required_device m_fdc; }; void pmp11_state::pdp11_mem(address_map &map) @@ -95,8 +95,8 @@ void pmp11_state::pmp11(machine_config &config) rs232b.rxd_handler().set("uart2", FUNC(i8251_device::write_rxd)); rs232b.dsr_handler().set("uart2", FUNC(i8251_device::write_dsr)); rs232b.cts_handler().set("uart2", FUNC(i8251_device::write_cts)); - - WD2797(config, m_fdc, 8_MHz_XTAL / 4); + + WD2797(config, m_fdc, 8_MHz_XTAL / 4); } ROM_START( pmp11 ) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 3c756aecb77..2edc9339a5a 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -184,7 +184,7 @@ void sigmab31_state::sigmab31(machine_config &config) { MC6809(config, m_maincpu, 8_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::main_map); - + MC6809(config, m_audiocpu, 8_MHz_XTAL); m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab31_state::sound_map); diff --git a/src/mame/toaplan/toaplan1_m.cpp b/src/mame/toaplan/toaplan1_m.cpp index 2a205b93a20..9f7d763a106 100644 --- a/src/mame/toaplan/toaplan1_m.cpp +++ b/src/mame/toaplan/toaplan1_m.cpp @@ -50,7 +50,7 @@ u16 toaplan1_demonwld_state::dsp_r() case 0xc00000: {address_space &mainspace = m_maincpu->space(AS_PROGRAM); input_data = mainspace.read_word(m_main_ram_seg + m_dsp_addr_w); break;} - default: + default: if (!machine().side_effects_disabled()) logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", m_dsp->pcbase(), m_main_ram_seg + m_dsp_addr_w); break; diff --git a/src/mame/toaplan/toaplan1_v.cpp b/src/mame/toaplan/toaplan1_v.cpp index 173025824c7..abdafd46a26 100644 --- a/src/mame/toaplan/toaplan1_v.cpp +++ b/src/mame/toaplan/toaplan1_v.cpp @@ -480,7 +480,7 @@ u16 toaplan1_state::scroll_regs_r(offs_t offset) case 03: case 05: case 07: scroll = m_scrolly[layer]; break; - default: + default: if (!machine().side_effects_disabled()) logerror("Hmmm, reading unknown video scroll register (%02x) !!!\n",offset); break; diff --git a/src/mame/tvgames/spg29x_lexibook_jg7425.cpp b/src/mame/tvgames/spg29x_lexibook_jg7425.cpp index 97d4568b05b..f3357933a3e 100644 --- a/src/mame/tvgames/spg29x_lexibook_jg7425.cpp +++ b/src/mame/tvgames/spg29x_lexibook_jg7425.cpp @@ -209,7 +209,7 @@ ROM_START( ubox30 ) ROM_IGNORE(0x300) DISK_REGION( "cfcard" ) - DISK_IMAGE( "ubox_sd_512", 0, SHA1(99f2f1437d644a5e1fe48ce1445acf48fb8b0359) ) + DISK_IMAGE( "ubox_sd_512", 0, SHA1(99f2f1437d644a5e1fe48ce1445acf48fb8b0359) ) ROM_REGION( 0x008000, "spg290", ROMREGION_32BIT | ROMREGION_LE ) ROM_LOAD32_DWORD("internal.rom", 0x000000, 0x008000, NO_DUMP) diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index fbaff440e78..9b36b28177f 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -55,14 +55,14 @@ 2005 Let's!TVプレイ ドラゴンボ－ルＺ バトル体感かめはめ波～ おめぇとフュージョン / バンダイ / 日本 Let's! TV Play Dragon Ball Z Battle Taikan Kamehameha~ Omee to Fusion / Bandai / Japan dumped: either here, xavix_2000.cpp, or xavix_2002.cpp - Let's!TVプレイ なりきりファイト ウルトラマン 撃て！必殺光線！！ / タカラトミー / 日本 Let's!TV Play Narikiri Fight Ultraman Shoot! Deadly ray! ! / Takara Tomy / Japan - Hello Kitty TV computer /EPOCH/Japan - - - - - - - - Popira Korea version /SONOKONG/Korea - - - - - - - + Let's!TVプレイ なりきりファイト ウルトラマン 撃て！必殺光線！！ / タカラトミー / 日本 Let's!TV Play Narikiri Fight Ultraman Shoot! Deadly ray! ! / Takara Tomy / Japan + Hello Kitty TV computer /EPOCH/Japan - - - - - - - + Popira Korea version /SONOKONG/Korea - - - - - - - I singer: e-kara Korean version /SONOKONG/Korea - - - - - - - - Accessory memory mascot for TV mail Pc mail cot 2 characters (Putchi, Petchi) /EPOCH/Japan (no unique ROM, just I2C memory storage) + Accessory memory mascot for TV mail Pc mail cot 2 characters (Putchi, Petchi) /EPOCH/Japan (no unique ROM, just I2C memory storage) Accessory memory mascot for TV mail Pc mail cot 2 characters (Charuru, Kurau) /EPOCH/Japan (no unique ROM, just I2C memory storage) TV mail PC "Mercot /EPOCH/Japan - - - - - - - - Let's!TVプレイ 体感キャストオフ 仮面ライダーカブト クロックアップ＆ライダーキック / バンダイ / 日本 Let's! TV Play Taikan Cast Off Kamen Rider Kabuto Clock Up & Rider Kick / Bandai / Japan + Let's!TVプレイ 体感キャストオフ 仮面ライダーカブト クロックアップ＆ライダーキック / バンダイ / 日本 Let's! TV Play Taikan Cast Off Kamen Rider Kabuto Clock Up & Rider Kick / Bandai / Japan Let's!TVプレイ なりきり体感 ボウケンジャー 走れ！撃て！ミッションスタート！！ / バンダイ / 日本 Let's! TV Play Narikiri Taikan Boukenger Hashire! Ute! Mission Start!! / Bandai / Japan Webdiver Gradion /TAKARA/Japan - - - - - - - Let's!TVプレイ 魔法戦隊マジレンジャー マジマットでダンス＆バトル / バンダイ / 日本 Let's! TV Play Mahou Taiketsu Magiranger - Magimat de Dance & Battle / Bandai / Japan @@ -3022,7 +3022,7 @@ CONS( 2001, ddrfammt, 0, 0, xavix_cart_ddrfammt,ddrfammt, xavix_cart_ // ポピラ CONS( 2000, popira, 0, 0, xavix_cart_popira,popira, xavix_cart_state, init_xavix, "Takara / SSD Company LTD", "Popira (Japan)", MACHINE_IMPERFECT_SOUND/*|MACHINE_IS_BIOS_ROOT*/ ) // The original Popira is a single yellow unit -// the Korean release is not properly compatible with the usual Popira carts, although some of the Korean i-singer range are compatible +// the Korean release is not properly compatible with the usual Popira carts, although some of the Korean i-singer range are compatible CONS( 2001, popirak, popira, 0, xavix_cart_popirak,popira, xavix_cart_state, init_xavix, "Sonokong / SSD Company LTD", "PoPiRa - Finger Sports (Korea)", MACHINE_IMPERFECT_SOUND/*|MACHINE_IS_BIOS_ROOT*/ ) // ポピラ2