Another massive overhaul to rip out the last remaining bits of Layout.

Author: davidgiven

arch/apple2/decoder.cc

@@ -107,7 +107,8 @@ class Apple2Decoder : public Decoder
                 Sector::DATA_MISSING; /* unintuitive but correct */
 
         if (_sector->logicalHead == 1)
-            _sector->logicalCylinder -= _config.apple2().side_one_track_offset();
+            _sector->logicalCylinder -=
+                _config.apple2().side_one_track_offset();
 
         /* Sanity check. */
 

arch/ibm/decoder.cc

@@ -207,16 +207,14 @@ class IbmDecoder : public Decoder
         _sector->status =
             (wantCrc == gotCrc) ? Sector::OK : Sector::BAD_CHECKSUM;
 
-        auto layout = Layout::getLayoutOfTrack(
-            _sector->logicalCylinder, _sector->logicalHead);
-        if (_currentSectorSize != layout->sectorSize)
+        if (_currentSectorSize != _ltl->sectorSize)
             std::cerr << fmt::format(
                 "Warning: configured sector size for t{}.h{}.s{} is {} bytes "
                 "but that seen on disk is {} bytes\n",
                 _sector->logicalCylinder,
                 _sector->logicalHead,
                 _sector->logicalSector,
-                layout->sectorSize,
+                _ltl->sectorSize,
                 _currentSectorSize);
     }
 

lib/algorithms/readerwriter.cc

@@ -359,7 +359,7 @@ static ReadGroupResult readGroup(const DiskLayout& diskLayout,
     ReadGroupResult rgr = {BAD_AND_CAN_NOT_RETRY};
 
     for (unsigned offset = 0; offset < ltl->groupSize;
-        offset += Layout::getHeadWidth())
+        offset += diskLayout.headWidth)
     {
         unsigned physicalCylinder = ltl->physicalCylinder + offset;
         unsigned physicalHead = ltl->physicalHead;
@@ -578,7 +578,6 @@ void writeDiskCommand(const DiskLayout& diskLayout,
 {
     auto chs = std::ranges::views::keys(diskLayout.layoutByLogicalLocation) |
                std::ranges::to<std::vector>();
-    auto trackinfos = Layout::getLayoutOfTracksPhysical(physicalLocations);
     if (fluxSource && decoder)
         writeTracksAndVerify(
             diskLayout, fluxSink, encoder, *fluxSource, *decoder, image, chs);

lib/data/image.cc

@@ -22,21 +22,6 @@ void Image::clear()
     _geometry = {0, 0, 0};
 }
 
-void Image::createBlankImage()
-{
-    clear();
-    for (const auto& trackAndHead : Layout::getTrackOrdering(
-             globalConfig()->layout().filesystem_track_order()))
-    {
-        unsigned track = trackAndHead.first;
-        unsigned side = trackAndHead.second;
-        auto trackLayout = Layout::getLayoutOfTrack(track, side);
-        Bytes blank(trackLayout->sectorSize);
-        for (unsigned sectorId : trackLayout->naturalSectorOrder)
-            put(track, side, sectorId)->data = blank;
-    }
-}
-
 bool Image::empty() const
 {
     return _sectors.empty();
@@ -67,15 +52,20 @@ void Image::erase(const LogicalLocation& location)
     _sectors.erase(location);
 }
 
-void Image::addMissingSectors(const DiskLayout& diskLayout)
+void Image::addMissingSectors(const DiskLayout& diskLayout, bool populated)
 {
     for (auto& location : diskLayout.logicalSectorLocationsInFilesystemOrder)
         if (!_sectors.contains(location))
         {
             auto& ltl = diskLayout.layoutByLogicalLocation.at(
                 {location.logicalCylinder, location.logicalHead});
             auto sector = std::make_shared<Sector>(location);
-            sector->status = Sector::MISSING;
+
+            if (populated)
+                sector->data = Bytes(ltl->sectorSize);
+            else
+                sector->status = Sector::MISSING;
+
             _sectors[location] = sector;
         }
     calculateSize();

lib/data/image.h

@@ -105,7 +105,7 @@ class Image
         erase({cylinder, head, sector});
     }
 
-    void addMissingSectors(const DiskLayout& layout);
+    void addMissingSectors(const DiskLayout& layout, bool populated = false);
 
     const_iterator begin() const
     {