Skip to content

Commit 8170718

Browse files
committed
general: housekeeping and msvc warning elimination
* avoid potential unsafe use of bool * avoid potentially empty controlled statements * annotate some unused variables * remove some undefined functions
1 parent 2692ea1 commit 8170718

File tree

18 files changed

+34
-28
lines changed

18 files changed

+34
-28
lines changed

src/devices/bus/nes/mmc3_clones.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,11 +2934,11 @@ void nes_bmc_f600_device::write_l(offs_t offset, u8 data)
29342934
m_reg = offset;
29352935

29362936
m_prg_base = (m_reg & 0x38) << 1;
2937-
m_prg_mask = 0x1f >> BIT(m_reg, 5);
2937+
m_prg_mask = 0x1f >> (BIT(m_reg, 5) ? 1 : 0);
29382938
set_prg(m_prg_base, m_prg_mask);
29392939

29402940
m_chr_base = (m_reg & 0x07) << 7;
2941-
m_chr_mask = 0xff >> !BIT(m_reg, 2);
2941+
m_chr_mask = 0xff >> (BIT(m_reg, 2) ? 0 : 1);
29422942
set_chr(m_chr_source, m_chr_base, m_chr_mask);
29432943
}
29442944
}
@@ -3332,7 +3332,7 @@ void nes_bmc_810305c_device::write_h(offs_t offset, u8 data)
33323332
m_outer = BIT(offset, 13, 2);
33333333

33343334
m_prg_base = m_outer << 5;
3335-
m_prg_mask = 0x1f >> (m_outer == 2);
3335+
m_prg_mask = 0x1f >> ((m_outer == 2) ? 1 : 0);
33363336
set_prg(m_prg_base, m_prg_mask);
33373337

33383338
m_chr_base = m_outer << 7;

src/devices/bus/spectrum/neogs.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,9 @@ void neogs_device::dac_flush()
310310
right += out;
311311

312312
if (BIT(m_gscfg0, 2) && BIT(m_gscfg0, 6)) // PAN4CH
313-
;
313+
{
314+
// TODO
315+
}
314316
}
315317
m_dac[0]->data_w(left);
316318
m_dac[1]->data_w(right);

src/devices/cpu/avr8/avr8.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -938,8 +938,8 @@ class avr8_device : public avr8_base_device
938938
void tccr1a_w(uint8_t data);
939939
void tccr1b_w(uint8_t data);
940940
void tccr1c_w(uint8_t data);
941-
void tcnt1l_w(uint8_t data);
942-
void tcnt1h_w(uint8_t data);
941+
//void tcnt1l_w(uint8_t data);
942+
//void tcnt1h_w(uint8_t data);
943943
void icr1l_w(uint8_t data);
944944
void icr1h_w(uint8_t data);
945945
void ocr1al_w(uint8_t data);
@@ -1045,8 +1045,8 @@ class avr8_device : public avr8_base_device
10451045
void tccr3a_w(uint8_t data);
10461046
void tccr3b_w(uint8_t data);
10471047
void tccr3c_w(uint8_t data);
1048-
void tcnt3l_w(uint8_t data);
1049-
void tcnt3h_w(uint8_t data);
1048+
//void tcnt3l_w(uint8_t data);
1049+
//void tcnt3h_w(uint8_t data);
10501050
void icr3l_w(uint8_t data);
10511051
void icr3h_w(uint8_t data);
10521052
void ocr3al_w(uint8_t data);

src/devices/cpu/i386/i386segs.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ void i386_device::i386_trap_with_error(int irq, int irq_gate, int trap_level, ui
794794
PUSH16(error);
795795
}
796796
}
797-
catch(uint64_t e)
797+
catch([[maybe_unused]] uint64_t e)
798798
{
799799
trap_level++;
800800
if(trap_level == 1)

src/devices/machine/arm_iomd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ template <unsigned Which> void arm_iomd_device::irqmsk_w(u32 data)
469469
// master clock control
470470
inline void arm7500fe_iomd_device::refresh_host_cpu_clocks()
471471
{
472-
m_host_cpu->set_unscaled_clock(this->clock() >> (m_cpuclk_divider == false));
472+
m_host_cpu->set_unscaled_clock(this->clock() >> (m_cpuclk_divider ? 0 : 1));
473473
}
474474

475475
u32 arm7500fe_iomd_device::clkctl_r()

src/devices/machine/psion_asic5.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void psion_asic5_device::device_reset()
110110
m_int_mask = 0x00;
111111
m_int_status = 0x02; // UART transmitter empty
112112
m_control = 0x00;
113-
m_bdr = 0xffff;
113+
m_bdr = -1;
114114

115115
receive_register_reset();
116116
transmit_register_reset();

src/frontend/mame/ui/prscntrl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ menu_control_device_preset::~menu_control_device_preset()
4646
void menu_control_device_preset::populate()
4747
{
4848
auto presets = m_image.preset_images_list();
49-
for(int i = 0; i != int(presets.size()); i++)
49+
for(uintptr_t i = 0; i != uintptr_t(presets.size()); i++)
5050
item_append(presets[i], 0, reinterpret_cast<void *>(i));
51-
set_selection(reinterpret_cast<void *>(m_image.current_preset_image_id()));
51+
set_selection(reinterpret_cast<void *>(uintptr_t(m_image.current_preset_image_id())));
5252
}
5353

5454

src/lib/netlist/tools/nl_convert.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void nl_convert_spice_t::convert_block(const str_list &contents)
340340
{
341341
process_line(line);
342342
}
343-
catch (const plib::pexception &e)
343+
catch ([[maybe_unused]] const plib::pexception &e)
344344
{
345345
fprintf(stderr, "Error on line: <%d>\n", linenumber);
346346
throw;

src/mame/ibm/ibm5100.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ u8 ibm5100_state::nxr_r()
536536
* giving 64KiB. Even and odd bytes are selected by a flip-flop
537537
* which is toggled with each read.
538538
*/
539-
data = BIT(m_nxr[rs][m_nxr_address >> basic], (m_nxr_ff & NXR_B0) ? 0 : 8, 8);
539+
data = BIT(m_nxr[rs][m_nxr_address >> (basic ? 1 : 0)], (m_nxr_ff & NXR_B0) ? 0 : 8, 8);
540540
}
541541

542542
// always increment address for BASIC, only on odd bytes for APL

src/mame/igs/igs_m027.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ class igs_m027_state : public driver_device
232232
u32 slqz3_gpio_r();
233233
u32 lhdmg_gpio_r();
234234
u32 lhzb3106c5m_gpio_r();
235-
void unk2_w(u32 data);
236235

237236
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
238237

0 commit comments

Comments
 (0)