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

The top-level tracks and heads fields are now inferred automatically from the

Browse Source 
layout if not set, so we don't have to set them everywhere.
This commit is contained in:
David Given
2022-09-10 22:29:27 +02:00
parent 4ae664fd93
commit 415aa82a6f
62 changed files with 39 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/imagereader/d88imagereader.cc
View File

@@ -219,20 +219,6 @@ public:
layout->set_tracks(geometry.numTracks);
layout->set_sides(geometry.numSides);
if (!config.has_heads())
{
auto* heads = config.mutable_heads();
heads->set_start(0);
heads->set_end(geometry.numSides - 1);
}
if (!config.has_tracks())
{
auto* tracks = config.mutable_tracks();
tracks->set_start(0);
tracks->set_end(geometry.numTracks - 1);
}
return image;
}
};

15
lib/imagereader/dimimagereader.cc
View File

@@ -108,7 +108,6 @@ public:
case 0x00:
Logger() << "DIM: automatically setting format to 1.2MB "
"(1024 byte sectors)";
config.mutable_tracks()->set_end(76);
trackdata->set_target_rotational_period_ms(167);
layoutdata->set_sector_size(1024);
for (int i = 0; i < 9; i++)
@@ -150,20 +149,6 @@ public:
layout->set_tracks(geometry.numTracks);
layout->set_sides(geometry.numSides);
if (!config.has_heads())
{
auto* heads = config.mutable_heads();
heads->set_start(0);
heads->set_end(geometry.numSides - 1);
}
if (!config.has_tracks())
{
auto* tracks = config.mutable_tracks();
tracks->set_start(0);
tracks->set_end(geometry.numTracks - 1);
}
return image;
}
};

15
lib/imagereader/fdiimagereader.cc
View File

@@ -88,7 +88,6 @@ public:
case 0x90:
Logger() << "FDI: automatically setting format to 1.2MB "
"(1024 byte sectors)";
config.mutable_tracks()->set_end(76);
trackdata->set_target_rotational_period_ms(167);
layoutdata->set_sector_size(1024);
for (int i = 0; i < 9; i++)
@@ -122,20 +121,6 @@ public:
layout->set_tracks(geometry.numTracks);
layout->set_sides(geometry.numSides);
if (!config.has_heads())
{
auto* heads = config.mutable_heads();
heads->set_start(0);
heads->set_end(geometry.numSides - 1);
}
if (!config.has_tracks())
{
auto* tracks = config.mutable_tracks();
tracks->set_start(0);
tracks->set_end(geometry.numTracks - 1);
}
return image;
}
};

14
lib/imagereader/imdimagereader.cc
View File

@@ -416,20 +416,6 @@ public:
layout->set_tracks(geometry.numTracks);
layout->set_sides(geometry.numSides);
if (!config.has_heads())
{
auto* heads = config.mutable_heads();
heads->set_start(0);
heads->set_end(geometry.numSides - 1);
}
if (!config.has_tracks())
{
auto* tracks = config.mutable_tracks();
tracks->set_start(0);
tracks->set_end(geometry.numTracks - 1);
}
return image;
}

3
lib/imagereader/nfdimagereader.cc
View File

@@ -57,7 +57,6 @@ public:
auto ibm = config.mutable_encoder()->mutable_ibm();
auto layout = config.mutable_layout();
config.mutable_tracks()->set_end(0);
Logger() << "NFD: HD 1.2MB mode";
if (!config.drive().has_drive())
config.mutable_drive()->set_high_density(true);
@@ -150,8 +149,6 @@ public:
sector->data = data;
physical->add_sector(sectorId);
if (config.tracks().end() < track)
config.mutable_tracks()->set_end(track);
}
}