From 4ab8b4984de98ddd45d4c6f233aaafd56ebde479 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 15 May 2021 18:05:53 +0200 Subject: [PATCH] Rename all InputProto and OutputProtos for clarity. --- arch/aeslanier/aeslanier.h | 4 ++-- arch/aeslanier/aeslanier.proto | 2 +- arch/amiga/amiga.h | 10 +++++----- arch/amiga/amiga.proto | 4 ++-- arch/apple2/apple2.h | 4 ++-- arch/apple2/apple2.proto | 2 +- arch/brother/brother.h | 10 +++++----- arch/brother/brother.proto | 4 ++-- arch/c64/c64.h | 4 ++-- arch/c64/c64.proto | 2 +- arch/f85/f85.h | 4 ++-- arch/f85/f85.proto | 2 +- arch/fb100/fb100.h | 4 ++-- arch/fb100/fb100.proto | 2 +- arch/ibm/ibm.h | 12 ++++++------ arch/ibm/ibm.proto | 4 ++-- arch/macintosh/macintosh.h | 8 ++++---- arch/macintosh/macintosh.proto | 4 ++-- arch/micropolis/micropolis.h | 4 ++-- arch/micropolis/micropolis.proto | 2 +- arch/mx/mx.h | 4 ++-- arch/mx/mx.proto | 2 +- arch/tids990/tids990.h | 10 +++++----- arch/tids990/tids990.proto | 4 ++-- arch/victor9k/victor9k.h | 4 ++-- arch/zilogmcz/zilogmcz.h | 4 ++-- arch/zilogmcz/zilogmcz.proto | 2 +- lib/decoders/decoders.proto | 28 ++++++++++++++-------------- lib/encoders/encoders.proto | 10 +++++----- 29 files changed, 80 insertions(+), 80 deletions(-) diff --git a/arch/aeslanier/aeslanier.h b/arch/aeslanier/aeslanier.h index a34d6f7c..6555f005 100644 --- a/arch/aeslanier/aeslanier.h +++ b/arch/aeslanier/aeslanier.h @@ -7,12 +7,12 @@ class Sector; class Fluxmap; -class AesLanierInputProto; +class AesLanierDecoderProto; class AesLanierDecoder : public AbstractDecoder { public: - AesLanierDecoder(const AesLanierInputProto&) {} + AesLanierDecoder(const AesLanierDecoderProto&) {} virtual ~AesLanierDecoder() {} RecordType advanceToNextRecord(); diff --git a/arch/aeslanier/aeslanier.proto b/arch/aeslanier/aeslanier.proto index 645d76f7..fe2df689 100644 --- a/arch/aeslanier/aeslanier.proto +++ b/arch/aeslanier/aeslanier.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message AesLanierInputProto {} +message AesLanierDecoderProto {} diff --git a/arch/amiga/amiga.h b/arch/amiga/amiga.h index 69828b55..ace04fae 100644 --- a/arch/amiga/amiga.h +++ b/arch/amiga/amiga.h @@ -12,13 +12,13 @@ class Sector; class Fluxmap; class SectorSet; -class AmigaInputProto; -class AmigaOutputProto; +class AmigaDecoderProto; +class AmigaEncoderProto; class AmigaDecoder : public AbstractDecoder { public: - AmigaDecoder(const AmigaInputProto&) {} + AmigaDecoder(const AmigaDecoderProto&) {} virtual ~AmigaDecoder() {} RecordType advanceToNextRecord(); @@ -30,7 +30,7 @@ public: class AmigaEncoder : public AbstractEncoder { public: - AmigaEncoder(const AmigaOutputProto& config): + AmigaEncoder(const AmigaEncoderProto& config): _config(config) {} virtual ~AmigaEncoder() {} @@ -38,7 +38,7 @@ public: std::unique_ptr encode(int physicalTrack, int physicalSide, const SectorSet& allSectors); private: - const AmigaOutputProto& _config; + const AmigaEncoderProto& _config; }; extern uint32_t amigaChecksum(const Bytes& bytes); diff --git a/arch/amiga/amiga.proto b/arch/amiga/amiga.proto index 47e10395..0e84abc3 100644 --- a/arch/amiga/amiga.proto +++ b/arch/amiga/amiga.proto @@ -2,9 +2,9 @@ syntax = "proto2"; import "lib/common.proto"; -message AmigaInputProto {} +message AmigaDecoderProto {} -message AmigaOutputProto { +message AmigaEncoderProto { optional double clock_rate_us = 1 [default=2.00, (help)="Encoded data clock rate."]; optional double post_index_gap_ms = 2 diff --git a/arch/apple2/apple2.h b/arch/apple2/apple2.h index 975cfb81..75148e4c 100644 --- a/arch/apple2/apple2.h +++ b/arch/apple2/apple2.h @@ -9,12 +9,12 @@ class Sector; class Fluxmap; -class Apple2InputProto; +class Apple2DecoderProto; class Apple2Decoder : public AbstractDecoder { public: - Apple2Decoder(const Apple2InputProto&) {} + Apple2Decoder(const Apple2DecoderProto&) {} virtual ~Apple2Decoder() {} RecordType advanceToNextRecord(); diff --git a/arch/apple2/apple2.proto b/arch/apple2/apple2.proto index 9acb9340..0364c642 100644 --- a/arch/apple2/apple2.proto +++ b/arch/apple2/apple2.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message Apple2InputProto {} +message Apple2DecoderProto {} diff --git a/arch/brother/brother.h b/arch/brother/brother.h index d3fb318c..2cbd877b 100644 --- a/arch/brother/brother.h +++ b/arch/brother/brother.h @@ -16,13 +16,13 @@ class Sector; class SectorSet; class Fluxmap; -class BrotherInputProto; -class BrotherOutputProto; +class BrotherDecoderProto; +class BrotherEncoderProto; class BrotherDecoder : public AbstractDecoder { public: - BrotherDecoder(const BrotherInputProto& config) {} + BrotherDecoder(const BrotherDecoderProto& config) {} virtual ~BrotherDecoder() {} RecordType advanceToNextRecord(); @@ -33,14 +33,14 @@ public: class BrotherEncoder : public AbstractEncoder { public: - BrotherEncoder(const BrotherOutputProto& config): + BrotherEncoder(const BrotherEncoderProto& config): _config(config) {} virtual ~BrotherEncoder() {} private: - const BrotherOutputProto& _config; + const BrotherEncoderProto& _config; public: std::unique_ptr encode(int physicalTrack, int physicalSide, const SectorSet& allSectors); diff --git a/arch/brother/brother.proto b/arch/brother/brother.proto index 28747a64..15818c47 100644 --- a/arch/brother/brother.proto +++ b/arch/brother/brother.proto @@ -1,13 +1,13 @@ syntax = "proto2"; -message BrotherInputProto {} +message BrotherDecoderProto {} enum BrotherFormat { BROTHER240 = 0; BROTHER120 = 1; }; -message BrotherOutputProto { +message BrotherEncoderProto { optional double clock_rate_us = 1 [default = 3.83]; optional double post_index_gap_ms = 2 [default = 1.0]; optional double sector_spacing_ms = 3 [default = 16.2]; diff --git a/arch/c64/c64.h b/arch/c64/c64.h index 6d7f11ab..2d74773b 100644 --- a/arch/c64/c64.h +++ b/arch/c64/c64.h @@ -7,12 +7,12 @@ class Sector; class Fluxmap; -class Commodore64InputProto; +class Commodore64DecoderProto; class Commodore64Decoder : public AbstractDecoder { public: - Commodore64Decoder(const Commodore64InputProto&) {} + Commodore64Decoder(const Commodore64DecoderProto&) {} virtual ~Commodore64Decoder() {} RecordType advanceToNextRecord(); diff --git a/arch/c64/c64.proto b/arch/c64/c64.proto index f804f21e..42d63106 100644 --- a/arch/c64/c64.proto +++ b/arch/c64/c64.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message Commodore64InputProto {} +message Commodore64DecoderProto {} diff --git a/arch/f85/f85.h b/arch/f85/f85.h index f102f15a..01d3dad3 100644 --- a/arch/f85/f85.h +++ b/arch/f85/f85.h @@ -7,12 +7,12 @@ class Sector; class Fluxmap; -class F85InputProto; +class F85DecoderProto; class DurangoF85Decoder : public AbstractDecoder { public: - DurangoF85Decoder(const F85InputProto&) {} + DurangoF85Decoder(const F85DecoderProto&) {} virtual ~DurangoF85Decoder() {} RecordType advanceToNextRecord(); diff --git a/arch/f85/f85.proto b/arch/f85/f85.proto index a0ffe8ed..5fac2a91 100644 --- a/arch/f85/f85.proto +++ b/arch/f85/f85.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message F85InputProto {} +message F85DecoderProto {} diff --git a/arch/fb100/fb100.h b/arch/fb100/fb100.h index 96057482..45a695c1 100644 --- a/arch/fb100/fb100.h +++ b/arch/fb100/fb100.h @@ -8,12 +8,12 @@ class Sector; class Fluxmap; class Track; -class Fb100InputProto; +class Fb100DecoderProto; class Fb100Decoder : public AbstractDecoder { public: - Fb100Decoder(const Fb100InputProto&) {} + Fb100Decoder(const Fb100DecoderProto&) {} virtual ~Fb100Decoder() {} RecordType advanceToNextRecord(); diff --git a/arch/fb100/fb100.proto b/arch/fb100/fb100.proto index 6c36e66f..fb60a49e 100644 --- a/arch/fb100/fb100.proto +++ b/arch/fb100/fb100.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message Fb100InputProto {} +message Fb100DecoderProto {} diff --git a/arch/ibm/ibm.h b/arch/ibm/ibm.h index 0439c10b..4438868b 100644 --- a/arch/ibm/ibm.h +++ b/arch/ibm/ibm.h @@ -4,8 +4,8 @@ #include "decoders/decoders.h" #include "encoders/encoders.h" -class IBMInputProto; -class IBMOutputProto; +class IbmDecoderProto; +class IbmEncoderProto; /* IBM format (i.e. ordinary PC floppies). */ @@ -35,7 +35,7 @@ struct IbmIdam class IbmDecoder : public AbstractDecoder { public: - IbmDecoder(const IBMInputProto& config): + IbmDecoder(const IbmDecoderProto& config): _config(config) {} @@ -46,7 +46,7 @@ public: std::set requiredSectors(Track& track) const; private: - const IBMInputProto& _config; + const IbmDecoderProto& _config; unsigned _currentSectorSize; unsigned _currentHeaderLength; }; @@ -54,7 +54,7 @@ private: class IbmEncoder : public AbstractEncoder { public: - IbmEncoder(const IBMOutputProto& config): + IbmEncoder(const IbmEncoderProto& config): _config(config) {} @@ -70,7 +70,7 @@ private: void writeSync(); private: - const IBMOutputProto& _config; + const IbmEncoderProto& _config; std::vector _bits; unsigned _cursor; bool _lastBit; diff --git a/arch/ibm/ibm.proto b/arch/ibm/ibm.proto index 12bce43a..e6b76da7 100644 --- a/arch/ibm/ibm.proto +++ b/arch/ibm/ibm.proto @@ -2,7 +2,7 @@ syntax = "proto2"; import "lib/common.proto"; -message IBMInputProto { +message IbmDecoderProto { optional int32 sector_id_base = 1 [default = 1, (help) = "ID of first sector"]; optional bool ignore_side_byte = 2 [default = false, @@ -11,7 +11,7 @@ message IBMInputProto { (help) = "require these sectors to exist for a good read"]; } -message IBMOutputProto { +message IbmEncoderProto { optional double track_length_ms = 1; optional int32 sector_size = 2 [default=512]; optional bool emit_iam = 3 [default=true]; diff --git a/arch/macintosh/macintosh.h b/arch/macintosh/macintosh.h index 379e1047..a4f18225 100644 --- a/arch/macintosh/macintosh.h +++ b/arch/macintosh/macintosh.h @@ -15,13 +15,13 @@ class Sector; class Fluxmap; -class MacintoshInputProto; -class MacintoshOutputProto; +class MacintoshDecoderProto; +class MacintoshEncoderProto; class MacintoshDecoder : public AbstractDecoder { public: - MacintoshDecoder(const MacintoshInputProto&) {} + MacintoshDecoder(const MacintoshDecoderProto&) {} virtual ~MacintoshDecoder() {} RecordType advanceToNextRecord(); @@ -34,7 +34,7 @@ public: class MacintoshEncoder : public AbstractEncoder { public: - MacintoshEncoder(const MacintoshOutputProto&) {} + MacintoshEncoder(const MacintoshEncoderProto&) {} virtual ~MacintoshEncoder() {} public: diff --git a/arch/macintosh/macintosh.proto b/arch/macintosh/macintosh.proto index 80a599a1..989bcfae 100644 --- a/arch/macintosh/macintosh.proto +++ b/arch/macintosh/macintosh.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -message MacintoshInputProto {} -message MacintoshOutputProto {} +message MacintoshDecoderProto {} +message MacintoshEncoderProto {} diff --git a/arch/micropolis/micropolis.h b/arch/micropolis/micropolis.h index 8397ef25..d03fa4c9 100644 --- a/arch/micropolis/micropolis.h +++ b/arch/micropolis/micropolis.h @@ -5,12 +5,12 @@ class Sector; class Fluxmap; -class MicropolisInputProto; +class MicropolisDecoderProto; class MicropolisDecoder : public AbstractDecoder { public: - MicropolisDecoder(const MicropolisInputProto&) {} + MicropolisDecoder(const MicropolisDecoderProto&) {} virtual ~MicropolisDecoder() {} RecordType advanceToNextRecord(); diff --git a/arch/micropolis/micropolis.proto b/arch/micropolis/micropolis.proto index 1e3f1862..dad6f694 100644 --- a/arch/micropolis/micropolis.proto +++ b/arch/micropolis/micropolis.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message MicropolisInputProto {} +message MicropolisDecoderProto {} diff --git a/arch/mx/mx.h b/arch/mx/mx.h index 9347eaee..6034ff0d 100644 --- a/arch/mx/mx.h +++ b/arch/mx/mx.h @@ -3,12 +3,12 @@ #include "decoders/decoders.h" -class MxInputProto; +class MxDecoderProto; class MxDecoder : public AbstractDecoder { public: - MxDecoder(const MxInputProto&) {} + MxDecoder(const MxDecoderProto&) {} virtual ~MxDecoder() {} void beginTrack(); diff --git a/arch/mx/mx.proto b/arch/mx/mx.proto index 02a6187a..72c86c24 100644 --- a/arch/mx/mx.proto +++ b/arch/mx/mx.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message MxInputProto {} +message MxDecoderProto {} diff --git a/arch/tids990/tids990.h b/arch/tids990/tids990.h index a2e5cbfb..60dff524 100644 --- a/arch/tids990/tids990.h +++ b/arch/tids990/tids990.h @@ -9,13 +9,13 @@ class Sector; class SectorSet; class Fluxmap; class Track; -class Tids990InputProto; -class Tids990OutputProto; +class Tids990DecoderProto; +class Tids990EncoderProto; class Tids990Decoder : public AbstractDecoder { public: - Tids990Decoder(const Tids990InputProto&) {} + Tids990Decoder(const Tids990DecoderProto&) {} virtual ~Tids990Decoder() {} RecordType advanceToNextRecord(); @@ -26,7 +26,7 @@ public: class Tids990Encoder : public AbstractEncoder { public: - Tids990Encoder(const Tids990OutputProto& config): + Tids990Encoder(const Tids990EncoderProto& config): _config(config) {} virtual ~Tids990Encoder() {} @@ -41,7 +41,7 @@ public: std::unique_ptr encode(int physicalTrack, int physicalSide, const SectorSet& allSectors); private: - const Tids990OutputProto& _config; + const Tids990EncoderProto& _config; std::vector _bits; unsigned _cursor; bool _lastBit; diff --git a/arch/tids990/tids990.proto b/arch/tids990/tids990.proto index dc930484..dcbffdbb 100644 --- a/arch/tids990/tids990.proto +++ b/arch/tids990/tids990.proto @@ -2,8 +2,8 @@ syntax = "proto2"; import "lib/common.proto"; -message Tids990InputProto {} -message Tids990OutputProto { +message Tids990DecoderProto {} +message Tids990EncoderProto { optional double track_length_ms = 1 [ default = 166, (help) = "length of a track" ]; optional int32 sector_count = 2 [ default = 26, diff --git a/arch/victor9k/victor9k.h b/arch/victor9k/victor9k.h index 21c58ab3..47889e9a 100644 --- a/arch/victor9k/victor9k.h +++ b/arch/victor9k/victor9k.h @@ -8,12 +8,12 @@ class Sector; class Fluxmap; -class Victor9kInputProto; +class Victor9kDecoderProto; class Victor9kDecoder : public AbstractDecoder { public: - Victor9kDecoder(const Victor9kInputProto&) {} + Victor9kDecoder(const Victor9kDecoderProto&) {} virtual ~Victor9kDecoder() {} RecordType advanceToNextRecord(); diff --git a/arch/zilogmcz/zilogmcz.h b/arch/zilogmcz/zilogmcz.h index c0ab3e43..a0cd6b03 100644 --- a/arch/zilogmcz/zilogmcz.h +++ b/arch/zilogmcz/zilogmcz.h @@ -3,12 +3,12 @@ class Sector; class Fluxmap; -class ZilogMczInputProto; +class ZilogMczDecoderProto; class ZilogMczDecoder : public AbstractDecoder { public: - ZilogMczDecoder(const ZilogMczInputProto&) {} + ZilogMczDecoder(const ZilogMczDecoderProto&) {} virtual ~ZilogMczDecoder() {} RecordType advanceToNextRecord(); diff --git a/arch/zilogmcz/zilogmcz.proto b/arch/zilogmcz/zilogmcz.proto index e6eb703c..0458a792 100644 --- a/arch/zilogmcz/zilogmcz.proto +++ b/arch/zilogmcz/zilogmcz.proto @@ -1,4 +1,4 @@ syntax = "proto2"; -message ZilogMczInputProto {} +message ZilogMczDecoderProto {} diff --git a/lib/decoders/decoders.proto b/lib/decoders/decoders.proto index ad548b35..296308dd 100644 --- a/lib/decoders/decoders.proto +++ b/lib/decoders/decoders.proto @@ -27,20 +27,20 @@ message DecoderProto { (help) = "refuse to detect clocks shorter than this, to avoid false positives"]; oneof format { - IBMInputProto ibm = 5; - BrotherInputProto brother = 6; - AesLanierInputProto aeslanier = 7; - AmigaInputProto amiga = 8; - Commodore64InputProto c64 = 9; - F85InputProto f85 = 10; - Fb100InputProto fb100 = 11; - MacintoshInputProto macintosh = 12; - Apple2InputProto apple2 = 13; - MicropolisInputProto micropolis = 14; - MxInputProto mx = 15; - Tids990InputProto tids990 = 16; - Victor9kInputProto victor9k = 17; - ZilogMczInputProto zilogmcz = 18; + IbmDecoderProto ibm = 5; + BrotherDecoderProto brother = 6; + AesLanierDecoderProto aeslanier = 7; + AmigaDecoderProto amiga = 8; + Commodore64DecoderProto c64 = 9; + F85DecoderProto f85 = 10; + Fb100DecoderProto fb100 = 11; + MacintoshDecoderProto macintosh = 12; + Apple2DecoderProto apple2 = 13; + MicropolisDecoderProto micropolis = 14; + MxDecoderProto mx = 15; + Tids990DecoderProto tids990 = 16; + Victor9kDecoderProto victor9k = 17; + ZilogMczDecoderProto zilogmcz = 18; } } diff --git a/lib/encoders/encoders.proto b/lib/encoders/encoders.proto index cd29e732..33c16d11 100644 --- a/lib/encoders/encoders.proto +++ b/lib/encoders/encoders.proto @@ -9,10 +9,10 @@ import "arch/tids990/tids990.proto"; message EncoderProto { oneof format { - IBMOutputProto ibm = 3; - BrotherOutputProto brother = 4; - AmigaOutputProto amiga = 5; - MacintoshOutputProto macintosh = 6; - Tids990OutputProto tids990 = 7; + IbmEncoderProto ibm = 3; + BrotherEncoderProto brother = 4; + AmigaEncoderProto amiga = 5; + MacintoshEncoderProto macintosh = 6; + Tids990EncoderProto tids990 = 7; } }