Rename all the remaining layout and location variables to trackInfo (where

appropriate).
This commit is contained in:
David Given
2022-09-16 00:20:54 +02:00
parent 81cbd00cc8
commit d0fb85e712
21 changed files with 43 additions and 43 deletions

View File

@@ -61,18 +61,18 @@ std::unique_ptr<Decoder> Decoder::create(const DecoderProto& config)
}
std::shared_ptr<TrackDataFlux> Decoder::decodeToSectors(
std::shared_ptr<const Fluxmap> fluxmap, std::shared_ptr<const TrackInfo>& layout)
std::shared_ptr<const Fluxmap> fluxmap, std::shared_ptr<const TrackInfo>& trackInfo)
{
_trackdata = std::make_shared<TrackDataFlux>();
_trackdata->fluxmap = fluxmap;
_trackdata->layout = layout;
_trackdata->trackInfo = trackInfo;
FluxmapReader fmr(*fluxmap);
_fmr = &fmr;
auto newSector = [&]
{
_sector = std::make_shared<Sector>(layout, 0);
_sector = std::make_shared<Sector>(trackInfo, 0);
_sector->status = Sector::MISSING;
};
@@ -222,10 +222,10 @@ uint64_t Decoder::readRaw64()
}
std::set<LogicalLocation> Decoder::requiredSectors(
std::shared_ptr<const TrackInfo>& layout) const
std::shared_ptr<const TrackInfo>& trackInfo) const
{
const auto trackLayout =
Layout::getLayoutOfTrackPhysical(layout->physicalTrack, layout->physicalSide);
Layout::getLayoutOfTrackPhysical(trackInfo->physicalTrack, trackInfo->physicalSide);
std::set<LogicalLocation> results;
for (unsigned sectorId : trackLayout->logicalSectorOrder)