TIDS990 no longer uses collectSectors.

Author: davidgiven

arch/tids990/encoder.cc

@@ -60,23 +60,6 @@ class Tids990Encoder : public Encoder
     }
 
 public:
-    std::vector<std::shared_ptr<const Sector>> collectSectors(
-        const Location& location, const Image& image) override
-    {
-        std::vector<std::shared_ptr<const Sector>> sectors;
-
-        for (char sectorChar : _config.sector_skew())
-        {
-            int sectorId = charToInt(sectorChar);
-            const auto& sector =
-                image.get(location.logicalTrack, location.head, sectorId);
-            if (sector)
-                sectors.push_back(sector);
-        }
-
-        return sectors;
-    }
-
     std::unique_ptr<Fluxmap> encode(const Location& location,
         const std::vector<std::shared_ptr<const Sector>>& sectors,
         const Image& image) override

arch/tids990/tids990.proto

@@ -21,7 +21,5 @@ message Tids990EncoderProto {
 		(help) = "size of gap 2 (the post-ID gap)" ];
 	optional int32 gap3_bytes = 8 [ default = 51,
 		(help) = "size of gap 3 (the post-data or format gap)" ];
-	optional string sector_skew = 9 [ default = "1mhc72nid83oje94pkfa50lgb6",
-		(help) = "order to emit sectors" ];
 }
 

src/formats/tids990.textpb

@@ -16,8 +16,32 @@ layout {
 	layoutdata {
 		sector_size: 288
 		physical {
-			start_sector: 0
-			count: 26
+			sector: 1
+			sector: 22
+			sector: 17
+			sector: 12
+			sector: 7
+			sector: 2
+			sector: 23
+			sector: 18
+			sector: 13
+			sector: 8
+			sector: 3
+			sector: 24
+			sector: 19
+			sector: 14
+			sector: 9
+			sector: 4
+			sector: 25
+			sector: 20
+			sector: 15
+			sector: 10
+			sector: 5
+			sector: 0
+			sector: 21
+			sector: 16
+			sector: 11
+			sector: 6
 		}
 	}
 }