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

Actually start using the new physical sector stuff.

Browse Source
This commit is contained in:
David Given
2022-09-10 20:43:24 +02:00
parent e40e6bd07f
commit 085ad5f2a4
25 changed files with 80 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/imagereader/d64imagereader.cc
View File

@@ -69,20 +69,14 @@ public:
offset += 256;
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = physicalTrack;
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = sectorId;
sector->data.writer().append(payload);
}
else
{ // no more data in input file. Write sectors with status:
// DATA_MISSING
sector->status = Sector::DATA_MISSING;
sector->logicalTrack = track;
sector->physicalTrack = physicalTrack;
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = sectorId;
}
}
}

4
lib/imagereader/d88imagereader.cc
View File

@@ -197,10 +197,6 @@ public:
inputFile.read((char*)data.begin(), data.size());
const auto& sector = image->put(track, head, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = sectorId;
sector->data = data;
physical->add_sector(sectorId);

4
lib/imagereader/dimimagereader.cc
View File

@@ -86,10 +86,6 @@ public:
const auto& sector = image->put(track, side, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = side;
sector->physicalSector = sectorId;
sector->data = data;
}
}

4
lib/imagereader/diskcopyimagereader.cc
View File

@@ -110,10 +110,6 @@ public:
const auto& sector = image->put(track, head, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = sectorId;
sector->data.writer().append(payload).append(tag);
}
}

4
lib/imagereader/fdiimagereader.cc
View File

@@ -66,10 +66,6 @@ public:
const auto& sector =
image->put(track, side, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = side;
sector->physicalSector = sectorId;
sector->data = data;
}
}

1
lib/imagereader/imdimagereader.cc
View File

@@ -264,7 +264,6 @@ public:
int SectorID;
SectorID = sector_skew[s];
const auto& sector = image->put(header.track, header.Head, SectorID);
sector->physicalSector = SectorID;
//read the status of the sector
unsigned int Status_Sector = br.read_8();
headerPtr++;

7
lib/imagereader/imgimagereader.cc
View File

@@ -40,7 +40,7 @@ public:
if (inputFile.eof())
break;
auto trackLayout = Layout::getLayoutOfTrack(track, side);
auto& trackLayout = Layout::getLayoutOfTrack(track, side);
for (int sectorId : trackLayout.logicalSectors)
{
Bytes data(trackLayout.sectorSize);
@@ -48,11 +48,6 @@ public:
const auto& sector = image->put(track, side, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack =
Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = side;
sector->physicalSector = sectorId;
sector->data = data;
}
}

4
lib/imagereader/jv3imagereader.cc
View File

@@ -124,10 +124,6 @@ public:
const auto& sector =
image->put(header.track, head, header.sector);
sector->status = Sector::OK;
sector->logicalTrack = header.track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(header.track);
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = header.sector;
sector->data = data;
}

4
lib/imagereader/nfdimagereader.cc
View File

@@ -147,10 +147,6 @@ public:
inputFile.read((char*)data.begin(), data.size());
const auto& sector = image->put(track, head, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = sectorId;
sector->data = data;
physical->add_sector(sectorId);

4
lib/imagereader/nsiimagereader.cc
View File

@@ -100,10 +100,6 @@ public:
const auto& sector = image->put(track, head, sectorId);
sector->status = Sector::OK;
sector->logicalTrack = track;
sector->physicalTrack = Mapper::remapTrackLogicalToPhysical(track);
sector->logicalSide = sector->physicalHead = head;
sector->physicalSector = sectorId;
sector->data = data;
}
}