From bcddfc25235d88fc871158ee9b87492ca3562f3c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 23 Apr 2023 02:01:48 +1000 Subject: srcclean in preparation for release --- hash/abc80_rom.xml | 6 +-- hash/fmtowns_cd.xml | 4 +- hash/mobigo_cart.xml | 4 +- hash/st_flop.xml | 16 ++++---- src/devices/bus/gio64/newport.cpp | 2 +- src/devices/bus/oricext/oricext.h | 2 +- src/devices/bus/spectrum/neogs.cpp | 10 ++--- src/devices/cpu/m6502/gew12.cpp | 14 ++++--- src/devices/cpu/m6502/gew7.cpp | 14 ++++--- src/devices/cpu/m68000/m68000.cpp | 8 ++-- src/devices/cpu/m68000/tmp68301.cpp | 32 ++++++++-------- src/devices/cpu/m68000/tmp68301.h | 4 +- src/devices/cpu/m6809/m6809.cpp | 4 +- src/devices/cpu/v810/v810.cpp | 2 +- src/devices/machine/wd_fdc.cpp | 2 +- src/devices/video/epic12.cpp | 16 ++++---- src/devices/video/epic12.h | 2 +- src/devices/video/huc6270.cpp | 4 +- src/devices/video/sn74s262.cpp | 12 +++--- src/devices/video/sn74s262.h | 4 +- src/mame/dynax/dynax.cpp | 2 +- src/mame/funworld/supercrd.cpp | 8 ++-- src/mame/layout/pss11.lay | 18 ++++----- src/mame/layout/pss12.lay | 74 ++++++++++++++++++------------------- src/mame/layout/pss21.lay | 20 +++++----- src/mame/layout/pss31.lay | 20 +++++----- src/mame/layout/pss6.lay | 68 +++++++++++++++++----------------- src/mame/luxor/abc80.cpp | 24 ++++++------ src/mame/luxor/abc80_v.cpp | 30 +++++++-------- src/mame/nichibutsu/csplayh5.cpp | 14 +++---- src/mame/tangerine/oric.cpp | 2 +- 31 files changed, 223 insertions(+), 219 deletions(-) diff --git a/hash/abc80_rom.xml b/hash/abc80_rom.xml index 5d0f3db1cd9..5106980f34f 100644 --- a/hash/abc80_rom.xml +++ b/hash/abc80_rom.xml @@ -6,7 +6,7 @@ license:CC0-1.0 - + ABC-DOS 19?? unknown @@ -19,7 +19,7 @@ license:CC0-1.0 - + ABC-DOS DD 19?? unknown @@ -32,7 +32,7 @@ license:CC0-1.0 - + UFD-DOS v.20 19?? unknown diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml index 370412e3a63..ed513ca6e7f 100644 --- a/hash/fmtowns_cd.xml +++ b/hash/fmtowns_cd.xml @@ -21520,8 +21520,8 @@ User/save disks that can be created from the game itself are not included. + 80-250700 - Touch & Learn - Game Pack (US) + 80-250704 - MobiGo 2 (GE) --> Ben 10 - UltimateAlien - Mine der Gedanken (Germany) diff --git a/hash/st_flop.xml b/hash/st_flop.xml index 92982497d4e..3e9301d812a 100644 --- a/hash/st_flop.xml +++ b/hash/st_flop.xml @@ -5022,7 +5022,7 @@ editor.prg hangs when creating a folder, [FDC] write Trash Heap (Europe) 1987 Robtek - @@ -5048,7 +5048,7 @@ First two copy protection codes are always W/16 - A/5 (verify) Trauma (Europe) 1989 Infogrames - @@ -5208,7 +5208,7 @@ White screen, [68k] stalls on bootstrap with invalid opcode PC=13eba Universe 3 (Euro, v1.0) 1990 Impressions - @@ -5262,7 +5262,7 @@ Fails [disk swap] when launching univers3.prg Vectorball (Europe) 1988 MAD - @@ -5316,7 +5316,7 @@ Fails [disk swap] when launching univers3.prg Wanderer 3D (Euro, Budget) 1988 Encore - @@ -5430,7 +5430,7 @@ Fails to recognize [disk swap] after title screen Where Time Stood Still (Europe) 1988 Ocean - @@ -5479,7 +5479,7 @@ Randomly hangs after few seconds in gameplay or doesn't recognize fire button on World Championship Boxing Manager (Europe) 1990 Krisalis - @@ -5504,7 +5504,7 @@ Prompts user to insert the "other" disk, fails [disk swap] World Class Leader Board (Euro, Budget) 1990 Klassix - diff --git a/src/devices/bus/gio64/newport.cpp b/src/devices/bus/gio64/newport.cpp index 06f01ae0cd5..2f66e72f5e4 100644 --- a/src/devices/bus/gio64/newport.cpp +++ b/src/devices/bus/gio64/newport.cpp @@ -2845,7 +2845,7 @@ void newport_base_device::do_fline(uint32_t color) dy = temp_d; break; } - case 0: // Pseudo 7 + case 0: // Pseudo 7 { const int16_t temp_fract = 0x10 - y1_fract; y1_fract = x1_fract; diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index 2ec7c34b1c1..7aba735aa06 100644 --- a/src/devices/bus/oricext/oricext.h +++ b/src/devices/bus/oricext/oricext.h @@ -59,7 +59,7 @@ public: void set_view(memory_view &view); virtual void map_io(address_space_installer &space) = 0; virtual void map_rom() = 0; - + protected: device_oricext_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/spectrum/neogs.cpp b/src/devices/bus/spectrum/neogs.cpp index 319f63f47d6..b02993174d4 100644 --- a/src/devices/bus/spectrum/neogs.cpp +++ b/src/devices/bus/spectrum/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: - SPI @@ -235,7 +235,7 @@ void neogs_device::neogsmap(address_map &map) void neogs_device::device_start() { if (!m_ram->started()) - throw device_missing_dependencies(); + throw device_missing_dependencies(); m_bank_rom->configure_entries(0, m_rom.bytes() / 0x8000, &m_rom[0], 0x8000); m_bank_ram->configure_entries(0, m_ram->size() / 0x8000, m_ram->pointer(), 0x8000); diff --git a/src/devices/cpu/m6502/gew12.cpp b/src/devices/cpu/m6502/gew12.cpp index e880d28b714..716df3fe020 100644 --- a/src/devices/cpu/m6502/gew12.cpp +++ b/src/devices/cpu/m6502/gew12.cpp @@ -12,8 +12,10 @@ #include "gew12.h" #include "m6502mcu.ipp" + #include "bus/generic/slot.h" + DEFINE_DEVICE_TYPE(GEW12, gew12_device, "gew12", "Yamaha YMW728-F (GEW12)") gew12_device::gew12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -40,12 +42,12 @@ void gew12_device::device_start() m_out_cb.resolve_all_safe(); m_bank_mask = device_generic_cart_interface::map_non_power_of_two( - unsigned(m_rom->bytes() >> 14), - [this, base = &m_rom->as_u8()](unsigned entry, unsigned page) - { - m_bank[0]->configure_entry(entry, &base[page << 14]); - m_bank[1]->configure_entry(entry, &base[page << 14]); - }); + unsigned(m_rom->bytes() >> 14), + [this, base = &m_rom->as_u8()] (unsigned entry, unsigned page) + { + m_bank[0]->configure_entry(entry, &base[page << 14]); + m_bank[1]->configure_entry(entry, &base[page << 14]); + }); m_timer_base[0] = m_timer_base[1] = 0; diff --git a/src/devices/cpu/m6502/gew7.cpp b/src/devices/cpu/m6502/gew7.cpp index 96b6a03a2df..d85cf4bff97 100644 --- a/src/devices/cpu/m6502/gew7.cpp +++ b/src/devices/cpu/m6502/gew7.cpp @@ -12,8 +12,10 @@ #include "gew7.h" #include "m6502mcu.ipp" + #include "bus/generic/slot.h" + DEFINE_DEVICE_TYPE(GEW7, gew7_device, "gew7", "Yamaha YMW270-F (GEW7)") gew7_device::gew7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -47,12 +49,12 @@ void gew7_device::device_start() m_out_cb.resolve_all_safe(); m_bank_mask = device_generic_cart_interface::map_non_power_of_two( - unsigned(m_rom->bytes() >> 14), - [this, base = &m_rom->as_u8()](unsigned entry, unsigned page) - { - m_bank[0]->configure_entry(entry, &base[page << 14]); - m_bank[1]->configure_entry(entry, &base[page << 14]); - }); + unsigned(m_rom->bytes() >> 14), + [this, base = &m_rom->as_u8()] (unsigned entry, unsigned page) + { + m_bank[0]->configure_entry(entry, &base[page << 14]); + m_bank[1]->configure_entry(entry, &base[page << 14]); + }); m_timer_base[0] = m_timer_base[1] = 0; diff --git a/src/devices/cpu/m68000/m68000.cpp b/src/devices/cpu/m68000/m68000.cpp index 7159a7d9bca..b60021b2a51 100644 --- a/src/devices/cpu/m68000/m68000.cpp +++ b/src/devices/cpu/m68000/m68000.cpp @@ -492,22 +492,22 @@ void m68000_mcu_device::execute_run() for(;;) { if(m_icount > m_bcount && m_inst_substate) (this->*(m_handlers_p[m_inst_state]))(); - + while(m_icount > m_bcount) { if(m_inst_state >= S_first_instruction) { m_ipc = m_pc - 2; m_irdi = m_ird; - + if(machine().debug_flags & DEBUG_FLAG_ENABLED) debugger_instruction_hook(m_ipc); } (this->*(m_handlers_f[m_inst_state]))(); } - + if(m_post_run) do_post_run(); else - break; + break; } if(m_icount > 0) while(m_bcount && m_icount <= m_bcount) diff --git a/src/devices/cpu/m68000/tmp68301.cpp b/src/devices/cpu/m68000/tmp68301.cpp index bea5089e84f..206e7cb9a22 100644 --- a/src/devices/cpu/m68000/tmp68301.cpp +++ b/src/devices/cpu/m68000/tmp68301.cpp @@ -57,7 +57,7 @@ void tmp68301_device::internal_update(uint64_t current_time) event_time = m_timer_next_event[i]; } - recompute_bcount(event_time); + recompute_bcount(event_time); } void tmp68301_device::device_start() @@ -68,7 +68,7 @@ void tmp68301_device::device_start() for(auto &tx : m_tx_cb) tx.resolve_safe(); - + save_item(NAME(m_external_interrupt_state)); save_item(NAME(m_amar)); @@ -379,7 +379,7 @@ const int tmp68301_device::interrupt_vector_to_slot[32] = { -1, -1, -1, -1, -1, -1, -1, -1 }; -u8 tmp68301_device::icr_r(offs_t reg) { return m_icr[reg]; } +u8 tmp68301_device::icr_r(offs_t reg) { return m_icr[reg]; } u16 tmp68301_device::imr_r() { return m_imr; } u16 tmp68301_device::ipr_r() { return m_ipr; } u16 tmp68301_device::iisr_r() { return m_iisr; } @@ -578,12 +578,12 @@ void tmp68301_device::interrupt_update() { auto [level, vector, slot] = interrupt_get_current(); set_current_interrupt_level(level); - // logerror("interrupt update ipr=%03x imr=%03x state=%08x (%x, %02x, %2d)\n", m_ipr, m_imr, m_interrupt_state, level, vector, slot); + // logerror("interrupt update ipr=%03x imr=%03x state=%08x (%x, %02x, %2d)\n", m_ipr, m_imr, m_interrupt_state, level, vector, slot); } void tmp68301_device::interrupt_internal_trigger(int vector) { - // logerror("interrupt internal trigger %02x\n", vector); + // logerror("interrupt internal trigger %02x\n", vector); m_interrupt_state |= 1 << vector; m_ipr |= 1 << interrupt_vector_to_slot[vector]; interrupt_update(); @@ -592,7 +592,7 @@ void tmp68301_device::interrupt_internal_trigger(int vector) u8 tmp68301_device::interrupt_callback() { auto [level, vector, slot] = interrupt_get_current(); - // logerror("interrupt callback ipr=%03x imr=%03x (%x, %02x, %d)\n", m_ipr, m_imr, level, vector, slot); + // logerror("interrupt callback ipr=%03x imr=%03x (%x, %02x, %d)\n", m_ipr, m_imr, level, vector, slot); if(slot < 3) standard_irq_callback(slot, m_pc); if(vector != 0x1f) { @@ -681,7 +681,7 @@ void tmp68301_device::pmr_w(u8 data) m_pmr & 0x04 ? "auto" : "manual", m_pmr & 0x02 ? "ack" : "-", m_pmr & 0x01 ? "external" : "internal"); - + } u16 tmp68301_device::pdr_r() @@ -701,7 +701,7 @@ void tmp68301_device::pdr_w(offs_t, u16 data, u16 mem_mask) COMBINE_DATA(&m_pdr); if(m_pdr == old) return; - // logerror("parallel data %04x\n", m_pdr); + // logerror("parallel data %04x\n", m_pdr); if(m_parallel_mode == 0) { if(m_pdir == 0x0000) return; @@ -775,10 +775,10 @@ void tmp68301_device::serial_check_interrupt(int ch) intr |= 1 << SR_INT_ERR; } if(intr != old_interrupt) { - // logerror("serial intr mask %x\n", intr); + // logerror("serial intr mask %x\n", intr); for(int i=0; i != 3; i++) if((intr & (1 << i)) && !(m_sr_intr[ch] & (1 << i))) - interrupt_internal_trigger(8 + 4*ch + i); + interrupt_internal_trigger(8 + 4*ch + i); } m_sr_intr[ch] = intr; } @@ -965,7 +965,7 @@ void tmp68301_device::serial_rx_w(int ch, int state) void tmp68301_device::serial_rx_update(int ch) { - // logerror("rx update channel %d state %d\n", ch, m_serial_rx_state[ch]); + // logerror("rx update channel %d state %d\n", ch, m_serial_rx_state[ch]); u64 next = m_serial_rx_next_event[ch] + 8*m_serial_gclk[ch]; u8 nstate = m_serial_rx_state[ch] + 1; u8 line = m_serial_rx_line[ch]; @@ -1042,12 +1042,12 @@ void tmp68301_device::serial_rx_update(int ch) } m_serial_rx_next_event[ch] = next; - m_serial_rx_state[ch] = nstate; + m_serial_rx_state[ch] = nstate; } void tmp68301_device::serial_tx_update(int ch) { - // logerror("tx update channel %d state %d\n", ch, m_serial_tx_state[ch]); + // logerror("tx update channel %d state %d\n", ch, m_serial_tx_state[ch]); u64 next = m_serial_tx_next_event[ch] + 8*m_serial_gclk[ch]; u8 nstate = m_serial_tx_state[ch] + 1; switch(m_serial_tx_state[ch]) { @@ -1115,7 +1115,7 @@ void tmp68301_device::serial_tx_update(int ch) } m_serial_tx_next_event[ch] = next; - m_serial_tx_state[ch] = nstate; + m_serial_tx_state[ch] = nstate; machine().scheduler().synchronize(); } @@ -1251,7 +1251,7 @@ void tmp68301_device::timer_sync(int ch) u64 ctime = total_cycles(); // Don't fold the shifts, the computation would be incorrect u32 ntctr = m_tctr[ch] + ((ctime >> div) - (m_timer_last_sync[ch] >> div)); - + u32 maxmode = (m_tcr[ch] >> TCR_MR) & 3; if(maxmode == 1 || maxmode == 2) { u32 max = (maxmode == 1) ? m_tmcr1[ch] : m_tmcr2[ch]; @@ -1294,7 +1294,7 @@ void tmp68301_device::timer_predict(int ch) logerror("timer %d alternating max mode unsupported\n", ch); return; } - + if((m_tcr[ch] & TCR_N1) == 0) { // Need to add a flag to say "counter done" to make it work, reset on mode change. logerror("timer %d single-shot mode unsupported\n"); diff --git a/src/devices/cpu/m68000/tmp68301.h b/src/devices/cpu/m68000/tmp68301.h index c2c1b4cfb53..f5b9b05f118 100644 --- a/src/devices/cpu/m68000/tmp68301.h +++ b/src/devices/cpu/m68000/tmp68301.h @@ -82,7 +82,7 @@ protected: static const int interrupt_vector_to_slot[32]; static const int interrupt_slot_to_priority[11]; - u16 m_external_interrupt_state; + u16 m_external_interrupt_state; u32 m_interrupt_state; u8 m_icr[10]; u16 m_imr, m_ipr, m_iisr; @@ -266,7 +266,7 @@ protected: void timer_update(int ch); void timer_sync(int ch); void timer_predict(int ch); - + void tcr_w(int ch, u16 data, u16 mem_mask); void tmcr1_w(int ch, u16 data, u16 mem_mask); void tmcr2_w(int ch, u16 data, u16 mem_mask); diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index 50a5003b8b7..8bf50525cb6 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -23,8 +23,8 @@ History: January 2023 tlindner: - Add 6809 undocumented opcodes as described here: - https://github.com/hoglet67/6809Decoder/wiki/Undocumented-6809-Behaviours + Add 6809 undocumented opcodes as described here: + https://github.com/hoglet67/6809Decoder/wiki/Undocumented-6809-Behaviours July 2016 ErikGav: Unify with 6309 pairs and quads (A+B=D, E+F=W, D+W=Q) diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp index 3c20810e0a4..058a9f976cb 100644 --- a/src/devices/cpu/v810/v810.cpp +++ b/src/devices/cpu/v810/v810.cpp @@ -1122,7 +1122,7 @@ uint32_t v810_device::opFpoint(uint32_t op) //case 0xa: REV (*) case 0xb: op_cycles = opTRNC(op);break; case 0xc: op_cycles = opMPYHW(op); break; // (*) - default: + default: throw emu_fatalerror("Floating point unknown type %02x\n", op_type); break; } diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index f53c88e2934..ac07dc460d8 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -2047,7 +2047,7 @@ void wd_fdc_device_base::live_run(attotime limit) //FM Prefix match if(cur_live.shift_reg_low<17>() == 0xabd5) { // 17-bit match cur_live.data_separator_phase = false; - cur_live.bit_counter = 5*2; // prefix is 5 of 8 bits + cur_live.bit_counter = 5*2; // prefix is 5 of 8 bits cur_live.data_reg = 0xff; break; } else if(cur_live.bit_counter == 16) { diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp index cf14e6abc76..ebad087f080 100644 --- a/src/devices/video/epic12.cpp +++ b/src/devices/video/epic12.cpp @@ -366,7 +366,7 @@ inline u16 calculate_vram_accesses(u16 start_x, u16 start_y, u16 dimx, u16 dimy) { num_vram_rows += x_rows; if (((start_y & 31) + std::min(32, y_pixels)) > 32) - num_vram_rows += x_rows; // Drawing across multiple vertical VRAM row boundaries. + num_vram_rows += x_rows; // Drawing across multiple vertical VRAM row boundaries. } return num_vram_rows; } @@ -412,7 +412,7 @@ inline void epic12_device::gfx_draw_shadow_copy(address_space &space, offs_t *ad COPY_NEXT_WORD(space, addr); u16 src_x_start = COPY_NEXT_WORD(space, addr); u16 src_y_start = COPY_NEXT_WORD(space, addr); - u16 dst_x_start = COPY_NEXT_WORD(space, addr); + u16 dst_x_start = COPY_NEXT_WORD(space, addr); u16 dst_y_start = COPY_NEXT_WORD(space, addr); u16 src_dimx = (COPY_NEXT_WORD(space, addr) & 0x1fff) + 1; u16 src_dimy = (COPY_NEXT_WORD(space, addr) & 0x0fff) + 1; @@ -424,7 +424,7 @@ inline void epic12_device::gfx_draw_shadow_copy(address_space &space, offs_t *ad // by asserting BREQ on the SH3 and then reading from Main RAM. // Since the reads are done concurrently to executions of operations, its // ok to estimate the delay all at once instead for emulation purposes. - + u16 dst_x_end = dst_x_start + src_dimx - 1; u16 dst_y_end = dst_y_start + src_dimy - 1; @@ -436,14 +436,14 @@ inline void epic12_device::gfx_draw_shadow_copy(address_space &space, offs_t *ad } m_blit_idle_op_bytes = 0; // Blitter no longer idle. - - // VRAM data is laid out in 32x32 pixel rows. Calculate amount of rows accessed. + + // VRAM data is laid out in 32x32 pixel rows. Calculate amount of rows accessed. int src_num_vram_rows = calculate_vram_accesses(src_x_start, src_y_start, src_dimx, src_dimy); int dst_num_vram_rows = calculate_vram_accesses(dst_x_start, dst_y_start, src_dimx, src_dimy); // Since draws are done 4 pixels at the time, extend the draw area to coordinates aligned for this. // Doing this after VRAM calculations simplify things a bit, and these extensions will never make the - // destination area span additional VRAM rows. + // destination area span additional VRAM rows. dst_x_start -= dst_x_start & 3; dst_x_end += (4 - ((dst_x_end + 1) & 3)) & 3; u16 dst_dimx = dst_x_end - dst_x_start + 1; @@ -459,7 +459,7 @@ inline void epic12_device::gfx_draw_shadow_copy(address_space &space, offs_t *ad // - 11 CLK of overhead after each write to a destination VRAM row. // - 12 CLK of additional overhead per sprite at the end of writing. // Note: Details are from https://buffis.com/docs/CV1000_Blitter_Research_by_buffi.pdf - // There may be mistakes. + // There may be mistakes. u32 num_vram_clk = src_dimx * src_dimy / 4 + dst_dimx * dst_dimy / 2 + src_num_vram_rows * 6 + dst_num_vram_rows * (20 + 11) + 12; m_blit_delay_ns += num_vram_clk * EP1C_VRAM_CLK_NANOSEC; } @@ -797,7 +797,7 @@ void epic12_device::gfx_exec_w(address_space &space, offs_t offset, u32 data, u3 // Create a copy of the blit list so we can safely thread it. // Copying the Blitter operations will also estimate the delay needed for processing. m_blit_delay_ns = 0; - gfx_create_shadow_copy(space); + gfx_create_shadow_copy(space); // Every EP1C_VRAM_H_LINE_PERIOD_NANOSEC, the Blitter will block other operations, due // to fetching a horizontal line from VRAM for output. diff --git a/src/devices/video/epic12.h b/src/devices/video/epic12.h index 0b49040891e..cb250b99cee 100644 --- a/src/devices/video/epic12.h +++ b/src/devices/video/epic12.h @@ -827,7 +827,7 @@ protected: // actually performing any work. // This will still be visible from the CPU as Blitter being busy, until the // operation list has exited. - // + // // TODO: Having 64 bytes of non-drawing operations in a row will only cause the Blitter // to idle if the operations are read from the same 64 byte chunk (and not split between two). // More proper handling of this would be to change the reads from SRAM to be done 64 bytes at the time diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp index 8f608ae97b5..a0543307402 100644 --- a/src/devices/video/huc6270.cpp +++ b/src/devices/video/huc6270.cpp @@ -536,8 +536,8 @@ WRITE_LINE_MEMBER( huc6270_device::hsync_changed ) m_byr_latched += 1; m_raster_count += 1; // raster count VSW latch happens one line earlier (cfr. +2 on assignment) - // This has been confirmed on real HW, where the last possible RCR with - // 240 VDW is 0x130 (i.e. 64 + 240). m_vert_to_go == 1 will also + // This has been confirmed on real HW, where the last possible RCR with + // 240 VDW is 0x130 (i.e. 64 + 240). m_vert_to_go == 1 will also // cause several side effects, namely: // - draculax Stage 4' "all blue" Richter; // - faussete Stage 2 excessive slowdown; diff --git a/src/devices/video/sn74s262.cpp b/src/devices/video/sn74s262.cpp index 6e361614183..70b2407f953 100644 --- a/src/devices/video/sn74s262.cpp +++ b/src/devices/video/sn74s262.cpp @@ -110,7 +110,7 @@ sn74s262_device::sn74s262_device(const machine_config &mconfig, const char *tag, } sn74s263_device::sn74s263_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - sn74s262_device(mconfig, SN74S263, tag, owner, clock) + sn74s262_device(mconfig, SN74S263, tag, owner, clock) { } @@ -121,10 +121,10 @@ sn74s263_device::sn74s263_device(const machine_config &mconfig, const char *tag, u8 sn74s262_device::read(u8 character, u8 row) { - if ((row & 0xf) > 8) - { - return 0; - } + if ((row & 0xf) > 8) + { + return 0; + } - return m_char_rom[((character & 0x7f) * 10) + (row & 0xf)]; + return m_char_rom[((character & 0x7f) * 10) + (row & 0xf)]; } diff --git a/src/devices/video/sn74s262.h b/src/devices/video/sn74s262.h index 1fb22d24bf1..d91f0a42536 100644 --- a/src/devices/video/sn74s262.h +++ b/src/devices/video/sn74s262.h @@ -32,13 +32,13 @@ // ======================> sn74s262_device class sn74s262_device : public device_t, - public device_gfx_interface + public device_gfx_interface { public: // construction/destruction sn74s262_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - u8 read(u8 character, u8 row); + u8 read(u8 character, u8 row); protected: sn74s262_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/mame/dynax/dynax.cpp b/src/mame/dynax/dynax.cpp index 24bcdfc7134..789e5374277 100644 --- a/src/mame/dynax/dynax.cpp +++ b/src/mame/dynax/dynax.cpp @@ -5418,7 +5418,7 @@ void blktouch_state::init_blktouch() { // fearsome encryption ;-) uint8_t *src; - + src = (uint8_t *)memregion("maincpu")->base(); for (int i = 0; i < 0x90000; i++) src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); diff --git a/src/mame/funworld/supercrd.cpp b/src/mame/funworld/supercrd.cpp index 19650bc33f5..46c76d1fda9 100644 --- a/src/mame/funworld/supercrd.cpp +++ b/src/mame/funworld/supercrd.cpp @@ -25,7 +25,7 @@ To boot into the game... 1) Let the initial test ends. - 2) Turn ON Service Key (key 9). The screen will show "Elektronik Defekt 5". + 2) Turn ON Service Key (key 9). The screen will show "Elektronik Defekt 5". 3) Turn ON Personal A key (key 0). 4) Turn OFF Personal A key. @@ -429,8 +429,8 @@ static INPUT_PORTS_START( supercrd ) PORT_START("SW1") PORT_DIPNAME( 0x01, 0x01, "Personal A Settings" ) - PORT_DIPSETTING( 0x01, "Brief" ) // Remote A, Abgeschrieben A. - PORT_DIPSETTING( 0x00, "Complete" ) // Remote A, Gewechselt A, Abgeschrieben A, Nachgefuellt A. + PORT_DIPSETTING( 0x01, "Brief" ) // Remote A, Abgeschrieben A. + PORT_DIPSETTING( 0x00, "Complete" ) // Remote A, Gewechselt A, Abgeschrieben A, Nachgefuellt A. PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -497,7 +497,7 @@ void supercrd_state::supercrd(machine_config &config) m_maincpu->set_addrmap(AS_IO, &supercrd_state::io_map); m_maincpu->set_addrmap(AS_OPCODES, &supercrd_state::decrypted_opcodes_map); -// NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); +// NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); i8255_device &ppi0(I8255A(config, "ppi8255_0")); ppi0.in_pa_callback().set_ioport("IN0"); diff --git a/src/mame/layout/pss11.lay b/src/mame/layout/pss11.lay index 6cfec55f972..9d52a573690 100644 --- a/src/mame/layout/pss11.lay +++ b/src/mame/layout/pss11.lay @@ -57,7 +57,7 @@ license:CC0-1.0 - + @@ -109,7 +109,7 @@ license:CC0-1.0 - + @@ -123,7 +123,7 @@ license:CC0-1.0 - + @@ -132,7 +132,7 @@ license:CC0-1.0 - + @@ -159,15 +159,15 @@ license:CC0-1.0 - + - + - + - + @@ -222,7 +222,7 @@ license:CC0-1.0 - + diff --git a/src/mame/layout/pss12.lay b/src/mame/layout/pss12.lay index df727034e3f..696e1957f49 100644 --- a/src/mame/layout/pss12.lay +++ b/src/mame/layout/pss12.lay @@ -42,7 +42,7 @@ license:CC0-1.0 - + @@ -133,7 +133,7 @@ license:CC0-1.0 - + @@ -145,7 +145,7 @@ license:CC0-1.0 - + @@ -153,12 +153,12 @@ license:CC0-1.0 - + - + @@ -166,7 +166,7 @@ license:CC0-1.0 - + @@ -179,24 +179,24 @@ license:CC0-1.0 - + - + - + - + @@ -242,18 +242,18 @@ license:CC0-1.0 - + - + - + - + @@ -261,16 +261,16 @@ license:CC0-1.0 - + - + - + @@ -278,89 +278,89 @@ license:CC0-1.0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -368,14 +368,14 @@ license:CC0-1.0 - + - + diff --git a/src/mame/layout/pss21.lay b/src/mame/layout/pss21.lay index 19403e50573..2f61c89768e 100644 --- a/src/mame/layout/pss21.lay +++ b/src/mame/layout/pss21.lay @@ -63,7 +63,7 @@ license:CC0-1.0 - + @@ -115,7 +115,7 @@ license:CC0-1.0 - + @@ -129,7 +129,7 @@ license:CC0-1.0 - + @@ -138,7 +138,7 @@ license:CC0-1.0 - + @@ -165,27 +165,27 @@ license:CC0-1.0 - + - + - + - + - + - + diff --git a/src/mame/layout/pss31.lay b/src/mame/layout/pss31.lay index 1ad150be935..4a8c868cfd4 100644 --- a/src/mame/layout/pss31.lay +++ b/src/mame/layout/pss31.lay @@ -63,7 +63,7 @@ license:CC0-1.0 - + @@ -115,7 +115,7 @@ license:CC0-1.0 - + @@ -129,7 +129,7 @@ license:CC0-1.0 - + @@ -138,7 +138,7 @@ license:CC0-1.0 - + @@ -165,27 +165,27 @@ license:CC0-1.0 - + - + - + - + - + - + diff --git a/src/mame/layout/pss6.lay b/src/mame/layout/pss6.lay index f4f2e203e92..89095f3c053 100644 --- a/src/mame/layout/pss6.lay +++ b/src/mame/layout/pss6.lay @@ -38,7 +38,7 @@ license:CC0-1.0 - + @@ -114,7 +114,7 @@ license:CC0-1.0 - + @@ -126,7 +126,7 @@ license:CC0-1.0 - + @@ -134,12 +134,12 @@ license:CC0-1.0 - + - + @@ -147,7 +147,7 @@ license:CC0-1.0 - + @@ -160,18 +160,18 @@ license:CC0-1.0 - + - + - + @@ -217,18 +217,18 @@ license:CC0-1.0 - + - + - + - + @@ -236,16 +236,16 @@ license:CC0-1.0 - + - + - + @@ -253,83 +253,83 @@ license:CC0-1.0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -337,7 +337,7 @@ license:CC0-1.0 - + diff --git a/src/mame/luxor/abc80.cpp b/src/mame/luxor/abc80.cpp index 1afd34834bc..4c61ad72ab7 100644 --- a/src/mame/luxor/abc80.cpp +++ b/src/mame/luxor/abc80.cpp @@ -56,8 +56,8 @@ Notes: CN5 - cassette connector CN6 - keyboard connector SW1 - reset switch - SB1 - solder bridge for A11/CS1 to ROM1/ROM3 - SB2 - solder bridge for A11/CS1 to ROM0/ROM2 + SB1 - solder bridge for A11/CS1 to ROM1/ROM3 + SB2 - solder bridge for A11/CS1 to ROM0/ROM2 Calculate ROM checksum: @@ -111,8 +111,8 @@ PCB Layout Notes: All IC's shown. - PROM0 - MMI 63S141N 512x4 TTL Bipolar PROM - ROM4 - 4Kx8 EPROM "TKN80-III" + PROM0 - MMI 63S141N 512x4 TTL Bipolar PROM + ROM4 - 4Kx8 EPROM "TKN80-III" 6116 - Hitachi HM6116P-4 2Kx8 Static RAM @@ -133,9 +133,9 @@ Switch to 80 column mode: - PWM sound in ABC-klubben/abc80/grafik/flagga.bac - proper keyboard controller emulation - GeJo 80-column card - - 64K RAM expansions - - Mikrodatorn - - MYAB UNI-80 + - 64K RAM expansions + - Mikrodatorn + - MYAB UNI-80 - Metric ABC CAD 1000 */ @@ -192,10 +192,10 @@ u8 tkn80_state::read(offs_t offset) { /* - TKN 000-3ff -> ZA3506 000-3ff (9913/10042) - TKN 400-7ff -> ZA3507 000-3ff (9913/10042) - TKN 800-cff -> ZA3506 000-3ff (11273) - TKN c00-FFF -> ZA3507 000-3ff (11273) + TKN 000-3ff -> ZA3506 000-3ff (9913/10042) + TKN 400-7ff -> ZA3507 000-3ff (9913/10042) + TKN 800-cff -> ZA3506 000-3ff (11273) + TKN c00-FFF -> ZA3507 000-3ff (11273) */ @@ -766,7 +766,7 @@ void abc80_state::abc80(machine_config &config) void tkn80_state::tkn80(machine_config &config) { abc80_state::abc80_common(config); - + // basic machine hardware m_maincpu->set_addrmap(AS_IO, &tkn80_state::tkn80_io); diff --git a/src/mame/luxor/abc80_v.cpp b/src/mame/luxor/abc80_v.cpp index 4a005f7b0e8..cc52632304c 100644 --- a/src/mame/luxor/abc80_v.cpp +++ b/src/mame/luxor/abc80_v.cpp @@ -16,7 +16,7 @@ void tkn80_state::set_screen_params(void) { m_screen->set_raw(XTAL(11'980'800), ABC80_HTOTAL*2, ABC80_HBEND*2, ABC80_HBSTART*2, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART); m_scanline_timer->adjust(m_screen->time_until_pos(0, ABC80_HBEND*2), 0, m_screen->scan_period()); - } + } else { m_screen->set_raw(XTAL(11'980'800)/2, ABC80_HTOTAL, ABC80_HBEND, ABC80_HBSTART, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART); @@ -33,7 +33,7 @@ uint8_t tkn80_state::in3_r() set_screen_params(); } - return 0xff; + return 0xff; }; uint8_t tkn80_state::in4_r() @@ -196,12 +196,12 @@ offs_t abc80_state::get_videoram_addr() { /* - Video RAM Addressing Scheme + Video RAM Addressing Scheme - A9 A8 A7 A6 A5 A4 A3 A2 A1 A0 - R2 R1 R0 xx xx xx xx C2 C1 C0 + A9 A8 A7 A6 A5 A4 A3 A2 A1 A0 + R2 R1 R0 xx xx xx xx C2 C1 C0 - A6 A5 A4 A3 = 00 C5 C4 C3 + R4 R3 R4 R3 + A6 A5 A4 A3 = 00 C5 C4 C3 + R4 R3 R4 R3 */ @@ -218,15 +218,15 @@ offs_t tkn80_state::get_videoram_addr() { /* - Video RAM Addressing Scheme + Video RAM Addressing Scheme - A10 A9 A8 A7 A6 A5 A4 A3 A2 A1 A0 - R2 R1 R0 xx xx xx xx C3 C2 C1 C0 + A10 A9 A8 A7 A6 A5 A4 A3 A2 A1 A0 + R2 R1 R0 xx xx xx xx C3 C2 C1 C0 - A7 A6 A5 A4 = 00 C6 C5 C4 + R4 R3 R4 R3 + A7 A6 A5 A4 = 00 C6 C5 C4 + R4 R3 R4 R3 */ - + int a = (m_c >> 4) & 0x07; int b = ((m_r >> 1) & 0x0c) | ((m_r >> 3) & 0x03); int s = (a + b) & 0x1f; @@ -237,12 +237,12 @@ offs_t tkn80_state::get_videoram_addr() { /* - Video RAM Addressing Scheme + Video RAM Addressing Scheme - A10 A9 A8 A7 A6 A5 A4 A3 A2 A1 A0 - 1 R2 R1 R0 xx xx xx xx C2 C1 C0 + A10 A9 A8 A7 A6 A5 A4 A3 A2 A1 A0 + 1 R2 R1 R0 xx xx xx xx C2 C1 C0 - A6 A5 A4 A3 = 00 C5 C4 C3 + R4 R3 R4 R3 + A6 A5 A4 A3 = 00 C5 C4 C3 + R4 R3 R4 R3 */ diff --git a/src/mame/nichibutsu/csplayh5.cpp b/src/mame/nichibutsu/csplayh5.cpp index af1c8d7c1a1..21d09b32c3d 100644 --- a/src/mame/nichibutsu/csplayh5.cpp +++ b/src/mame/nichibutsu/csplayh5.cpp @@ -256,8 +256,8 @@ void csplayh5_state::csplayh5_sub_io_map(address_map &map) { map(h8_device::PORT_A, h8_device::PORT_A).w (FUNC(csplayh5_state::pa_w)); map(h8_device::PORT_B, h8_device::PORT_B).rw(FUNC(csplayh5_state::pb_r), FUNC(csplayh5_state::pb_w)); -// map(h8_device::PORT_6, h8_device::PORT_6).noprw(); -// map(h8_device::PORT_A, h8_device::PORT_A).nopw(); +// map(h8_device::PORT_6, h8_device::PORT_6).noprw(); +// map(h8_device::PORT_A, h8_device::PORT_A).nopw(); } @@ -412,17 +412,17 @@ void csplayh5_state::machine_reset() { m_p5 = 0; m_pa = 0; - m_pb = 0; + m_pb = 0; } WRITE_LINE_MEMBER(csplayh5_state::ata_irq) { - // logerror("ata irq %d\n", state); + // logerror("ata irq %d\n", state); } WRITE_LINE_MEMBER(csplayh5_state::ata_drq) { - // logerror("ata drq %d\n", state); + // logerror("ata drq %d\n", state); m_pb = (m_pb & 0x7f) | (state ? 0x00 : 0x80); } @@ -459,7 +459,7 @@ void csplayh5_state::csplayh5(machine_config &config) m_ata->irq_handler().set(FUNC(csplayh5_state::ata_irq)); m_ata->dmarq_handler().set(FUNC(csplayh5_state::ata_drq)); - // NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); + // NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ v9958_device &v9958(V9958(config, "v9958", XTAL(21'477'272))); // typical 9958 clock, not verified @@ -585,7 +585,7 @@ ROM_START( junai ) DISK_REGION( "ata:0:cdrom" ) DISK_IMAGE_READONLY( "junai", 0, SHA1(0491533e0ce3e4d2af608ea0b9d9646316b512bd) ) -// DISK_IMAGE_READONLY( "junai", 0, SHA1(282cc528ff175ac55f1545481ca1c40377cf9347) ) +// DISK_IMAGE_READONLY( "junai", 0, SHA1(282cc528ff175ac55f1545481ca1c40377cf9347) ) ROM_END ROM_START( csplayh5 ) diff --git a/src/mame/tangerine/oric.cpp b/src/mame/tangerine/oric.cpp index 49a2c1dce4a..c18ac1c3ba0 100644 --- a/src/mame/tangerine/oric.cpp +++ b/src/mame/tangerine/oric.cpp @@ -220,7 +220,7 @@ void telestrat_state::telestrat_mem(address_map &map) map(0x0318, 0x0318).r(FUNC(telestrat_state::port_318_r)); map(0x031c, 0x031f).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x0320, 0x032f).m(m_via2, FUNC(via6522_device::map)); - + // Theorically, these are cartridges. There's no real point to // making them configurable, when only 4 existed and there are 7 // slots. -- cgit v1.2.3