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

Remove SectorSet, which is now obsolete.

Browse Source
This commit is contained in:
David Given
2021-07-15 23:51:02 +02:00
parent 239cecff9e
commit 2eff798d74
32 changed files with 0 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/amiga/encoder.cc
View File

@@ -4,7 +4,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "amiga.h" #include "amiga.h"
#include "crc.h" #include "crc.h"
#include "sectorset.h"
#include "writer.h" #include "writer.h"
#include "image.h" #include "image.h"
#include "arch/amiga/amiga.pb.h" #include "arch/amiga/amiga.pb.h"

1
arch/brother/encoder.cc
View File

@@ -4,7 +4,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "brother.h" #include "brother.h"
#include "crc.h" #include "crc.h"
#include "sectorset.h"
#include "writer.h" #include "writer.h"
#include "image.h" #include "image.h"
#include "arch/brother/brother.pb.h" #include "arch/brother/brother.pb.h"

1
arch/c64/encoder.cc
View File

@@ -4,7 +4,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "c64.h" #include "c64.h"
#include "crc.h" #include "crc.h"
#include "sectorset.h"
#include "sector.h" #include "sector.h"
#include "writer.h" #include "writer.h"
#include "image.h" #include "image.h"

1
arch/ibm/encoder.cc
View File

@@ -4,7 +4,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "ibm.h" #include "ibm.h"
#include "crc.h" #include "crc.h"
#include "sectorset.h"
#include "writer.h" #include "writer.h"
#include "image.h" #include "image.h"
#include "arch/ibm/ibm.pb.h" #include "arch/ibm/ibm.pb.h"

1
arch/macintosh/encoder.cc
View File

@@ -4,7 +4,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "macintosh.h" #include "macintosh.h"
#include "crc.h" #include "crc.h"
#include "sectorset.h"
#include "writer.h" #include "writer.h"
#include "image.h" #include "image.h"
#include "fmt/format.h" #include "fmt/format.h"

1
arch/northstar/encoder.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "northstar.h" #include "northstar.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "bytes.h" #include "bytes.h"
#include "decoders/decoders.h" #include "decoders/decoders.h"
#include "encoders/encoders.h" #include "encoders/encoders.h"

1
arch/tids990/encoder.cc
View File

@@ -4,7 +4,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "tids990.h" #include "tids990.h"
#include "crc.h" #include "crc.h"
#include "sectorset.h"
#include "writer.h" #include "writer.h"
#include "image.h" #include "image.h"
#include "arch/tids990/tids990.pb.h" #include "arch/tids990/tids990.pb.h"

1
lib/imagereader/d64imagereader.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "fmt/format.h" #include "fmt/format.h"
#include "image.h" #include "image.h"

1
lib/imagereader/diskcopyimagereader.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "image.h" #include "image.h"
#include "lib/config.pb.h" #include "lib/config.pb.h"

1
lib/imagereader/imagereader.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "utils.h" #include "utils.h"
#include "fmt/format.h" #include "fmt/format.h"

1
lib/imagereader/imagereader.h
View File

@@ -1,7 +1,6 @@
#ifndef IMAGEREADER_H #ifndef IMAGEREADER_H
#define IMAGEREADER_H #define IMAGEREADER_H
class SectorSet;
class ImageSpec; class ImageSpec;
class ImageReaderProto; class ImageReaderProto;
class Image; class Image;

1
lib/imagereader/imdimagereader.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "image.h" #include "image.h"
#include "lib/config.pb.h" #include "lib/config.pb.h"

1
lib/imagereader/imgimagereader.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "image.h" #include "image.h"
#include "lib/config.pb.h" #include "lib/config.pb.h"

1
lib/imagereader/jv3imagereader.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "image.h" #include "image.h"
#include "fmt/format.h" #include "fmt/format.h"

1
lib/imagereader/nsiimagereader.cc
View File

@@ -3,7 +3,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagereader/imagereader.h" #include "imagereader/imagereader.h"
#include "image.h" #include "image.h"
#include "fmt/format.h" #include "fmt/format.h"

1
lib/imagewriter/d64imagewriter.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagewriter/imagewriter.h" #include "imagewriter/imagewriter.h"
#include "fmt/format.h" #include "fmt/format.h"
#include "image.h" #include "image.h"

1
lib/imagewriter/diskcopyimagewriter.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagewriter/imagewriter.h" #include "imagewriter/imagewriter.h"
#include "fmt/format.h" #include "fmt/format.h"
#include "ldbs.h" #include "ldbs.h"

1
lib/imagewriter/imagewriter.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagewriter/imagewriter.h" #include "imagewriter/imagewriter.h"
#include "image.h" #include "image.h"
#include "utils.h" #include "utils.h"

1
lib/imagewriter/imagewriter.h
View File

@@ -1,7 +1,6 @@
#ifndef IMAGEWRITER_H #ifndef IMAGEWRITER_H
#define IMAGEWRITER_H #define IMAGEWRITER_H
class SectorSet;
class ImageWriterProto; class ImageWriterProto;
class Image; class Image;

1
lib/imagewriter/imgimagewriter.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagewriter/imagewriter.h" #include "imagewriter/imagewriter.h"
#include "image.h" #include "image.h"
#include "lib/config.pb.h" #include "lib/config.pb.h"

1
lib/imagewriter/ldbsimagewriter.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagewriter/imagewriter.h" #include "imagewriter/imagewriter.h"
#include "fmt/format.h" #include "fmt/format.h"
#include "ldbs.h" #include "ldbs.h"

