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

Copy the sector mapping stuff into Layout.

Browse Source
This commit is contained in:
David Given
2022-08-28 00:15:46 +02:00
parent 3256b4f627
commit db1a84b490
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/layout.cc
View File

@@ -5,7 +5,7 @@
std::vector<std::pair<int, int>> Layout::getTrackOrdering(
unsigned guessedTracks, unsigned guessedSides)
{
auto layout = config.layout();
auto layout = config.layout();
int tracks = layout.has_tracks() ? layout.tracks() : guessedTracks;
int sides = layout.has_sides() ? layout.sides() : guessedSides;
@@ -69,8 +69,8 @@ std::vector<unsigned> Layout::getSectorsInTrack(
if (physical.has_count())
{
if (physical.sector_size() != 1)
Error() << "if you use a sector count, you must specify exactly "
"one start sector";
Error() << "LAYOUT: if you use a sector count, you must specify "
"exactly one start sector";
int startSector = physical.sector(0);
for (int i = 0; i < physical.count(); i++)
@@ -79,8 +79,8 @@ std::vector<unsigned> Layout::getSectorsInTrack(
else if (physical.guess_count())
{
if (physical.sector_size() != 1)
Error() << "if you are guessing the number of sectors, you must "
"specify exactly one start sector";
Error() << "LAYOUT: if you are guessing the number of sectors, you "
"must specify exactly one start sector";
int startSector = physical.sector(0);
for (int i = 0; i < guessedSectors; i++)
@@ -95,3 +95,45 @@ std::vector<unsigned> Layout::getSectorsInTrack(
return sectors;
}
std::vector<unsigned> Layout::getLogicalSectorsInTrack(
const LayoutProto::LayoutdataProto& trackdata)
{
auto& logical = trackdata.logical();
if (logical.sector_size() == 0)
return getSectorsInTrack(trackdata);
std::vector<unsigned> sectors;
if (logical.has_count())
{
if (logical.sector_size() != 1)
Error() << "LAYOUT: if you use a sector count, you must specify "
"exactly one start sector";
int startSector = logical.sector(0);
for (int i = 0; i < logical.count(); i++)
sectors.push_back(startSector + i);
}
else
{
for (int sectorId : logical.sector())
sectors.push_back(sectorId);
}
return sectors;
}
std::map<unsigned, unsigned> Layout::getLogicalToPhysicalMap(
const LayoutProto::LayoutdataProto& trackdata)
{
auto physical = getSectorsInTrack(trackdata);
auto logical = getSectorsInTrack(trackdata);
if (physical.size() != logical.size())
Error() << "LAYOUT: physical sector list and logical sector list have "
"different sizes";
std::map<unsigned, unsigned> map;
for (int i = 0; i < physical.size(); i++)
map[logical[i]] = physical[i];
return map;
}

6
lib/layout.h
View File

@@ -15,6 +15,12 @@ public:
static std::vector<unsigned> getSectorsInTrack(
const LayoutProto::LayoutdataProto& trackdata,
unsigned guessedSectors = 0);
static std::vector<unsigned> getLogicalSectorsInTrack(
const LayoutProto::LayoutdataProto& trackdata);
static std::map<unsigned, unsigned> getLogicalToPhysicalMap(
const LayoutProto::LayoutdataProto& trackdata);
};
#endif