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

Refactor dataspecs to allow them to be used for other things too.

Browse Source
This commit is contained in:
David Given
2019-08-06 23:50:02 +02:00
parent 28e0ef0463
commit eb924780ab
12 changed files with 160 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/dataspec.h
View File

@@ -4,19 +4,6 @@
class DataSpec
{
public:
struct Location
{
unsigned drive;
unsigned track;
unsigned side;
bool operator == (const Location& other) const
{ return (drive == other.drive) && (track == other.track) && (side == other.side); }
bool operator != (const Location& other) const
{ return (drive != other.drive) || (track != other.track) || (side != other.side); }
};
struct Modifier
{
std::string name;
@@ -28,6 +15,13 @@ public:
bool operator != (const Modifier& other) const
{ return (name != other.name) || (data != other.data); }
unsigned only() const
{
if (data.size() != 1)
Error() << "modifier " << name << " can only have one value";
return *(data.begin());
}
};
public:
@@ -44,9 +38,43 @@ public:
std::string filename;
std::map<std::string, Modifier> modifiers;
};
class FluxSpec
{
public:
struct Location
{
unsigned drive;
unsigned track;
unsigned side;
bool operator == (const Location& other) const
{ return (drive == other.drive) && (track == other.track) && (side == other.side); }
bool operator != (const Location& other) const
{ return (drive != other.drive) || (track != other.track) || (side != other.side); }
};
public:
FluxSpec(const DataSpec& dataspec);
public:
std::string filename;
std::vector<Location> locations;
unsigned drive;
unsigned revolutions;
};
class ImageSpec
{
public:
ImageSpec(const DataSpec& dataspec);
public:
std::string filename;
unsigned tracks;
unsigned heads;
unsigned sectors;
};
static inline std::ostream& operator << (std::ostream& os, const DataSpec& dataSpec)