From 52080d979a78129cd8061e2f4ae7a9e19b2ac53f Mon Sep 17 00:00:00 2001 From: 0kmg <9137159+0kmg@users.noreply.github.com> Date: Sat, 21 May 2022 12:54:10 -0800 Subject: Removed superfluous semicolons from various source files. (#9796) --- src/devices/bus/epson_qx/option.h | 2 +- src/devices/cpu/tms32025/32025dsm.cpp | 6 +++--- src/devices/cpu/tms32082/dis_pp.cpp | 2 +- src/devices/imagedev/mfmhd.h | 2 +- src/devices/video/v9938.h | 2 +- src/emu/image.h | 2 +- src/lib/formats/mfi_dsk.cpp | 2 +- src/mame/drivers/ac1.cpp | 2 +- src/mame/drivers/cps1.cpp | 2 +- src/mame/drivers/exorciser.cpp | 2 +- src/mame/drivers/kminus.cpp | 2 +- src/mame/drivers/lckydraw.cpp | 2 +- src/mame/drivers/lwriter.cpp | 2 +- src/mame/drivers/mccpm.cpp | 2 +- src/mame/drivers/model2.cpp | 2 +- src/mame/drivers/pgm.cpp | 2 +- src/mame/drivers/qx10.cpp | 2 +- src/mame/drivers/rastersp.cpp | 2 +- src/mame/drivers/vamphalf.cpp | 2 +- src/mame/includes/vc4000.h | 2 +- src/mame/machine/electron.cpp | 2 +- src/mame/video/733_asr.cpp | 2 +- src/mame/video/fmtowns.cpp | 2 +- src/osd/modules/osdwindow.h | 2 +- src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc | 2 +- src/osd/modules/render/d3d/d3dhlsl.cpp | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/devices/bus/epson_qx/option.h b/src/devices/bus/epson_qx/option.h index 0204e54f0f7..db74d46deb3 100644 --- a/src/devices/bus/epson_qx/option.h +++ b/src/devices/bus/epson_qx/option.h @@ -170,7 +170,7 @@ protected: devcb_read8 m_dmaf_r_cb; devcb_write_line m_eopf_cb; - devcb_write_line m_eops_cb;; + devcb_write_line m_eops_cb; int m_slot; }; diff --git a/src/devices/cpu/tms32025/32025dsm.cpp b/src/devices/cpu/tms32025/32025dsm.cpp index 595628e283c..45543b0f0c3 100644 --- a/src/devices/cpu/tms32025/32025dsm.cpp +++ b/src/devices/cpu/tms32025/32025dsm.cpp @@ -37,9 +37,9 @@ #include -const char *const tms32025_disassembler::arith[8] = { "*", "*-", "*+", "??", "BR0-", "*0-", "*0+", "*BR0+" } ; -const char *const tms32025_disassembler::nextar[16] = { "", "", "", "", "", "", "", "", ",AR0", ",AR1", ",AR2", ",AR3", ",AR4", ",AR5", ",AR6", ",AR7" } ; -const char *const tms32025_disassembler::cmpmode[4] = { "0 (ARx = AR0)" , "1 (ARx < AR0)" , "2 (ARx > AR0)" , "3 (ARx <> AR0)" } ; +const char *const tms32025_disassembler::arith[8] = { "*", "*-", "*+", "??", "BR0-", "*0-", "*0+", "*BR0+" }; +const char *const tms32025_disassembler::nextar[16] = { "", "", "", "", "", "", "", "", ",AR0", ",AR1", ",AR2", ",AR3", ",AR4", ",AR5", ",AR6", ",AR7" }; +const char *const tms32025_disassembler::cmpmode[4] = { "0 (ARx = AR0)" , "1 (ARx < AR0)" , "2 (ARx > AR0)" , "3 (ARx <> AR0)" }; const char *const tms32025_disassembler::TMS32025Formats[] = { diff --git a/src/devices/cpu/tms32082/dis_pp.cpp b/src/devices/cpu/tms32082/dis_pp.cpp index 819b52f25ce..cfabab90359 100644 --- a/src/devices/cpu/tms32082/dis_pp.cpp +++ b/src/devices/cpu/tms32082/dis_pp.cpp @@ -507,7 +507,7 @@ std::string tms32082_pp_disassembler::format_alu_op(int aluop, int a, const std: return util::string_format("%s = %s", dst_text, b_text); case 0xf0: // A & B & C | ~A & B & C | A & ~B & C | ~A & ~B & C = C - return util::string_format("%s = %s", dst_text, c_text);; + return util::string_format("%s = %s", dst_text, c_text); case 0x0f: // A & B & ~C | ~A & B & ~C | A & ~B & ~C | ~A & ~B & ~C = ~C return util::string_format("%s = ~%s", dst_text, c_text); diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index 758dd1bb349..409c70a537c 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -83,7 +83,7 @@ public: // Active low lines. We're using ASSERT=0 / CLEAR=1 line_state ready_r() { return m_ready? ASSERT_LINE : CLEAR_LINE; } - line_state seek_complete_r() { return m_seek_complete? ASSERT_LINE : CLEAR_LINE; } ; + line_state seek_complete_r() { return m_seek_complete? ASSERT_LINE : CLEAR_LINE; } line_state trk00_r() { return m_current_cylinder==0? ASSERT_LINE : CLEAR_LINE; } // Data output towards controller diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index c559a74ded8..0e41ced86ab 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -241,7 +241,7 @@ private: void (v99x8_device::*border_32)(uint32_t*); void (v99x8_device::*sprites)(int, uint8_t*); void (v99x8_device::*draw_sprite_32)(uint32_t*, uint8_t*); - } ; + }; static const v99x8_mode s_modes[]; emu_timer *m_line_timer; uint8_t m_pal_ntsc; diff --git a/src/emu/image.h b/src/emu/image.h index daf48b1f21d..95dca8a92b9 100644 --- a/src/emu/image.h +++ b/src/emu/image.h @@ -36,7 +36,7 @@ private: void options_extract(); int write_config(emu_options &options, const char *filename, const game_driver *gamedrv); - bool try_change_working_directory(std::string &working_directory, const std::string &subdir);; + bool try_change_working_directory(std::string &working_directory, const std::string &subdir); // internal state running_machine & m_machine; // reference to our machine diff --git a/src/lib/formats/mfi_dsk.cpp b/src/lib/formats/mfi_dsk.cpp index 3d79ff3636c..99a421239b7 100644 --- a/src/lib/formats/mfi_dsk.cpp +++ b/src/lib/formats/mfi_dsk.cpp @@ -192,7 +192,7 @@ bool mfi_format::load(util::random_read &io, uint32_t form_factor, const std::ve return false; } - std::vector &trackbuf = image->get_buffer(cyl >> 2, head, cyl & 3);; + std::vector &trackbuf = image->get_buffer(cyl >> 2, head, cyl & 3); trackbuf.clear(); converter(uncompressed, trackbuf); diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp index 921c56ececa..3caf06bb921 100644 --- a/src/mame/drivers/ac1.cpp +++ b/src/mame/drivers/ac1.cpp @@ -86,7 +86,7 @@ u8 ac1_state::ac1_port_b_r() // standard ascii keyboard with bit 7 high u8 ac1_state::ac1_port_a_r() { - u8 line[7] = { 0,0,0,0,0,0,0} ; + u8 line[7] = { 0,0,0,0,0,0,0 }; line[6] = m_io_line[6]->read(); if (BIT(line[6], 2,3)) diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 63f42861f9c..ca5a275c622 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -14247,7 +14247,7 @@ void cps_state::init_dinohunt() { // is this shared with the new sound hw? m_maincpu->space(AS_PROGRAM).install_read_handler(0xf18000, 0xf19fff, read16smo_delegate(*this, FUNC(cps_state::dinohunt_sound_r))); - m_maincpu->space(AS_PROGRAM).install_read_port(0xfc0000, 0xfc0001, "IN2"); ; + m_maincpu->space(AS_PROGRAM).install_read_port(0xfc0000, 0xfc0001, "IN2"); // the ym2151 doesn't seem to be used. Is it actually on the PCB? init_cps1(); diff --git a/src/mame/drivers/exorciser.cpp b/src/mame/drivers/exorciser.cpp index 6373e9a9b6c..81fa1c2bd2a 100644 --- a/src/mame/drivers/exorciser.cpp +++ b/src/mame/drivers/exorciser.cpp @@ -466,7 +466,7 @@ u8 exorciser_state::prom_r(offs_t offset) case 0: return 0; case 1: { - u8 byte = m_rs232_config->read();; + u8 byte = m_rs232_config->read(); if (!m_irq) byte |= 0xf0; return byte; diff --git a/src/mame/drivers/kminus.cpp b/src/mame/drivers/kminus.cpp index d9ecaa5db70..e35a261d83d 100644 --- a/src/mame/drivers/kminus.cpp +++ b/src/mame/drivers/kminus.cpp @@ -181,7 +181,7 @@ uint8_t kminus_state::pio1_pb_r() logerror("pio_pb_r: %02x\n", data); - return data;; + return data; } void kminus_state::pio1_pb_w(uint8_t data) diff --git a/src/mame/drivers/lckydraw.cpp b/src/mame/drivers/lckydraw.cpp index 3ae08df6250..4d823e89646 100644 --- a/src/mame/drivers/lckydraw.cpp +++ b/src/mame/drivers/lckydraw.cpp @@ -123,7 +123,7 @@ void lckydraw_state::bus_w(offs_t offset, u8 data) case 0: case 14: m_ram[offset] = data; - break;; + break; case 2: // solenoids { diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp index 1af417e8a75..50451570e09 100644 --- a/src/mame/drivers/lwriter.cpp +++ b/src/mame/drivers/lwriter.cpp @@ -196,7 +196,7 @@ private: int m_print_result; bool m_sbsy; bool m_cbsy; - bool m_vsync;; + bool m_vsync; int m_fifo_count; int m_pb6_tick_count; int m_vbl_count; diff --git a/src/mame/drivers/mccpm.cpp b/src/mame/drivers/mccpm.cpp index 3a553e7366e..6e498d34398 100644 --- a/src/mame/drivers/mccpm.cpp +++ b/src/mame/drivers/mccpm.cpp @@ -189,7 +189,7 @@ void mccpm_state::machine_reset() void mccpm_state::machine_start() { - save_item(NAME(m_fdc_status));; + save_item(NAME(m_fdc_status)); } static void flop_types(device_slot_interface &device) diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 3f68bfe673e..5f35f250c7a 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -1103,7 +1103,7 @@ void model2_state::fbvram_bankB_w(offs_t offset, u16 data, u16 mem_mask) { COMBI /* common map for all Model 2 versions */ void model2_state::model2_base_mem(address_map &map) { - map(0x00000000, 0x001fffff).rom().nopw().flags(i960_cpu_device::BURST);; + map(0x00000000, 0x001fffff).rom().nopw().flags(i960_cpu_device::BURST); map(0x00500000, 0x005fffff).ram().share("workram").flags(i960_cpu_device::BURST); diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index 457758731e0..2fe96d6494a 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -475,7 +475,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pgm_state::interrupt) { int scanline = param; -// already being generated by screen.screen_vblank().set(FUNC(pgm_state::screen_vblank));; +// already being generated by screen.screen_vblank().set(FUNC(pgm_state::screen_vblank)); // if (scanline == 224) // m_maincpu->set_input_line(6, HOLD_LINE); diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index 7cc092682a9..abe2f6b9225 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -375,7 +375,7 @@ void qx10_state::update_memory_mapping() { if (m_external_bank) { - m_ram_view.select(1);; + m_ram_view.select(1); } else { diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 727cb5ca9c8..05ee8b417cc 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -913,7 +913,7 @@ uint8_t rastersp_state::interrupt_ctrl_r(offs_t offset) void rastersp_state::interrupt_ctrl_w(offs_t offset, uint8_t data) { - m_interrupt_mask = data;; + m_interrupt_mask = data; } uint8_t rastersp_state::interrupt_status_r(offs_t offset) diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 1446125f827..c84b5331f7f 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -522,7 +522,7 @@ void vamphalf_state::qs1000_p3_w(u8 data) void vamphalf_state::common_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("wram"); - map(0x40000000, 0x4003ffff).rw(FUNC(vamphalf_state::vram_r), FUNC(vamphalf_state::vram_w));; + map(0x40000000, 0x4003ffff).rw(FUNC(vamphalf_state::vram_r), FUNC(vamphalf_state::vram_w)); map(0x80000000, 0x8000ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff00000, 0xffffffff).rom().region("maincpu", 0); } diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index b9093022417..01abc40f41e 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -111,7 +111,7 @@ private: uint8_t sprite_collision; } d; } reg; - } ; + }; void vc4000_sound_ctl(offs_t offset, uint8_t data); uint8_t vc4000_key_r(offs_t offset); diff --git a/src/mame/machine/electron.cpp b/src/mame/machine/electron.cpp index 6b4aa221100..2bd23ed3a57 100644 --- a/src/mame/machine/electron.cpp +++ b/src/mame/machine/electron.cpp @@ -373,7 +373,7 @@ uint8_t electronsp_state::electron_fred_r(offs_t offset) { data = electron_state::electron_fred_r(offset); } - return data;; + return data; } void electronsp_state::electron_fred_w(offs_t offset, uint8_t data) diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index 74ebeb66ecf..5ec30527ff4 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -602,7 +602,7 @@ void asr733_device::check_keyboard() unshifted = 0, shift, control, /* special value to stop repeat if the modifier state changes */ special_debounce = -1 - } ; + }; enum { repeat_delay = 5 /* approx. 1/10s */ }; diff --git a/src/mame/video/fmtowns.cpp b/src/mame/video/fmtowns.cpp index cd2bb5cc62b..ca059576275 100644 --- a/src/mame/video/fmtowns.cpp +++ b/src/mame/video/fmtowns.cpp @@ -423,7 +423,7 @@ uint8_t towns_state::towns_video_440_r(offs_t offset) ret |= 0x80; } ret |= (m_video.towns_sprite_flag ? 0x02 : 0x00); // Sprite drawing flag - ret |= (m_video.towns_sprite_page & 0x01) ? 1 : 0;; + ret |= m_video.towns_sprite_page & 0x01; return ret; case 0x10: return m_video.towns_sprite_sel; diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h index e4b5db78f24..9cd05c29d17 100644 --- a/src/osd/modules/osdwindow.h +++ b/src/osd/modules/osdwindow.h @@ -225,7 +225,7 @@ public: virtual void add_audio_to_recording(const int16_t *buffer, int samples_this_frame) { } virtual std::vector get_slider_list() { return m_sliders; } virtual int draw(const int update) = 0; - virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) { return 0; }; + virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) { return 0; } virtual void save() { } virtual void record() { } virtual void toggle_fsfx() { } diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc index 4bd5a57e3ef..c91a8948bf1 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc @@ -9,7 +9,7 @@ uniform vec4 u_aspect; void main() { - float wid = u_width.x*u_tex_size0.x/(320.*u_aspect.x);; + float wid = u_width.x*u_tex_size0.x/(320.*u_aspect.x); v_coeffs = exp(vec4(1.,4.,9.,16.)*vec4_splat(-1.0/wid/wid)); // Do the standard vertex processing. diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 35ace744eb3..22a6b5af508 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -2319,7 +2319,7 @@ void shaders::init_slider_list() } internal_sliders.clear(); - const screen_device *first_screen = screen_device_enumerator(machine->root_device()).first();; + const screen_device *first_screen = screen_device_enumerator(machine->root_device()).first(); if (first_screen == nullptr) { return; -- cgit v1.2.3