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

Realise that I was actually applying sector mappings _twice_, resulting in them

Browse Source 
all cancelling out...
This commit is contained in:
David Given
2022-09-10 23:29:00 +02:00
parent 6824f00867
commit 63a7340c21
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/layout.cc
View File

@@ -157,16 +157,28 @@ const Layout& Layout::getLayoutOfTrack(unsigned track, unsigned side)
layout->sectorSize = layoutdata.sector_size();
expandSectors(layoutdata.physical(), layout->physicalSectors);
if (layoutdata.has_logical())
expandSectors(layoutdata.logical(), layout->logicalSectors);
expandSectors(layoutdata.logical(), layout->logicalSectorsOnDisk);
else
layout->logicalSectors = layout->physicalSectors;
layout->logicalSectorsOnDisk = layout->physicalSectors;
if (layout->logicalSectors.size() != layout->physicalSectors.size())
if (layout->logicalSectorsOnDisk.size() !=
layout->physicalSectors.size())
Error() << fmt::format(
"LAYOUT: physical and logical sectors lists are different "
"sizes in {}.{}",
track,
side);
layout->logicalSectors = layout->logicalSectorsOnDisk;
std::sort(layout->logicalSectors.begin(), layout->logicalSectors.end());
layout->numSectors = layout->logicalSectors.size();
if ((layout->numSectors != layout->logicalSectorsOnDisk.size()) ||
(layout->numSectors != layout->physicalSectors.size()))
Error() << fmt::format(
"LAYOUT: duplicate sector ID in specification for {}.{}",
track,
side);
}
return *layout;
@@ -176,7 +188,7 @@ unsigned Layout::physicalSectorToLogical(unsigned physicalSectorId) const
{
for (int i = 0; i < physicalSectors.size(); i++)
if (physicalSectors[i] == physicalSectorId)
return logicalSectors[i];
return logicalSectorsOnDisk[i];
Error() << fmt::format(
"LAYOUT: physical sector {} not recognised", physicalSectorId);
throw nullptr;
@@ -184,8 +196,8 @@ unsigned Layout::physicalSectorToLogical(unsigned physicalSectorId) const
unsigned Layout::logicalSectorToPhysical(unsigned logicalSectorId) const
{
for (int i = 0; i < logicalSectors.size(); i++)
if (logicalSectors[i] == logicalSectorId)
for (int i = 0; i < logicalSectorsOnDisk.size(); i++)
if (logicalSectorsOnDisk[i] == logicalSectorId)
return physicalSectors[i];
Error() << fmt::format(
"LAYOUT: logical sector {} not recognised", logicalSectorId);