Merge pull request #338 from davidgiven/atari

Switch the Atari ST formats to use 1-based sector IDs.
2025-10-24 11:11:02 -07:00 · 2021-10-30 13:30:57 +02:00
parent bc2d58bee3 9874d4bec5
commit 661940114e
9 changed files with 27 additions and 25 deletions
--- a/4
+++ b/4
@@ -1,6 +1,8 @@
 PACKAGES = zlib sqlite3 libusb-1.0 protobuf

-export CFLAGS = -x c++ --std=c++2a -ffunction-sections -fdata-sections
+export CFLAGS = -x c++ --std=gnu++2a -ffunction-sections -fdata-sections \
+	-Wno-deprecated-enum-enum-conversion \
+	-Wno-deprecated-enum-float-conversion
 export LDFLAGS = -pthread

 export COPTFLAGS = -Os
--- a/src/formats/atarist360.textpb
+++ b/src/formats/atarist360.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -41,7 +41,6 @@ encoder {
 			gap3: 34
 			sector_size: 512
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -50,6 +49,7 @@ encoder {
 				sector: 6
 				sector: 7
 				sector: 8
+				sector: 9
 			}
 		}
 	}
--- a/src/formats/atarist370.textpb
+++ b/src/formats/atarist370.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -49,6 +48,7 @@ encoder {
 				sector: 6
 				sector: 7
 				sector: 8
+				sector: 9
 			}
 		}
 	}
--- a/src/formats/atarist400.textpb
+++ b/src/formats/atarist400.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -50,6 +49,7 @@ encoder {
 				sector: 7
 				sector: 8
 				sector: 9
+				sector: 10
 			}
 		}
 	}
--- a/src/formats/atarist410.textpb
+++ b/src/formats/atarist410.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -50,6 +49,7 @@ encoder {
 				sector: 7
 				sector: 8
 				sector: 9
+				sector: 10
 			}
 		}
 	}
--- a/src/formats/atarist720.textpb
+++ b/src/formats/atarist720.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -49,6 +48,7 @@ encoder {
 				sector: 6
 				sector: 7
 				sector: 8
+				sector: 9
 			}
 		}
 	}
--- a/src/formats/atarist740.textpb
+++ b/src/formats/atarist740.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 9
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -49,6 +48,7 @@ encoder {
 				sector: 6
 				sector: 7
 				sector: 8
+				sector: 9
 			}
 		}
 	}
--- a/src/formats/atarist800.textpb
+++ b/src/formats/atarist800.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -50,6 +49,7 @@ encoder {
 				sector: 7
 				sector: 8
 				sector: 9
+				sector: 10
 			}
 		}
 	}
--- a/src/formats/atarist820.textpb
+++ b/src/formats/atarist820.textpb
@@ -8,7 +8,7 @@ image_reader {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -23,7 +23,7 @@ image_writer {
 		trackdata {
 			sector_size: 512
 			sector_range {
-				start_sector: 0
+				start_sector: 1
 				sector_count: 10
 			}
 		}
@@ -40,7 +40,6 @@ encoder {
 			gap2: 22
 			gap3: 34
 			sectors {
-				sector: 0
 				sector: 1
 				sector: 2
 				sector: 3
@@ -50,6 +49,7 @@ encoder {
 				sector: 7
 				sector: 8
 				sector: 9
+				sector: 10
 			}
 		}
 	}