mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Replace the Error() object with an error() function which takes fmt
formatspecs, making for much cleaner code. Reformatted everything. This actually happened in multiple steps but then I corrupted my local repository and I had to recover from the working tree.
This commit is contained in:
@@ -7,54 +7,50 @@
|
||||
#include "fluxsink/fluxsink.h"
|
||||
#include "lib/fluxsink/fluxsink.pb.h"
|
||||
#include "lib/readerwriter.cc"
|
||||
#include "fmt/format.h"
|
||||
|
||||
class HardwareFluxSink : public FluxSink
|
||||
{
|
||||
public:
|
||||
HardwareFluxSink(const HardwareFluxSinkProto& conf):
|
||||
_config(conf)
|
||||
HardwareFluxSink(const HardwareFluxSinkProto& conf): _config(conf)
|
||||
{
|
||||
nanoseconds_t oneRevolution;
|
||||
measureDiskRotation(oneRevolution, _hardSectorThreshold);
|
||||
nanoseconds_t oneRevolution;
|
||||
measureDiskRotation(oneRevolution, _hardSectorThreshold);
|
||||
}
|
||||
|
||||
~HardwareFluxSink()
|
||||
{
|
||||
}
|
||||
~HardwareFluxSink() {}
|
||||
|
||||
public:
|
||||
void writeFlux(int track, int side, const Fluxmap& fluxmap) override
|
||||
{
|
||||
usbSetDrive(config.drive().drive(), config.drive().high_density(), config.drive().index_mode());
|
||||
#if 0
|
||||
usbSetDrive(config.drive().drive(),
|
||||
config.drive().high_density(),
|
||||
config.drive().index_mode());
|
||||
#if 0
|
||||
if (fluxSourceSinkFortyTrack)
|
||||
{
|
||||
if (track & 1)
|
||||
Error() << "cannot write to odd physical tracks in 40-track mode";
|
||||
error("cannot write to odd physical tracks in 40-track mode");
|
||||
usbSeek(track / 2);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
usbSeek(track);
|
||||
#endif
|
||||
usbSeek(track);
|
||||
|
||||
return usbWrite(side, fluxmap.rawBytes(), _hardSectorThreshold);
|
||||
}
|
||||
|
||||
operator std::string () const
|
||||
{
|
||||
return fmt::format("drive {}", config.drive().drive());
|
||||
}
|
||||
operator std::string() const
|
||||
{
|
||||
return fmt::format("drive {}", config.drive().drive());
|
||||
}
|
||||
|
||||
private:
|
||||
const HardwareFluxSinkProto& _config;
|
||||
nanoseconds_t _hardSectorThreshold;
|
||||
};
|
||||
|
||||
std::unique_ptr<FluxSink> FluxSink::createHardwareFluxSink(const HardwareFluxSinkProto& config)
|
||||
std::unique_ptr<FluxSink> FluxSink::createHardwareFluxSink(
|
||||
const HardwareFluxSinkProto& config)
|
||||
{
|
||||
return std::unique_ptr<FluxSink>(new HardwareFluxSink(config));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user