diff options
-rw-r--r-- | src/devices/cpu/pic16c5x/16c5xdsm.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/pic16c62x/16c62xdsm.cpp | 5 | ||||
-rw-r--r-- | src/devices/cpu/tms32010/32010dsm.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/tms32025/32025dsm.cpp | 4 | ||||
-rw-r--r-- | src/emu/debug/debugbuf.cpp | 2 | ||||
-rw-r--r-- | src/lib/formats/dsk_dsk.cpp | 2 | ||||
-rw-r--r-- | src/mame/bfm/bfcobra.cpp | 74 | ||||
-rw-r--r-- | src/mame/bfm/bfm_sc45_helper.cpp | 9 |
8 files changed, 40 insertions, 64 deletions
diff --git a/src/devices/cpu/pic16c5x/16c5xdsm.cpp b/src/devices/cpu/pic16c5x/16c5xdsm.cpp index 251aa02bf84..9b3204aec9a 100644 --- a/src/devices/cpu/pic16c5x/16c5xdsm.cpp +++ b/src/devices/cpu/pic16c5x/16c5xdsm.cpp @@ -82,9 +82,8 @@ pic16c5x_disassembler::pic16c5x_disassembler() const char *const *ops; u16 mask, bits; int bit; - int i; - ops = PIC16C5xFormats; i = 0; + ops = PIC16C5xFormats; while (*ops) { p = *ops; @@ -115,7 +114,6 @@ pic16c5x_disassembler::pic16c5x_disassembler() Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; - i++; } } diff --git a/src/devices/cpu/pic16c62x/16c62xdsm.cpp b/src/devices/cpu/pic16c62x/16c62xdsm.cpp index 1c2677002cf..fcf2c475ed5 100644 --- a/src/devices/cpu/pic16c62x/16c62xdsm.cpp +++ b/src/devices/cpu/pic16c62x/16c62xdsm.cpp @@ -92,9 +92,8 @@ pic16c62x_disassembler::pic16c62x_disassembler() const char *const *ops; u16 mask, bits; int bit; - int i; - ops = PIC16C62xFormats; i = 0; + ops = PIC16C62xFormats; while (*ops) { p = *ops; @@ -126,9 +125,7 @@ pic16c62x_disassembler::pic16c62x_disassembler() Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; - i++; } - } offs_t pic16c62x_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) diff --git a/src/devices/cpu/tms32010/32010dsm.cpp b/src/devices/cpu/tms32010/32010dsm.cpp index 087c3613884..b2d99ba3639 100644 --- a/src/devices/cpu/tms32010/32010dsm.cpp +++ b/src/devices/cpu/tms32010/32010dsm.cpp @@ -153,9 +153,8 @@ tms32010_disassembler::tms32010_disassembler() const char *const *ops; u16 mask, bits; int bit; - int i; - ops = TMS32010Formats; i = 0; + ops = TMS32010Formats; while (*ops) { p = *ops; @@ -191,7 +190,6 @@ tms32010_disassembler::tms32010_disassembler() Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; - i++; } } diff --git a/src/devices/cpu/tms32025/32025dsm.cpp b/src/devices/cpu/tms32025/32025dsm.cpp index 45543b0f0c3..09a0e4bfd4a 100644 --- a/src/devices/cpu/tms32025/32025dsm.cpp +++ b/src/devices/cpu/tms32025/32025dsm.cpp @@ -315,9 +315,8 @@ tms32025_disassembler::tms32025_disassembler() const char *const *ops; u16 mask, bits; int bit; - int i; - ops = TMS32025Formats; i = 0; + ops = TMS32025Formats; while (*ops) { p = *ops; @@ -356,7 +355,6 @@ tms32025_disassembler::tms32025_disassembler() Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; - i++; } } diff --git a/src/emu/debug/debugbuf.cpp b/src/emu/debug/debugbuf.cpp index 85ec19d5fb9..93bfcba891b 100644 --- a/src/emu/debug/debugbuf.cpp +++ b/src/emu/debug/debugbuf.cpp @@ -220,14 +220,12 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() m_do_fill = [this](offs_t lstart, offs_t lend) { auto dis = m_space->device().machine().disable_side_effects(); u8 *dest = get_ptr<u8>(lstart); - u32 steps = 0; for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = m_intf.pc_linear_to_real(lpc); if (m_space->device().memory().translate(m_space->spacenum(), TRANSLATE_FETCH_DEBUG, tpc)) *dest++ = m_space->read_byte(tpc); else *dest++ = 0; - steps++; } }; break; diff --git a/src/lib/formats/dsk_dsk.cpp b/src/lib/formats/dsk_dsk.cpp index 9c14f781ef5..53f64eb4827 100644 --- a/src/lib/formats/dsk_dsk.cpp +++ b/src/lib/formats/dsk_dsk.cpp @@ -420,7 +420,6 @@ bool dsk_format::load(util::random_read &io, uint32_t form_factor, const std::ve } } - int counter = 0; for(int track=0; track < tracks; track++) { for(int side=0; side < std::min(heads, img_heads); side++) { if(track_offsets[(track<<1)+side] >= image_size) @@ -491,7 +490,6 @@ bool dsk_format::load(util::random_read &io, uint32_t form_factor, const std::ve } // larger cell count (was 100000) to allow for slightly out of spec images (theatre europe on einstein) build_pc_track_mfm(track, side, image, 105000, tr.number_of_sector, sects, tr.gap3_length); - counter++; } } return true; diff --git a/src/mame/bfm/bfcobra.cpp b/src/mame/bfm/bfcobra.cpp index e37fa563bcc..e1819043364 100644 --- a/src/mame/bfm/bfcobra.cpp +++ b/src/mame/bfm/bfcobra.cpp @@ -145,10 +145,10 @@ namespace { union ADDR_REG { #ifdef LSB_FIRST - struct { uint16_t loword, hiword ; } as16bit; + struct { uint16_t loword, hiword; } as16bit; struct { uint8_t addr0, addr1, addr2; } as8bit; #else - struct { uint16_t hiword, loword ; } as16bit; + struct { uint16_t hiword, loword; } as16bit; struct { uint8_t addr2, addr1, addr0; } as8bit; #endif uint32_t addr = 0; @@ -589,7 +589,7 @@ void bfcobra_state::RunBlit() } if( blitter.source.as8bit.addr0 < blitter.step ) { - blitter.source.as8bit.addr0 -= blitter.step ; + blitter.source.as8bit.addr0 -= blitter.step; blitter.source.as8bit.addr0 += blitter.source.as8bit.addr1; if ( blitter.modectl & MODE_YFRAC ) @@ -640,7 +640,7 @@ void bfcobra_state::RunBlit() cycles_used++; if (blitter.modectl & MODE_SSIGN) - blitter.source.as16bit.loword-- ; + blitter.source.as16bit.loword--; else blitter.source.as16bit.loword++; @@ -1814,10 +1814,10 @@ private: DECLARE_WRITE_LINE_MEMBER(upd7759_generate_dreq ); uint32_t screen_update_bfcobjam(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(timer_irq); - TIMER_CALLBACK_MEMBER( scanline_callback ) ; + TIMER_CALLBACK_MEMBER( scanline_callback ); void RunBlit(); void update_irqs(); - void genio_w( uint8_t data ) ; + void genio_w( uint8_t data ); void dotmatrix_w( uint8_t data ); inline uint8_t* blitter_get_addr(uint32_t addr); inline void z8s180_bank(int num, int data); @@ -1829,7 +1829,7 @@ private: void bfcobjam_state::init_bfcobjam() { - m_rompage = 0 ; + m_rompage = 0; m_bank_data[0] = 0; m_bank_data[1] = 0; m_bank_data[2] = 0; @@ -1855,7 +1855,6 @@ void bfcobjam_state::init_bfcobjam() save_item(NAME(m_bank_data)); save_item(NAME(m_genio)); save_item(NAME(m_global_volume)); - } /* @@ -1868,8 +1867,7 @@ void bfcobjam_state::RunBlit() #define BLITPRG_READ(x) blitter.x = *(blitter_get_addr(blitter.program.addr++)) struct bf_blitter_t &blitter = m_blitter; - int cycles_used = 0; - + [[maybe_unused]] int cycles_used = 0; do { @@ -1952,7 +1950,7 @@ void bfcobjam_state::RunBlit() } if( blitter.source.as8bit.addr0 < blitter.step ) { - blitter.source.as8bit.addr0 -= blitter.step ; + blitter.source.as8bit.addr0 -= blitter.step; blitter.source.as8bit.addr0 += blitter.source.as8bit.addr1; if ( blitter.modectl & MODE_YFRAC ) @@ -2003,7 +2001,7 @@ void bfcobjam_state::RunBlit() cycles_used++; if (blitter.modectl & MODE_SSIGN) - blitter.source.as16bit.loword-- ; + blitter.source.as16bit.loword--; else blitter.source.as16bit.loword++; @@ -2157,9 +2155,9 @@ uint8_t* bfcobjam_state::blitter_get_addr(uint32_t addr) else if(addr < 0x20000) { addr &= 0xffff; - addr += m_rompage * 0x10000 ; + addr += m_rompage * 0x10000; - return (uint8_t*)(memregion("user1")->base() + addr ); + return (uint8_t*)(memregion("user1")->base() + addr); } else if (addr >= 0x20000 && addr < 0x40000) { @@ -2214,7 +2212,7 @@ uint8_t bfcobjam_state::chipset_r(offs_t offset) } case 0x22: { - val = 0x40 | ioport("CJIN2")->read() | ( m_upd7759_int->busy_r() ? 0x20 : 0 ) ; + val = 0x40 | ioport("CJIN2")->read() | ( m_upd7759_int->busy_r() ? 0x20 : 0 ); break; } default: @@ -2245,7 +2243,7 @@ void bfcobjam_state::chipset_w(offs_t offset, uint8_t data) case 0x07: m_scanline_timer->adjust(m_screen->time_until_pos(data)); - break ; + break; case 0x08: { @@ -2309,7 +2307,7 @@ void bfcobjam_state::chipset_w(offs_t offset, uint8_t data) case 0x22: { m_flip_22 = data; - genio_w( data ) ; + genio_w( data ); break; } default: @@ -2390,9 +2388,9 @@ void bfcobjam_state::z8s180_bank(int num, int data) } else if (data < 0x08) { - uint32_t offset ; - offset = m_rompage * 0x10000 ; - offset += (data-4) * 0x4000 ; + uint32_t offset; + offset = m_rompage * 0x10000; + offset += (data-4) * 0x4000; membank(bank_names[num])->set_base(memregion("user1")->base() + offset); } @@ -2433,7 +2431,7 @@ WRITE_LINE_MEMBER(bfcobjam_state::z8s180_acia_irq) void bfcobjam_state::rombank_w(uint8_t data) { - m_rompage = data ; + m_rompage = data; membank("bank5")->set_entry(m_rompage & 0x0f); } @@ -2454,15 +2452,15 @@ void bfcobjam_state::rombank_w(uint8_t data) */ void bfcobjam_state::output0_w(uint8_t data) { - uint8_t changed = m_port_0 ^ data ; - m_port_0 = data ; + uint8_t changed = m_port_0 ^ data; + m_port_0 = data; - dotmatrix_w( data ) ; + dotmatrix_w( data ); //cobra handling of scl and sda is wrong but devices handle it ok //unfortunately mame emulation of i2c 24c08 doesn't :( //we frig the driving of scl/sda to correct this - changed &= 0x60 ; + changed &= 0x60; if( changed == 0x60 ) { @@ -2488,7 +2486,7 @@ void bfcobjam_state::dotmatrix_w( uint8_t data ) { if( m_dm01 ) { - data &= 0x1c ; + data &= 0x1c; if( data != dm_last_data ) { @@ -2497,25 +2495,25 @@ void bfcobjam_state::dotmatrix_w( uint8_t data ) } else { - m_dm01->reset() ; + m_dm01->reset(); dm_shift=0; dm_shift_data=0; } if( !(data & 4 ) && ( dm_last_data & 4 ) && data & 0x10 ) // clock is low but was high and out of reset { - dm_shift_data <<= 1 ; + dm_shift_data <<= 1; if( !(data & 0x08 )) { - dm_shift_data |=1 ; + dm_shift_data |= 1; } dm_shift++; if( dm_shift == 8 ) { dm_shift=0; - m_dm01->writedata( dm_shift_data ) ; + m_dm01->writedata( dm_shift_data ); } } - dm_last_data = data ; + dm_last_data = data; } } } @@ -2554,7 +2552,7 @@ uint8_t bfcobjam_state::aux_upd7759_r() } else { - return 0 ; + return 0; } } @@ -2569,9 +2567,9 @@ void bfcobjam_state::genio_w( uint8_t data ) //bit 6 = ?? //bit 7 = ?? - uint8_t changed = m_genio ^ data ; + uint8_t changed = m_genio ^ data; - m_genio = data ; + m_genio = data; if ( changed & 0x10) { // digital volume clock line changed @@ -2736,13 +2734,13 @@ void bfcobjam_state::machine_reset() m_palette->set_pen_color(pal, pal3bit((pal>>5)&7), pal3bit((pal>>2)&7), pal2bit(pal&3)); } - m_rompage = 0 ; + m_rompage = 0; m_bank_data[0] = 0; m_bank_data[1] = 0; m_bank_data[2] = 0; m_bank_data[3] = 0; - m_genio = 0 ; + m_genio = 0; m_global_volume = 0; m_ym2413->reset(); @@ -2753,7 +2751,7 @@ void bfcobjam_state::machine_reset() m_scanline_timer->adjust(m_screen->time_until_pos(0)); if( m_dm01 ) - m_dm01->reset() ; + m_dm01->reset(); } WRITE_LINE_MEMBER(bfcobjam_state::write_acia_clock) @@ -2803,7 +2801,7 @@ void bfcobjam_state::bfcobjam(machine_config &config) void bfcobjam_state::bfcobjam_with_dmd(machine_config &config) { - bfcobjam( config ) ; + bfcobjam( config ); UPD7759(config, m_aux_upd7759); m_aux_upd7759->add_route(ALL_OUTPUTS, "mono", 0.40); diff --git a/src/mame/bfm/bfm_sc45_helper.cpp b/src/mame/bfm/bfm_sc45_helper.cpp index fb58d9ca056..ba21922638a 100644 --- a/src/mame/bfm/bfm_sc45_helper.cpp +++ b/src/mame/bfm/bfm_sc45_helper.cpp @@ -294,8 +294,6 @@ int find_input_strings(running_machine &machine) { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, } }; - int buttons_used = 1; - printf("INPUT_PORTS_START( %s ) // this structure is generated\n", machine.system().name); printf(" PORT_INCLUDE( sc4_base )\n"); @@ -316,7 +314,6 @@ int find_input_strings(running_machine &machine) if (ignoreports[i][j] > 0) { printf(" PORT_BIT( 0x%04x, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_%d_%d ) PORT_NAME(\"%s\")\n", 1 << j, i,j/*ignoreports[i][j]*/, sc4inputs[i][j].name.c_str()); - buttons_used++; } else if (ignoreports[i][j] == -3) { @@ -358,7 +355,6 @@ int find_input_strings(running_machine &machine) { printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'hop top'\n", 1 << j, sc4inputs[i][j].name.c_str()); } - buttons_used++; } } } @@ -453,11 +449,6 @@ int find_lamp_strings(running_machine &machine) - - - - - uint16_t *rom = (uint16_t*)machine.root_device().memregion( "maincpu" )->base(); uint8_t *rom8 = machine.root_device().memregion( "maincpu" )->base(); |