salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename all protos to end with 'Proto' to avoid name conflicts.

Browse Source
This commit is contained in:
David Given
2021-05-13 18:05:08 +02:00
parent 639588fa68
commit 5a186b6960
37 changed files with 162 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/imagereader/diskcopyimagereader.cc
View File

@@ -13,7 +13,7 @@
class DiskCopyImageReader : public ImageReader
{
public:
DiskCopyImageReader(const Config_InputFile& config):
DiskCopyImageReader(const InputFileProto& config):
ImageReader(config)
{}
@@ -121,7 +121,7 @@ public:
};
std::unique_ptr<ImageReader> ImageReader::createDiskCopyImageReader(
const Config_InputFile& config)
const InputFileProto& config)
{
return std::unique_ptr<ImageReader>(new DiskCopyImageReader(config));
}

4
lib/imagereader/imagereader.cc
View File

@@ -10,7 +10,7 @@
#include <algorithm>
#include <ctype.h>
std::unique_ptr<ImageReader> ImageReader::create(const Config_InputFile& config)
std::unique_ptr<ImageReader> ImageReader::create(const InputFileProto& config)
{
if (config.has_img())
return ImageReader::createImgImageReader(config);
@@ -19,7 +19,7 @@ std::unique_ptr<ImageReader> ImageReader::create(const Config_InputFile& config)
return std::unique_ptr<ImageReader>();
}
ImageReader::ImageReader(const Config_InputFile& config):
ImageReader::ImageReader(const InputFileProto& config):
_config(config)
{}

16
lib/imagereader/imagereader.h
View File

@@ -3,28 +3,28 @@
class SectorSet;
class ImageSpec;
class Config_InputFile;
class InputFileProto;
class ImageReader
{
public:
ImageReader(const Config_InputFile& config);
ImageReader(const InputFileProto& config);
virtual ~ImageReader() {};
public:
static std::unique_ptr<ImageReader> create(const Config_InputFile& config);
static std::unique_ptr<ImageReader> create(const InputFileProto& config);
public:
static std::unique_ptr<ImageReader> createDiskCopyImageReader(const Config_InputFile& config);
static std::unique_ptr<ImageReader> createImgImageReader(const Config_InputFile& config);
static std::unique_ptr<ImageReader> createJv3ImageReader(const Config_InputFile& config);
static std::unique_ptr<ImageReader> createIMDImageReader(const Config_InputFile& config);
static std::unique_ptr<ImageReader> createDiskCopyImageReader(const InputFileProto& config);
static std::unique_ptr<ImageReader> createImgImageReader(const InputFileProto& config);
static std::unique_ptr<ImageReader> createJv3ImageReader(const InputFileProto& config);
static std::unique_ptr<ImageReader> createIMDImageReader(const InputFileProto& config);
public:
virtual SectorSet readImage() = 0;
protected:
const Config_InputFile& _config;
const InputFileProto& _config;
};
#endif

4
lib/imagereader/imdimagereader.cc
View File

@@ -85,7 +85,7 @@ static unsigned getSectorSize(uint8_t flags)
class IMDImageReader : public ImageReader
{
public:
IMDImageReader(const Config_InputFile& config):
IMDImageReader(const InputFileProto& config):
ImageReader(config)
{}
@@ -274,7 +274,7 @@ public:
};
std::unique_ptr<ImageReader> ImageReader::createIMDImageReader(
const Config_InputFile& config)
const InputFileProto& config)
{
return std::unique_ptr<ImageReader>(new IMDImageReader(config));
}

6
lib/imagereader/img.proto
View File

@@ -1,7 +1,7 @@
syntax = "proto2";
message ImgInputOutput {
message Format {
message ImgInputOutputProto {
message FormatProto {
optional int32 track = 1;
optional int32 side = 2;
@@ -9,7 +9,7 @@ message ImgInputOutput {
optional int32 sectors = 4;
}
repeated Format format = 4;
repeated FormatProto format = 4;
optional int32 tracks = 5 [default=80];
optional int32 sides = 6 [default=2];
}

10
lib/imagereader/imgimagereader.cc
View File

@@ -13,7 +13,7 @@
class ImgImageReader : public ImageReader
{
public:
ImgImageReader(const Config_InputFile& config):
ImgImageReader(const InputFileProto& config):
ImageReader(config)
{}
@@ -28,7 +28,7 @@ public:
{
for (int side = 0; side < _config.img().sides(); side++)
{
ImgInputOutput::Format format;
ImgInputOutputProto::FormatProto format;
getTrackFormat(format, track, side);
for (int sectorId = 0; sectorId < format.sectors(); sectorId++)
@@ -58,10 +58,10 @@ public:
}
private:
void getTrackFormat(ImgInputOutput::Format& format, unsigned track, unsigned side)
void getTrackFormat(ImgInputOutputProto::FormatProto& format, unsigned track, unsigned side)
{
format.Clear();
for (const ImgInputOutput::Format& f : _config.img().format())
for (const ImgInputOutputProto::FormatProto& f : _config.img().format())
{
if (f.has_track() && (f.track() != track))
continue;
@@ -74,7 +74,7 @@ private:
};
std::unique_ptr<ImageReader> ImageReader::createImgImageReader(
const Config_InputFile& config)
const InputFileProto& config)
{
return std::unique_ptr<ImageReader>(new ImgImageReader(config));
}

4
lib/imagereader/jv3imagereader.cc
View File

@@ -78,7 +78,7 @@ static unsigned getSectorSize(uint8_t flags)
class Jv3ImageReader : public ImageReader
{
public:
Jv3ImageReader(const Config_InputFile& config):
Jv3ImageReader(const InputFileProto& config):
ImageReader(config)
{}
@@ -133,7 +133,7 @@ public:
}
};
std::unique_ptr<ImageReader> ImageReader::createJv3ImageReader(const Config_InputFile& config)
std::unique_ptr<ImageReader> ImageReader::createJv3ImageReader(const InputFileProto& config)
{
return std::unique_ptr<ImageReader>(new Jv3ImageReader(config));
}