1
lib/imagewriter/nsiimagewriter.cc
View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include "flags.h" #include "flags.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "imagewriter/imagewriter.h" #include "imagewriter/imagewriter.h"
#include "fmt/format.h" #include "fmt/format.h"
#include "decoders/decoders.h" #include "decoders/decoders.h"

1
lib/reader.cc
View File

@@ -8,7 +8,6 @@
#include "sql.h" #include "sql.h"
#include "decoders/decoders.h" #include "decoders/decoders.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "record.h" #include "record.h"
#include "bytes.h" #include "bytes.h"
#include "decoders/rawbits.h" #include "decoders/rawbits.h"

51
lib/sectorset.cc
View File

@@ -1,51 +0,0 @@
#include "globals.h"
#include "sector.h"
#include "sectorset.h"
std::unique_ptr<Sector>& SectorSet::get(int track, int head, int sector)
{
key_t key(track, head, sector);
return _data[key];
}
Sector* SectorSet::get(int track, int head, int sector) const
{
key_t key(track, head, sector);
auto i = _data.find(key);
if (i == _data.end())
return NULL;
return i->second.get();
}
Sector* SectorSet::add(int track, int head, int sector)
{
key_t key(track, head, sector);
auto i = _data.find(key);
if (i != _data.end())
return i->second.get();
Sector* s = new Sector;
_data[key].reset(s);
return s;
}
void SectorSet::calculateSize(
unsigned& numTracks, unsigned& numHeads,
unsigned& numSectors, unsigned& sectorSize) const
{
numTracks = numHeads = numSectors = sectorSize = 0;
for (auto& i : _data)
{
auto& sector = i.second;
if (sector)
{
numTracks = std::max(numTracks, (unsigned)sector->logicalTrack+1);
numHeads = std::max(numHeads, (unsigned)sector->logicalSide+1);
numSectors = std::max(numSectors, (unsigned)sector->logicalSector+1);
sectorSize = std::max(sectorSize, (unsigned)sector->data.size());
}
}
}

34
lib/sectorset.h
View File

@@ -1,34 +0,0 @@
#ifndef SECTORSET_H
#define SECTORSET_H
class Sector;
class SectorSet
{
private:
typedef std::tuple<int, int, int> key_t;
public:
static key_t keyof(int track, int head, int sector)
{ return std::tuple<int, int, int>(track, head, sector); }
SectorSet() {};
std::unique_ptr<Sector>& get(int track, int head, int sector);
Sector* get(int track, int head, int sector) const;
Sector* add(int track, int head, int sector);
const std::map<const key_t, std::unique_ptr<Sector>>& get() const
{ return _data; }
void calculateSize(
unsigned& numTracks, unsigned& numHeads, unsigned& numSectors,
unsigned& sectorSize) const;
private:
std::map<const key_t, std::unique_ptr<Sector>> _data;
};
#endif

1
lib/writer.cc
View File

@@ -12,7 +12,6 @@
#include "fmt/format.h" #include "fmt/format.h"
#include "record.h" #include "record.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "image.h" #include "image.h"
#include "lib/config.pb.h" #include "lib/config.pb.h"
#include "proto.h" #include "proto.h"

1
mkninja.sh
View File

@@ -365,7 +365,6 @@ buildlibrary libbackend.a \
lib/proto.cc \ lib/proto.cc \
lib/reader.cc \ lib/reader.cc \
lib/sector.cc \ lib/sector.cc \
lib/sectorset.cc \
lib/sql.cc \ lib/sql.cc \
lib/usb/fluxengineusb.cc \ lib/usb/fluxengineusb.cc \
lib/usb/greaseweazle.cc \ lib/usb/greaseweazle.cc \

1
src/fe-analyselayout.cc
View File

@@ -4,7 +4,6 @@
#include "bitmap.h" #include "bitmap.h"
#include "fluxmap.h" #include "fluxmap.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "csvreader.h" #include "csvreader.h"
#include "image.h" #include "image.h"
#include "decoders/fluxmapreader.h" #include "decoders/fluxmapreader.h"

1
src/fe-rawread.cc
View File

@@ -5,7 +5,6 @@
#include "decoders/decoders.h" #include "decoders/decoders.h"
#include "macintosh/macintosh.h" #include "macintosh/macintosh.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "record.h" #include "record.h"
#include "proto.h" #include "proto.h"
#include "fluxsink/fluxsink.h" #include "fluxsink/fluxsink.h"

1
src/fe-read.cc
View File

@@ -5,7 +5,6 @@
#include "decoders/decoders.h" #include "decoders/decoders.h"
#include "macintosh/macintosh.h" #include "macintosh/macintosh.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "record.h" #include "record.h"
#include "proto.h" #include "proto.h"
#include "fluxsource/fluxsource.h" #include "fluxsource/fluxsource.h"

1
src/fe-readnorthstar.cc
View File

@@ -5,7 +5,6 @@
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "decoders/decoders.h" #include "decoders/decoders.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "record.h" #include "record.h"
#include "northstar/northstar.h" #include "northstar/northstar.h"
#include "fmt/format.h" #include "fmt/format.h"

1
src/fe-write.cc
View File

@@ -5,7 +5,6 @@
#include "decoders/decoders.h" #include "decoders/decoders.h"
#include "encoders/encoders.h" #include "encoders/encoders.h"
#include "sector.h" #include "sector.h"
#include "sectorset.h"
#include "record.h" #include "record.h"
#include "proto.h" #include "proto.h"
#include "fluxsink/fluxsink.h" #include "fluxsink/fluxsink.h"