1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-02 16:38:51 +00:00

Eliminates a large number of instance of end-of-line tabs.

This commit is contained in:
Thomas Harte 2017-11-07 22:51:06 -05:00
parent 09c855a659
commit f95515ae81
20 changed files with 34 additions and 34 deletions

View File

@ -26,7 +26,7 @@ class PortHandler {
public: public:
/*! /*!
Requests the current input on an AY port. Requests the current input on an AY port.
@param port_b @c true if the input being queried is Port B. @c false if it is Port A. @param port_b @c true if the input being queried is Port B. @c false if it is Port A.
*/ */
virtual uint8_t get_port_input(bool port_b) { virtual uint8_t get_port_input(bool port_b) {
@ -35,7 +35,7 @@ class PortHandler {
/*! /*!
Requests the current input on an AY port. Requests the current input on an AY port.
@param port_b @c true if the input being queried is Port B. @c false if it is Port A. @param port_b @c true if the input being queried is Port B. @c false if it is Port A.
*/ */
virtual void set_port_output(bool port_b, uint8_t value) {} virtual void set_port_output(bool port_b, uint8_t value) {}

View File

@ -20,7 +20,7 @@ namespace Inputs {
class Joystick { class Joystick {
public: public:
virtual ~Joystick() {} virtual ~Joystick() {}
enum class DigitalInput { enum class DigitalInput {
Up, Down, Left, Right, Fire Up, Down, Left, Right, Fire
}; };

View File

@ -21,7 +21,7 @@ namespace Inputs {
class Keyboard { class Keyboard {
public: public:
Keyboard(); Keyboard();
enum class Key { enum class Key {
Escape, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PrintScreen, ScrollLock, Pause, Escape, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PrintScreen, ScrollLock, Pause,
BackTick, k1, k2, k3, k4, k5, k6, k7, k8, k9, k0, Hyphen, Equals, BackSpace, BackTick, k1, k2, k3, k4, k5, k6, k7, k8, k9, k0, Hyphen, Equals, BackSpace,
@ -55,7 +55,7 @@ class Keyboard {
std::vector<bool> key_states_; std::vector<bool> key_states_;
Delegate *delegate_ = nullptr; Delegate *delegate_ = nullptr;
}; };
} }
#endif /* Keyboard_hpp */ #endif /* Keyboard_hpp */

View File

@ -36,7 +36,7 @@ class Machine: public ROMMachine::Machine {
OpenGL context is bound. OpenGL context is bound.
*/ */
virtual void close_output() = 0; virtual void close_output() = 0;
/// @returns The CRT this machine is drawing to. Should not be @c nullptr. /// @returns The CRT this machine is drawing to. Should not be @c nullptr.
virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() = 0; virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() = 0;

View File

@ -27,7 +27,7 @@ class Machine: public MachineBase, public ROMMachine::Machine {
C1541 C1541
}; };
Machine(Personality p); Machine(Personality p);
/*! /*!
Sets the source for this drive's ROM image. Sets the source for this drive's ROM image.
*/ */

View File

@ -60,7 +60,7 @@ uint16_t KeyboardMapper::mapped_key_for_key(Inputs::Keyboard::Key key) {
BIND(Enter, KeyReturn); BIND(Enter, KeyReturn);
BIND(Space, KeySpace); BIND(Space, KeySpace);
BIND(BackSpace, KeyDelete); BIND(BackSpace, KeyDelete);
BIND(Escape, KeyRunStop); BIND(Escape, KeyRunStop);
BIND(F1, KeyF1); BIND(F1, KeyF1);
BIND(F3, KeyF3); BIND(F3, KeyF3);

View File

@ -16,7 +16,7 @@ namespace KeyboardMachine {
class Machine: public Inputs::Keyboard::Delegate { class Machine: public Inputs::Keyboard::Delegate {
public: public:
Machine(); Machine();
/*! /*!
Indicates that the key @c key has been either pressed or released, according to Indicates that the key @c key has been either pressed or released, according to
the state of @c isPressed. the state of @c isPressed.

View File

@ -21,7 +21,7 @@
- (instancetype)init NS_UNAVAILABLE; - (instancetype)init NS_UNAVAILABLE;
/*! /*!
Initialises an instance of CSMachine. Initialises an instance of CSMachine.
@param machine The pointer to an instance of @c CRTMachine::Machine* . C++ type is omitted because @param machine The pointer to an instance of @c CRTMachine::Machine* . C++ type is omitted because
this header is visible to Swift, and the designated initialiser cannot be placed into a category. this header is visible to Swift, and the designated initialiser cannot be placed into a category.
*/ */

View File

@ -249,7 +249,7 @@ struct MachineDelegate: CRTMachine::Machine::Delegate, public LockProtectedDeleg
BIND(VK_ANSI_KeypadMultiply, KeyPadAsterisk); BIND(VK_ANSI_KeypadDivide, KeyPadSlash); BIND(VK_ANSI_KeypadMultiply, KeyPadAsterisk); BIND(VK_ANSI_KeypadDivide, KeyPadSlash);
BIND(VK_ANSI_KeypadPlus, KeyPadPlus); BIND(VK_ANSI_KeypadMinus, KeyPadMinus); BIND(VK_ANSI_KeypadPlus, KeyPadPlus); BIND(VK_ANSI_KeypadMinus, KeyPadMinus);
BIND(VK_ANSI_KeypadClear, KeyPadDelete); BIND(VK_ANSI_KeypadEnter, KeyPadEnter); BIND(VK_ANSI_KeypadClear, KeyPadDelete); BIND(VK_ANSI_KeypadEnter, KeyPadEnter);
BIND(VK_Return, Enter); BIND(VK_Tab, Tab); BIND(VK_Return, Enter); BIND(VK_Tab, Tab);
BIND(VK_Space, Space); BIND(VK_Delete, BackSpace); BIND(VK_Space, Space); BIND(VK_Delete, BackSpace);
BIND(VK_Control, LeftControl); BIND(VK_Option, LeftOption); BIND(VK_Control, LeftControl); BIND(VK_Option, LeftOption);

View File

@ -10,7 +10,7 @@ import XCTest
import Foundation import Foundation
class WolfgangLorenzTests: XCTestCase, CSTestMachineTrapHandler { class WolfgangLorenzTests: XCTestCase, CSTestMachineTrapHandler {
func testWolfgangLorenzStart() { func testWolfgangLorenzStart() {
self.runWolfgangLorenzTest(" start") self.runWolfgangLorenzTest(" start")
} }

View File

@ -37,7 +37,7 @@ class FIRFilter {
public: public:
/*! /*!
Creates an instance of @c FIRFilter. Creates an instance of @c FIRFilter.
@param number_of_taps The size of window for input data. @param number_of_taps The size of window for input data.
@param input_sample_rate The sampling rate of the input signal. @param input_sample_rate The sampling rate of the input signal.
@param low_frequency The lowest frequency of signal to retain in the output. @param low_frequency The lowest frequency of signal to retain in the output.
@ -53,7 +53,7 @@ class FIRFilter {
/*! /*!
Applies the filter to one batch of input samples, returning the net result. Applies the filter to one batch of input samples, returning the net result.
@param src The source buffer to apply the filter to. @param src The source buffer to apply the filter to.
@returns The result of applying the filter. @returns The result of applying the filter.
*/ */

View File

@ -116,7 +116,7 @@ struct Target {
/*! /*!
Attempts, through any available means, to return a list of potential targets for the file with the given name. Attempts, through any available means, to return a list of potential targets for the file with the given name.
@returns The list of potential targets, sorted from most to least probable. @returns The list of potential targets, sorted from most to least probable.
*/ */
std::list<Target> GetTargets(const char *file_name); std::list<Target> GetTargets(const char *file_name);

View File

@ -12,7 +12,7 @@ std::wstring Storage::Data::Commodore::petscii_from_bytes(const uint8_t *string,
std::wstring result; std::wstring result;
wchar_t unshifted_characters[256] = { wchar_t unshifted_characters[256] = {
L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\r', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\r', L'\0', L'\0',
L'\0', L'\0', L'\0', L'\0', L'\b', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\b', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0',
L' ', L'!', L'"', L'#', L'$', L'%', L'&', L'\'', L'(', L')', L'*', L'+', L',', L'-', L'.', L'/', L' ', L'!', L'"', L'#', L'$', L'%', L'&', L'\'', L'(', L')', L'*', L'+', L',', L'-', L'.', L'/',
L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9', L'"', L';', L'<', L'=', L'>', L'?', L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9', L'"', L';', L'<', L'=', L'>', L'?',
@ -31,7 +31,7 @@ std::wstring Storage::Data::Commodore::petscii_from_bytes(const uint8_t *string,
}; };
wchar_t shifted_characters[256] = { wchar_t shifted_characters[256] = {
L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\r', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\r', L'\0', L'\0',
L'\0', L'\0', L'\0', L'\0', L'\b', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\b', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0',
L' ', L'!', L'"', L'#', L'$', L'%', L'&', L'\'', L'(', L')', L'*', L'+', L',', L'-', L'.', L'/', L' ', L'!', L'"', L'#', L'$', L'%', L'&', L'\'', L'(', L')', L'*', L'+', L',', L'-', L'.', L'/',
L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9', L'"', L';', L'<', L'=', L'>', L'?', L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9', L'"', L';', L'<', L'=', L'>', L'?',

View File

@ -63,7 +63,7 @@ CPCDSK::CPCDSK(const char *file_name) :
// Track and side are stored, being a byte each. // Track and side are stored, being a byte each.
track->track = file.get8(); track->track = file.get8();
track->side = file.get8(); track->side = file.get8();
// If this is an extended disk image then John Elliott's extension provides some greater // If this is an extended disk image then John Elliott's extension provides some greater
// data rate and encoding context. Otherwise the next two bytes have no defined meaning. // data rate and encoding context. Otherwise the next two bytes have no defined meaning.
if(is_extended_) { if(is_extended_) {
@ -83,7 +83,7 @@ CPCDSK::CPCDSK(const char *file_name) :
track->data_encoding = Track::DataEncoding::Unknown; track->data_encoding = Track::DataEncoding::Unknown;
file.seek(2, SEEK_CUR); file.seek(2, SEEK_CUR);
} }
// Sector size, number of sectors, gap 3 length and the filler byte are then common // Sector size, number of sectors, gap 3 length and the filler byte are then common
// between both variants of DSK. // between both variants of DSK.
track->sector_length = file.get8(); track->sector_length = file.get8();
@ -204,7 +204,7 @@ std::shared_ptr<Track> CPCDSK::get_track_at_position(::Storage::Disk::Track::Add
// Return a nullptr if out of range or not provided. // Return a nullptr if out of range or not provided.
if(chronological_track >= tracks_.size()) return nullptr; if(chronological_track >= tracks_.size()) return nullptr;
Track *track = tracks_[chronological_track].get(); Track *track = tracks_[chronological_track].get();
if(!track) return nullptr; if(!track) return nullptr;
@ -270,7 +270,7 @@ void CPCDSK::set_tracks(const std::map<::Storage::Disk::Track::Address, std::sha
if(source_sector.second.is_deleted) sector.fdc_status2 |= 0x40; if(source_sector.second.is_deleted) sector.fdc_status2 |= 0x40;
} }
} }
// Rewrite the entire disk image, in extended form. // Rewrite the entire disk image, in extended form.
Storage::FileHolder output(file_name_, Storage::FileHolder::FileMode::Rewrite); Storage::FileHolder output(file_name_, Storage::FileHolder::FileMode::Rewrite);
output.write(reinterpret_cast<const uint8_t *>("EXTENDED CPC DSK File\r\nDisk-Info\r\n"), 34); output.write(reinterpret_cast<const uint8_t *>("EXTENDED CPC DSK File\r\nDisk-Info\r\n"), 34);
@ -290,7 +290,7 @@ void CPCDSK::set_tracks(const std::map<::Storage::Disk::Track::Address, std::sha
output.put8(0); output.put8(0);
continue; continue;
} }
// Calculate size of track. // Calculate size of track.
size_t track_size = 256; size_t track_size = 256;
for(auto &sector: track->sectors) { for(auto &sector: track->sectors) {
@ -303,7 +303,7 @@ void CPCDSK::set_tracks(const std::map<::Storage::Disk::Track::Address, std::sha
track_size += (256 - (track_size & 255)) & 255; track_size += (256 - (track_size & 255)) & 255;
output.put8(static_cast<uint8_t>(track_size >> 8)); output.put8(static_cast<uint8_t>(track_size >> 8));
} }
// Advance to offset 256. // Advance to offset 256.
output.putn(static_cast<size_t>(256 - output.tell()), 0); output.putn(static_cast<size_t>(256 - output.tell()), 0);
@ -363,7 +363,7 @@ void CPCDSK::set_tracks(const std::map<::Storage::Disk::Track::Address, std::sha
} }
output.put16le(static_cast<uint16_t>(data_size)); output.put16le(static_cast<uint16_t>(data_size));
} }
// Move to next 256-byte boundary. // Move to next 256-byte boundary.
long distance = (256 - output.tell()&255)&255; long distance = (256 - output.tell()&255)&255;
output.putn(static_cast<size_t>(distance), 0); output.putn(static_cast<size_t>(distance), 0);

View File

@ -34,7 +34,7 @@ class PCMPatchedTrack: public Track {
/*! /*!
Replaces whatever is currently on the track from @c start_position to @c start_position + segment length Replaces whatever is currently on the track from @c start_position to @c start_position + segment length
with the contents of @c segment. with the contents of @c segment.
@param start_time The time at which this segment begins. Must be in the range [0, 1). @param start_time The time at which this segment begins. Must be in the range [0, 1).
@param segment The PCM segment to add. @param segment The PCM segment to add.
@param clamp_to_index_hole If @c true then the new segment will be truncated if it overruns the index hole; @param clamp_to_index_hole If @c true then the new segment will be truncated if it overruns the index hole;

View File

@ -31,7 +31,7 @@ FileHolder::FileHolder(const std::string &file_name, FileMode ideal_mode)
case FileMode::Read: case FileMode::Read:
file_ = fopen(file_name.c_str(), "rb"); file_ = fopen(file_name.c_str(), "rb");
break; break;
case FileMode::Rewrite: case FileMode::Rewrite:
file_ = fopen(file_name.c_str(), "w"); file_ = fopen(file_name.c_str(), "w");
break; break;

View File

@ -23,7 +23,7 @@ class FileHolder final {
enum { enum {
ErrorCantOpen = -1 ErrorCantOpen = -1
}; };
enum class FileMode { enum class FileMode {
ReadWrite, ReadWrite,
Read, Read,
@ -168,7 +168,7 @@ class FileHolder final {
return bit; return bit;
} }
}; };
/*! /*!
Obtains a BitStream for reading from the file from the current reading cursor. Obtains a BitStream for reading from the file from the current reading cursor.
*/ */
@ -204,7 +204,7 @@ class FileHolder final {
@returns the stat struct describing this file. @returns the stat struct describing this file.
*/ */
struct stat &stats(); struct stat &stats();
/*! /*!
@returns a mutex owned by the file that can be used to serialise file access. @returns a mutex owned by the file that can be used to serialise file access.
*/ */

View File

@ -105,7 +105,7 @@ template <typename WaveType, typename SymbolType> class PulseClassificationParse
protected: protected:
/*! /*!
Sets @c symbol as the newly-recognised symbol and removes @c nunber_of_waves waves from the front of the list. Sets @c symbol as the newly-recognised symbol and removes @c nunber_of_waves waves from the front of the list.
Expected to be called by subclasses from @c process_pulse when it recognises that the first @c number_of_waves Expected to be called by subclasses from @c process_pulse when it recognises that the first @c number_of_waves
waves together represent @c symbol. waves together represent @c symbol.
*/ */
@ -116,7 +116,7 @@ template <typename WaveType, typename SymbolType> class PulseClassificationParse
/*! /*!
Adds @c wave to the back of the list of recognised waves and calls @c inspect_waves to check for a new symbol. Adds @c wave to the back of the list of recognised waves and calls @c inspect_waves to check for a new symbol.
Expected to be called by subclasses from @c process_pulse as and when recognised waves arise. Expected to be called by subclasses from @c process_pulse as and when recognised waves arise.
*/ */
void push_wave(WaveType wave) { void push_wave(WaveType wave) {
@ -126,7 +126,7 @@ template <typename WaveType, typename SymbolType> class PulseClassificationParse
/*! /*!
Removes @c nunber_of_waves waves from the front of the list. Removes @c nunber_of_waves waves from the front of the list.
Expected to be called by subclasses from @c process_pulse if it is recognised that the first set of waves Expected to be called by subclasses from @c process_pulse if it is recognised that the first set of waves
do not form a valid symbol. do not form a valid symbol.
*/ */

View File

@ -20,7 +20,7 @@ namespace Tape {
If is-at-end is set then get_next_pulse() returns a second of silence and If is-at-end is set then get_next_pulse() returns a second of silence and
is_at_end() returns true. is_at_end() returns true.
Otherwise get_next_pulse() returns something from the pulse queue if there is Otherwise get_next_pulse() returns something from the pulse queue if there is
anything there, and otherwise calls get_next_pulses(). get_next_pulses() is anything there, and otherwise calls get_next_pulses(). get_next_pulses() is
virtual, giving subclasses a chance to provide the next batch of pulses. virtual, giving subclasses a chance to provide the next batch of pulses.

View File

@ -25,7 +25,7 @@ namespace Tape {
- high pulses exit from zero upward before returning to it; - high pulses exit from zero upward before returning to it;
- low pulses exit from zero downward before returning to it; - low pulses exit from zero downward before returning to it;
- zero pulses run along zero. - zero pulses run along zero.
Subclasses should implement at least @c get_next_pulse and @c reset to provide a serial feeding Subclasses should implement at least @c get_next_pulse and @c reset to provide a serial feeding
of pulses and the ability to return to the start of the feed. They may also implement @c seek if of pulses and the ability to return to the start of the feed. They may also implement @c seek if
a better implementation than a linear search from the @c reset time can be implemented. a better implementation than a linear search from the @c reset time can be implemented.