Rename cylinder to track throughout (mostly).

This commit is contained in:
David Given
2022-03-25 20:16:12 +01:00
parent ea8af83d61
commit 86c5cccb08
115 changed files with 344 additions and 344 deletions

View File

@@ -139,7 +139,7 @@ public:
bw += decodeFmMfm(bits).slice(0, IBM_IDAM_LEN);
IbmDecoderProto::TrackdataProto trackdata;
getTrackFormat(trackdata, _sector->physicalCylinder, _sector->physicalHead);
getTrackFormat(trackdata, _sector->physicalTrack, _sector->physicalHead);
_sector->logicalTrack = br.read_8();
_sector->logicalSide = br.read_8();
@@ -155,7 +155,7 @@ public:
if (trackdata.ignore_side_byte())
_sector->logicalSide = _sector->physicalHead;
if (trackdata.ignore_track_byte())
_sector->logicalTrack = _sector->physicalCylinder;
_sector->logicalTrack = _sector->physicalTrack;
for (int sector : trackdata.ignore_sector())
if (_sector->logicalSector == sector)
@@ -206,7 +206,7 @@ public:
std::set<unsigned> requiredSectors(const Location& location) const override
{
IbmDecoderProto::TrackdataProto trackdata;
getTrackFormat(trackdata, location.logicalCylinder, location.head);
getTrackFormat(trackdata, location.logicalTrack, location.head);
std::set<unsigned> s;
if (trackdata.has_sectors())
@@ -227,12 +227,12 @@ public:
}
private:
void getTrackFormat(IbmDecoderProto::TrackdataProto& trackdata, unsigned cylinder, unsigned head) const
void getTrackFormat(IbmDecoderProto::TrackdataProto& trackdata, unsigned track, unsigned head) const
{
trackdata.Clear();
for (const auto& f : _config.trackdata())
{
if (f.has_cylinder() && (f.cylinder() != cylinder))
if (f.has_track() && (f.track() != track))
continue;
if (f.has_head() && (f.head() != head))
continue;