From ee89be67308ec9f8e80090be115ba1125ee735e4 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 23 Nov 2018 22:32:32 -0500 Subject: [PATCH] Removes many stray spaces. --- .../Implementation/MultiKeyboardMachine.cpp | 2 +- Analyser/Static/Commodore/StaticAnalyser.cpp | 2 +- Analyser/Static/Disassembler/Z80.cpp | 6 ++--- Components/6560/6560.hpp | 2 +- Components/9918/9918.cpp | 2 +- Components/9918/Implementation/9918Base.hpp | 8 +++--- Components/AY38910/AY38910.cpp | 4 +-- Components/DiskII/DiskII.hpp | 2 +- Configurable/StandardOptions.cpp | 4 +-- Inputs/Joystick.hpp | 4 +-- Machines/AmstradCPC/AmstradCPC.cpp | 2 +- Machines/AppleII/AppleII.cpp | 26 +++++++++---------- Machines/Atari2600/TIA.hpp | 2 +- Machines/ColecoVision/ColecoVision.cpp | 2 +- Machines/Commodore/Vic-20/Keyboard.hpp | 2 +- Machines/MSX/MSX.cpp | 2 +- Machines/MasterSystem/MasterSystem.cpp | 6 ++--- Machines/Oric/Keyboard.cpp | 4 +-- .../Mac/Clock Signal/Machine/CSMachine.mm | 2 +- .../StaticAnalyser/CSStaticAnalyser.mm | 2 +- .../MachinePicker/MachinePicker.swift | 4 +-- .../Z80MachineCycleTests.swift | 8 +++--- Outputs/OpenGL/Primitives/Rectangle.cpp | 2 +- Processors/6502/6502.hpp | 2 +- Storage/Disk/DiskImage/Formats/CPCDSK.cpp | 2 +- Storage/FileHolder.cpp | 2 +- Storage/Tape/Formats/CAS.hpp | 2 +- Storage/Tape/Parsers/MSX.cpp | 2 +- 28 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp index f85035be5..560d18be3 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp @@ -11,7 +11,7 @@ using namespace Analyser::Dynamic; MultiKeyboardMachine::MultiKeyboardMachine(const std::vector> &machines) : - keyboard_(machines_) { + keyboard_(machines_) { for(const auto &machine: machines) { KeyboardMachine::Machine *keyboard_machine = machine->keyboard_machine(); if(keyboard_machine) machines_.push_back(keyboard_machine); diff --git a/Analyser/Static/Commodore/StaticAnalyser.cpp b/Analyser/Static/Commodore/StaticAnalyser.cpp index 7a3bd185f..c932b8d3a 100644 --- a/Analyser/Static/Commodore/StaticAnalyser.cpp +++ b/Analyser/Static/Commodore/StaticAnalyser.cpp @@ -80,7 +80,7 @@ Analyser::Static::TargetList Analyser::Static::Commodore::GetTargets(const Media target->memory_model = Target::MemoryModel::Unexpanded; std::ostringstream string_stream; string_stream << "LOAD\"" << (is_disk ? "*" : "") << "\"," << device << ","; - if(files.front().is_basic()) { + if(files.front().is_basic()) { string_stream << "0"; } else { string_stream << "1"; diff --git a/Analyser/Static/Disassembler/Z80.cpp b/Analyser/Static/Disassembler/Z80.cpp index f2be54a22..bcdf8b410 100644 --- a/Analyser/Static/Disassembler/Z80.cpp +++ b/Analyser/Static/Disassembler/Z80.cpp @@ -63,9 +63,9 @@ class Accessor { #define z(v) (v & 7) Instruction::Condition condition_table[] = { - Instruction::Condition::NZ, Instruction::Condition::Z, - Instruction::Condition::NC, Instruction::Condition::C, - Instruction::Condition::PO, Instruction::Condition::PE, + Instruction::Condition::NZ, Instruction::Condition::Z, + Instruction::Condition::NC, Instruction::Condition::C, + Instruction::Condition::PO, Instruction::Condition::PE, Instruction::Condition::P, Instruction::Condition::M }; diff --git a/Components/6560/6560.hpp b/Components/6560/6560.hpp index 1c4c3f714..f2503bd1f 100644 --- a/Components/6560/6560.hpp +++ b/Components/6560/6560.hpp @@ -34,7 +34,7 @@ class AudioGenerator: public ::Outputs::Speaker::SampleSource { private: Concurrency::DeferringAsyncTaskQueue &audio_queue_; - unsigned int counters_[4] = {2, 1, 0, 0}; // create a slight phase offset for the three channels + unsigned int counters_[4] = {2, 1, 0, 0}; // create a slight phase offset for the three channels unsigned int shift_registers_[4] = {0, 0, 0, 0}; uint8_t control_registers_[4] = {0, 0, 0, 0}; int16_t volume_ = 0; diff --git a/Components/9918/9918.cpp b/Components/9918/9918.cpp index dcaf8efd6..44db295bf 100644 --- a/Components/9918/9918.cpp +++ b/Components/9918/9918.cpp @@ -85,7 +85,7 @@ Base::Base(Personality p) : } TMS9918::TMS9918(Personality p): - Base(p) { + Base(p) { // crt_->set_video_signal(Outputs::Display::VideoSignal::RGB); crt_.set_visible_area(Outputs::Display::Rect(0.055f, 0.025f, 0.9f, 0.9f)); diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp index 842c3336c..9aba6fcec 100644 --- a/Components/9918/Implementation/9918Base.hpp +++ b/Components/9918/Implementation/9918Base.hpp @@ -391,7 +391,7 @@ class Base { /* Fetching routines follow below; they obey the following rules: - 1) input is a start position and an end position; they should perform the proper + 1) input is a start position and an end position; they should perform the proper operations for the period: start <= time < end. 2) times are measured relative to a 172-cycles-per-line clock (so: they directly count access windows on the TMS and Master System). @@ -411,7 +411,7 @@ class Base { Provided for the benefit of the methods below: - * the function external_slot(), which will perform any pending VRAM read/write. + * the function external_slot(), which will perform any pending VRAM read/write. * the macros slot(n) and external_slot(n) which can be used to schedule those things inside a switch(start)-based implementation. @@ -752,14 +752,14 @@ class Base { fetch_tile_name(column+1, row_info) \ sprite_y_read(location+5, sprite); \ slot(location+6): \ - slot(location+7): \ + slot(location+7): \ slot(location+8): \ fetch_tile(column+1) \ fetch_tile_name(column+2, row_info) \ sprite_y_read(location+9, sprite+2); \ slot(location+10): \ slot(location+11): \ - slot(location+12): \ + slot(location+12): \ fetch_tile(column+2) \ fetch_tile_name(column+3, row_info) \ sprite_y_read(location+13, sprite+4); \ diff --git a/Components/AY38910/AY38910.cpp b/Components/AY38910/AY38910.cpp index 56f9e10e9..d9e0ae4af 100644 --- a/Components/AY38910/AY38910.cpp +++ b/Components/AY38910/AY38910.cpp @@ -253,7 +253,7 @@ uint8_t AY38910::get_data_output() { const uint8_t mask = port_handler_ ? port_handler_->get_port_input(selected_register_ == 15) : 0xff; switch(selected_register_) { - default: break; + default: break; case 14: return mask & ((registers_[0x7] & 0x40) ? registers_[14] : 0xff); case 15: return mask & ((registers_[0x7] & 0x80) ? registers_[15] : 0xff); } @@ -280,7 +280,7 @@ void AY38910::update_bus() { // Assume no output, unless this turns out to be a read. data_output_ = 0xff; switch(control_state_) { - default: break; + default: break; case LatchAddress: select_register(data_input_); break; case Write: set_register_value(data_input_); break; case Read: data_output_ = get_register_value(); break; diff --git a/Components/DiskII/DiskII.hpp b/Components/DiskII/DiskII.hpp index dfd5b364a..6df8edf10 100644 --- a/Components/DiskII/DiskII.hpp +++ b/Components/DiskII/DiskII.hpp @@ -54,7 +54,7 @@ class DiskII: void run_for(const Cycles cycles); /*! - Supplies the image of the state machine (i.e. P6) ROM, + Supplies the image of the state machine (i.e. P6) ROM, which dictates how the Disk II will respond to input. To reduce processing costs, some assumptions are made by diff --git a/Configurable/StandardOptions.cpp b/Configurable/StandardOptions.cpp index 29036bca7..da9dcd407 100644 --- a/Configurable/StandardOptions.cpp +++ b/Configurable/StandardOptions.cpp @@ -36,8 +36,8 @@ std::vector> Configurable::standard_option if(mask & (DisplayRGB | DisplayComposite | DisplaySVideo)) { std::vector display_options; if(mask & DisplayComposite) display_options.emplace_back("composite"); - if(mask & DisplaySVideo) display_options.emplace_back("svideo"); - if(mask & DisplayRGB) display_options.emplace_back("rgb"); + if(mask & DisplaySVideo) display_options.emplace_back("svideo"); + if(mask & DisplayRGB) display_options.emplace_back("rgb"); options.emplace_back(new Configurable::ListOption("Display", "display", display_options)); } if(mask & AutomaticTapeMotorControl) options.emplace_back(new Configurable::BooleanOption("Automatic Tape Motor Control", "autotapemotor")); diff --git a/Inputs/Joystick.hpp b/Inputs/Joystick.hpp index d86d9ac04..b1908486c 100644 --- a/Inputs/Joystick.hpp +++ b/Inputs/Joystick.hpp @@ -185,7 +185,7 @@ class ConcreteJoystick: public Joystick { // convenient hard-coded values. TODO: make these a function of time. using Type = Joystick::Input::Type; switch(input.type) { - default: did_set_input(input, is_active ? 1.0f : 0.0f); break; + default: did_set_input(input, is_active ? 1.0f : 0.0f); break; case Type::Left: did_set_input(Input(Type::Horizontal, input.info.control.index), is_active ? 0.1f : 0.5f); break; case Type::Right: did_set_input(Input(Type::Horizontal, input.info.control.index), is_active ? 0.9f : 0.5f); break; case Type::Up: did_set_input(Input(Type::Vertical, input.info.control.index), is_active ? 0.1f : 0.5f); break; @@ -203,7 +203,7 @@ class ConcreteJoystick: public Joystick { // Otherwise apply a threshold test to convert to digital, with remapping from axes to digital inputs. using Type = Joystick::Input::Type; switch(input.type) { - default: did_set_input(input, value > 0.5f); break; + default: did_set_input(input, value > 0.5f); break; case Type::Horizontal: did_set_input(Input(Type::Left, input.info.control.index), value <= 0.25f); did_set_input(Input(Type::Right, input.info.control.index), value >= 0.75f); diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index cd223088b..d6f43042f 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -1167,7 +1167,7 @@ Machine *Machine::AmstradCPC(const Analyser::Static::Target *target, const ROMMa using Target = Analyser::Static::AmstradCPC::Target; const Target *const cpc_target = dynamic_cast(target); switch(cpc_target->model) { - default: return new AmstradCPC::ConcreteMachine(*cpc_target, rom_fetcher); + default: return new AmstradCPC::ConcreteMachine(*cpc_target, rom_fetcher); case Target::Model::CPC464: return new AmstradCPC::ConcreteMachine(*cpc_target, rom_fetcher); } } diff --git a/Machines/AppleII/AppleII.cpp b/Machines/AppleII/AppleII.cpp index 62eb999a2..b9e072219 100644 --- a/Machines/AppleII/AppleII.cpp +++ b/Machines/AppleII/AppleII.cpp @@ -123,7 +123,7 @@ template class ConcreteMachine: void pick_card_messaging_group(AppleII::Card *card) { const bool is_every_cycle = is_every_cycle_card(card); std::vector &intended = is_every_cycle ? every_cycle_cards_ : just_in_time_cards_; - std::vector &undesired = is_every_cycle ? just_in_time_cards_ : every_cycle_cards_; + std::vector &undesired = is_every_cycle ? just_in_time_cards_ : every_cycle_cards_; if(std::find(intended.begin(), intended.end(), card) != intended.end()) return; auto old_membership = std::find(undesired.begin(), undesired.end(), card); @@ -154,7 +154,7 @@ template class ConcreteMachine: On a IIe with auxiliary memory the following orthogonal changes also need to be factored in: - 0000 to 0200 : can be paged independently of the rest of RAM, other than part of the language card area which pages with it + 0000 to 0200 : can be paged independently of the rest of RAM, other than part of the language card area which pages with it 0400 to 0800 : the text screen, can be configured to write to auxiliary RAM 2000 to 4000 : the graphics screen, which can be configured to write to auxiliary RAM c100 to d000 : can be used to page an additional 3.75kb of ROM, replacing the IO area @@ -308,16 +308,16 @@ template class ConcreteMachine: public: ConcreteMachine(const Analyser::Static::AppleII::Target &target, const ROMMachine::ROMFetcher &rom_fetcher): m6502_(*this), - video_bus_handler_(ram_, aux_ram_), - video_(video_bus_handler_), - audio_toggle_(audio_queue_), - speaker_(audio_toggle_) { - // The system's master clock rate. - const float master_clock = 14318180.0; + video_bus_handler_(ram_, aux_ram_), + video_(video_bus_handler_), + audio_toggle_(audio_queue_), + speaker_(audio_toggle_) { + // The system's master clock rate. + const float master_clock = 14318180.0; - // This is where things get slightly convoluted: establish the machine as having a clock rate - // equal to the number of cycles of work the 6502 will actually achieve. Which is less than - // the master clock rate divided by 14 because every 65th cycle is extended by one seventh. + // This is where things get slightly convoluted: establish the machine as having a clock rate + // equal to the number of cycles of work the 6502 will actually achieve. Which is less than + // the master clock rate divided by 14 because every 65th cycle is extended by one seventh. set_clock_rate((master_clock / 14.0) * 65.0 / (65.0 + 1.0 / 7.0)); // The speaker, however, should think it is clocked at half the master clock, per a general @@ -334,8 +334,8 @@ template class ConcreteMachine: Memory::Fuzz(aux_ram_, sizeof(aux_ram_)); // Add a couple of joysticks. - joysticks_.emplace_back(new Joystick); - joysticks_.emplace_back(new Joystick); + joysticks_.emplace_back(new Joystick); + joysticks_.emplace_back(new Joystick); // Pick the required ROMs. using Target = Analyser::Static::AppleII::Target; diff --git a/Machines/Atari2600/TIA.hpp b/Machines/Atari2600/TIA.hpp index 7657b0821..1dd80034a 100644 --- a/Machines/Atari2600/TIA.hpp +++ b/Machines/Atari2600/TIA.hpp @@ -38,7 +38,7 @@ class TIA { void set_sync(bool sync); void set_blank(bool blank); - void reset_horizontal_counter(); // Reset is delayed by four cycles. + void reset_horizontal_counter(); // Reset is delayed by four cycles. /*! @returns the number of cycles between (current TIA time) + from_offset to the current or diff --git a/Machines/ColecoVision/ColecoVision.cpp b/Machines/ColecoVision/ColecoVision.cpp index 73730bc1e..4d55fbde7 100644 --- a/Machines/ColecoVision/ColecoVision.cpp +++ b/Machines/ColecoVision/ColecoVision.cpp @@ -76,7 +76,7 @@ class Joystick: public Inputs::ConcreteJoystick { } break; - case Input::Up: if(is_active) direction_ &= ~0x01; else direction_ |= 0x01; break; + case Input::Up: if(is_active) direction_ &= ~0x01; else direction_ |= 0x01; break; case Input::Right: if(is_active) direction_ &= ~0x02; else direction_ |= 0x02; break; case Input::Down: if(is_active) direction_ &= ~0x04; else direction_ |= 0x04; break; case Input::Left: if(is_active) direction_ &= ~0x08; else direction_ |= 0x08; break; diff --git a/Machines/Commodore/Vic-20/Keyboard.hpp b/Machines/Commodore/Vic-20/Keyboard.hpp index a847e14f8..7437f3420 100644 --- a/Machines/Commodore/Vic-20/Keyboard.hpp +++ b/Machines/Commodore/Vic-20/Keyboard.hpp @@ -34,7 +34,7 @@ enum Key: uint16_t { Key1 = key(0, 0x01), Key3 = key(0, 0x02), Key5 = key(0, 0x04), Key7 = key(0, 0x08), Key9 = key(0, 0x10), KeyPlus = key(0, 0x20), KeyGBP = key(0, 0x40), KeyDelete = key(0, 0x80), - KeyRestore = 0xfffd + KeyRestore = 0xfffd #undef key }; diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp index 59d6c631a..19e93b78e 100644 --- a/Machines/MSX/MSX.cpp +++ b/Machines/MSX/MSX.cpp @@ -645,7 +645,7 @@ class ConcreteMachine: case 2: { // TODO: // b6 caps lock LED - // b5 audio output + // b5 audio output // b4: cassette motor relay tape_player_.set_motor_control(!(value & 0x10)); diff --git a/Machines/MasterSystem/MasterSystem.cpp b/Machines/MasterSystem/MasterSystem.cpp index d998145c5..120ff41f1 100644 --- a/Machines/MasterSystem/MasterSystem.cpp +++ b/Machines/MasterSystem/MasterSystem.cpp @@ -57,7 +57,7 @@ class Joystick: public Inputs::ConcreteJoystick { switch(digital_input.type) { default: return; - case Input::Up: if(is_active) state_ &= ~0x01; else state_ |= 0x01; break; + case Input::Up: if(is_active) state_ &= ~0x01; else state_ |= 0x01; break; case Input::Down: if(is_active) state_ &= ~0x02; else state_ |= 0x02; break; case Input::Left: if(is_active) state_ &= ~0x04; else state_ |= 0x04; break; case Input::Right: if(is_active) state_ &= ~0x08; else state_ |= 0x08; break; @@ -383,9 +383,9 @@ class ConcreteMachine: private: static TI::TMS::Personality tms_personality_for_model(Analyser::Static::Sega::Target::Model model) { switch(model) { - case Target::Model::SG1000: return TI::TMS::TMS9918A; + case Target::Model::SG1000: return TI::TMS::TMS9918A; case Target::Model::MasterSystem: return TI::TMS::SMSVDP; - case Target::Model::MasterSystem2: return TI::TMS::SMSVDP; + case Target::Model::MasterSystem2: return TI::TMS::SMSVDP; } } diff --git a/Machines/Oric/Keyboard.cpp b/Machines/Oric/Keyboard.cpp index 0dea3bc57..58b25179c 100644 --- a/Machines/Oric/Keyboard.cpp +++ b/Machines/Oric/Keyboard.cpp @@ -29,10 +29,10 @@ uint16_t KeyboardMapper::mapped_key_for_key(Inputs::Keyboard::Key key) { BIND(Hyphen, KeyMinus); BIND(Equals, KeyEquals); BIND(BackSlash, KeyBackSlash); BIND(OpenSquareBracket, KeyOpenSquare); BIND(CloseSquareBracket, KeyCloseSquare); - BIND(BackSpace, KeyDelete); BIND(Delete, KeyDelete); + BIND(BackSpace, KeyDelete); BIND(Delete, KeyDelete); BIND(Semicolon, KeySemiColon); BIND(Quote, KeyQuote); - BIND(Comma, KeyComma); BIND(FullStop, KeyFullStop); BIND(ForwardSlash, KeyForwardSlash); + BIND(Comma, KeyComma); BIND(FullStop, KeyFullStop); BIND(ForwardSlash, KeyForwardSlash); BIND(Escape, KeyEscape); BIND(Tab, KeyEscape); BIND(CapsLock, KeyControl); BIND(LeftControl, KeyControl); BIND(RightControl, KeyControl); diff --git a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm index 6b4f3579d..a069e705b 100644 --- a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm +++ b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm @@ -366,7 +366,7 @@ struct ActivityObserver: public Activity::Observer { BIND(VK_ForwardDelete, Delete); BIND(VK_LeftArrow, Left); BIND(VK_RightArrow, Right); - BIND(VK_DownArrow, Down); BIND(VK_UpArrow, Up); + BIND(VK_DownArrow, Down); BIND(VK_UpArrow, Up); } #undef BIND diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm index 202493b1a..d9e5ccfe5 100644 --- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm +++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm @@ -169,7 +169,7 @@ static Analyser::Static::ZX8081::Target::MemoryModel ZX8081MemoryModelFromSize(K std::unique_ptr target(new Target); target->machine = Analyser::Machine::AppleII; switch(model) { - default: target->model = Target::Model::II; break; + default: target->model = Target::Model::II; break; case CSMachineAppleIIModelAppleIIPlus: target->model = Target::Model::IIplus; break; case CSMachineAppleIIModelAppleIIe: target->model = Target::Model::IIe; break; case CSMachineAppleIIModelAppleEnhancedIIe: target->model = Target::Model::EnhancedIIe; break; diff --git a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift index 2292463ff..743a05bd2 100644 --- a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift +++ b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift @@ -141,7 +141,7 @@ class MachinePicker: NSObject { case 13: diskController = .thirteenSector case 16: diskController = .sixteenSector case 0: fallthrough - default: diskController = .none + default: diskController = .none } return CSStaticAnalyser(appleIIModel: model, diskController: diskController) @@ -162,7 +162,7 @@ class MachinePicker: NSObject { switch oricDiskInterfaceButton!.selectedTag() { case 1: diskInterface = .microdisc case 2: diskInterface = .pravetz - default: break; + default: break; } var model: CSMachineOricModel = .oric1 diff --git a/OSBindings/Mac/Clock SignalTests/Z80MachineCycleTests.swift b/OSBindings/Mac/Clock SignalTests/Z80MachineCycleTests.swift index 9d8eaabdc..4295e6cf3 100644 --- a/OSBindings/Mac/Clock SignalTests/Z80MachineCycleTests.swift +++ b/OSBindings/Mac/Clock SignalTests/Z80MachineCycleTests.swift @@ -303,7 +303,7 @@ class Z80MachineCycleTests: XCTestCase { MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .read, length: 3), - MachineCycle(operation: .read, length: 3), + MachineCycle(operation: .read, length: 3), MachineCycle(operation: .read, length: 3), MachineCycle(operation: .read, length: 3), ] @@ -318,7 +318,7 @@ class Z80MachineCycleTests: XCTestCase { MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .read, length: 3), - MachineCycle(operation: .read, length: 3), + MachineCycle(operation: .read, length: 3), MachineCycle(operation: .write, length: 3), MachineCycle(operation: .write, length: 3), ] @@ -333,7 +333,7 @@ class Z80MachineCycleTests: XCTestCase { MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .read, length: 3), - MachineCycle(operation: .read, length: 3), + MachineCycle(operation: .read, length: 3), MachineCycle(operation: .read, length: 3), MachineCycle(operation: .read, length: 3), ] @@ -348,7 +348,7 @@ class Z80MachineCycleTests: XCTestCase { MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .readOpcode, length: 4), MachineCycle(operation: .read, length: 3), - MachineCycle(operation: .read, length: 3), + MachineCycle(operation: .read, length: 3), MachineCycle(operation: .write, length: 3), MachineCycle(operation: .write, length: 3), ] diff --git a/Outputs/OpenGL/Primitives/Rectangle.cpp b/Outputs/OpenGL/Primitives/Rectangle.cpp index 94fdf3db9..07e4e1bd6 100644 --- a/Outputs/OpenGL/Primitives/Rectangle.cpp +++ b/Outputs/OpenGL/Primitives/Rectangle.cpp @@ -11,7 +11,7 @@ using namespace Outputs::Display::OpenGL; Rectangle::Rectangle(float x, float y, float width, float height): - pixel_shader_( + pixel_shader_( "#version 150\n" "in vec2 position;" diff --git a/Processors/6502/6502.hpp b/Processors/6502/6502.hpp index 1dc7251bd..2dac65439 100644 --- a/Processors/6502/6502.hpp +++ b/Processors/6502/6502.hpp @@ -45,7 +45,7 @@ enum Personality { }; #define has_decimal_mode(p) ((p) >= Personality::P6502) -#define is_65c02(p) ((p) >= Personality::PSynertek65C02) +#define is_65c02(p) ((p) >= Personality::PSynertek65C02) #define has_bbrbbsrmbsmb(p) ((p) >= Personality::PRockwell65C02) #define has_stpwai(p) ((p) >= Personality::PWDC65C02) diff --git a/Storage/Disk/DiskImage/Formats/CPCDSK.cpp b/Storage/Disk/DiskImage/Formats/CPCDSK.cpp index 3c3f946ef..0156e156c 100644 --- a/Storage/Disk/DiskImage/Formats/CPCDSK.cpp +++ b/Storage/Disk/DiskImage/Formats/CPCDSK.cpp @@ -265,7 +265,7 @@ void CPCDSK::set_tracks(const std::map<::Storage::Disk::Track::Address, std::sha sector.fdc_status1 = 0; sector.fdc_status2 = 0; - if(source_sector.second.has_data_crc_error) sector.fdc_status2 |= 0x20; + if(source_sector.second.has_data_crc_error) sector.fdc_status2 |= 0x20; if(source_sector.second.has_header_crc_error) sector.fdc_status1 |= 0x20; if(source_sector.second.is_deleted) sector.fdc_status2 |= 0x40; } diff --git a/Storage/FileHolder.cpp b/Storage/FileHolder.cpp index 7a2f6f614..78ea7002a 100644 --- a/Storage/FileHolder.cpp +++ b/Storage/FileHolder.cpp @@ -155,7 +155,7 @@ bool FileHolder::check_signature(const char *signature, std::size_t length) { // read and check the file signature std::vector stored_signature = read(length); if(stored_signature.size() != length) return false; - if(std::memcmp(stored_signature.data(), signature, length)) return false; + if(std::memcmp(stored_signature.data(), signature, length)) return false; return true; } diff --git a/Storage/Tape/Formats/CAS.hpp b/Storage/Tape/Formats/CAS.hpp index ec1d89efc..a20bc8a2b 100644 --- a/Storage/Tape/Formats/CAS.hpp +++ b/Storage/Tape/Formats/CAS.hpp @@ -49,7 +49,7 @@ class CAS: public Tape { // each chunk is preceded by a header which may be long, and is optionally // also preceded by a gap. struct Chunk { - bool has_gap; + bool has_gap; bool long_header; std::vector data; }; diff --git a/Storage/Tape/Parsers/MSX.cpp b/Storage/Tape/Parsers/MSX.cpp index d3fd9934b..3af952cd3 100644 --- a/Storage/Tape/Parsers/MSX.cpp +++ b/Storage/Tape/Parsers/MSX.cpp @@ -67,7 +67,7 @@ std::unique_ptr Parser::find_header(Storage::Tape::BinaryTape of a 0 start bit. The HI cycle length is placed in WINWID and will be used to discriminate between LO and HI cycles." */ - total_length = total_length / 256.0f; // To get the average, in microseconds. + total_length = total_length / 256.0f; // To get the average, in microseconds. // To convert to the loop count format used by the MSX BIOS. uint8_t int_result = static_cast(total_length / (0.00001145f * 0.75f));