From 7226d8d4f7080f159e9a9450c34e2b765d0b0e2d Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 13 May 2018 15:46:14 -0400 Subject: [PATCH] =?UTF-8?q?Eliminates=20all=20instances=20of=20=C2=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Machines/AmstradCPC/AmstradCPC.cpp | 4 ++-- Outputs/CRT/CRT.cpp | 5 +++-- Storage/Tape/Formats/ZX80O81P.cpp | 4 ++-- Storage/Tape/Parsers/Commodore.cpp | 6 +++--- Storage/Tape/Parsers/MSX.cpp | 4 ++-- Storage/Tape/Parsers/Oric.hpp | 6 +++--- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index 91cd3abe8..10dca0dac 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -182,8 +182,8 @@ class CRTCBusHandler { bus state and determines what output to produce based on the current palette and mode. */ forceinline void perform_bus_cycle_phase1(const Motorola::CRTC::BusState &state) { - // The gate array waits 2µs to react to the CRTC's vsync signal, and then - // caps output at 4µs. Since the clock rate is 1Mhz, that's 2 and 4 cycles, + // The gate array waits 2us to react to the CRTC's vsync signal, and then + // caps output at 4us. Since the clock rate is 1Mhz, that's 2 and 4 cycles, // respectively. if(state.hsync) { cycles_into_hsync_++; diff --git a/Outputs/CRT/CRT.cpp b/Outputs/CRT/CRT.cpp index fc074b528..86a74b69b 100644 --- a/Outputs/CRT/CRT.cpp +++ b/Outputs/CRT/CRT.cpp @@ -24,8 +24,9 @@ void CRT::set_new_timing(unsigned int cycles_per_line, unsigned int height_of_di // To quote: // // "retrace interval; The interval of time for the return of the blanked scanning beam of - // a TV picture tube or camera tube to the starting point of a line or field. It is about 7 µs - // for horizontal retrace and 500 to 750 µs for vertical retrace in NTSC and PAL TV." + // a TV picture tube or camera tube to the starting point of a line or field. It is about + // 7 microseconds for horizontal retrace and 500 to 750 microseconds for vertical retrace + // in NTSC and PAL TV." time_multiplier_ = IntermediateBufferWidth / cycles_per_line; phase_denominator_ = cycles_per_line * colour_cycle_denominator * time_multiplier_; diff --git a/Storage/Tape/Formats/ZX80O81P.cpp b/Storage/Tape/Formats/ZX80O81P.cpp index 666572588..399e24e7d 100644 --- a/Storage/Tape/Formats/ZX80O81P.cpp +++ b/Storage/Tape/Formats/ZX80O81P.cpp @@ -72,14 +72,14 @@ Tape::Pulse ZX80O81P::virtual_get_next_pulse() { } if(!wave_pointer_) { - // post-waves silence (here actually a pre-waves silence) is 1300µs + // post-waves silence (here actually a pre-waves silence) is 1300 microseconds pulse.length.length = 13; pulse.length.clock_rate = 10000; pulse.type = Pulse::Type::Low; wave_pointer_ ++; } else { - // pulses are of length 150µs + // pulses are of length 150 microseconds pulse.length.length = 3; pulse.length.clock_rate = 20000; diff --git a/Storage/Tape/Parsers/Commodore.cpp b/Storage/Tape/Parsers/Commodore.cpp index 862845183..b7d3695f4 100644 --- a/Storage/Tape/Parsers/Commodore.cpp +++ b/Storage/Tape/Parsers/Commodore.cpp @@ -264,9 +264,9 @@ uint16_t Parser::get_next_short(const std::shared_ptr &tape void Parser::process_pulse(const Storage::Tape::Tape::Pulse &pulse) { // The Complete Commodore Inner Space Anthology, P 97, gives half-cycle lengths of: - // short: 182µs => 0.000364s cycle - // medium: 262µs => 0.000524s cycle - // long: 342µs => 0.000684s cycle + // short: 182us => 0.000364s cycle + // medium: 262us => 0.000524s cycle + // long: 342us => 0.000684s cycle bool is_high = pulse.type == Storage::Tape::Tape::Pulse::High; if(!is_high && previous_was_high_) { diff --git a/Storage/Tape/Parsers/MSX.cpp b/Storage/Tape/Parsers/MSX.cpp index 08553a6e1..d3fd9934b 100644 --- a/Storage/Tape/Parsers/MSX.cpp +++ b/Storage/Tape/Parsers/MSX.cpp @@ -18,8 +18,8 @@ std::unique_ptr Parser::find_header(Storage::Tape::BinaryTape } /* - "When 1,111 cycles have been found with less than 35 µs variation in - their lengths a header has been located." + "When 1,111 cycles have been found with less than 35 microseconds + variation in their lengths a header has been located." */ bool last_level = tape_player.get_input(); float low = std::numeric_limits::max(); diff --git a/Storage/Tape/Parsers/Oric.hpp b/Storage/Tape/Parsers/Oric.hpp index 76eccb2ae..71607bd1b 100644 --- a/Storage/Tape/Parsers/Oric.hpp +++ b/Storage/Tape/Parsers/Oric.hpp @@ -16,9 +16,9 @@ namespace Tape { namespace Oric { enum class WaveType { - Short, // i.e. 416µs - Medium, // i.e. 624µs - Long, // i.e. 832µs + Short, // i.e. 416 microseconds + Medium, // i.e. 624 microseconds + Long, // i.e. 832 microseconds Unrecognised };