From 7d5fedf35fc1461799b4f7d123a807d8bb310c29 Mon Sep 17 00:00:00 2001 From: David Given Date: Thu, 28 Oct 2021 19:40:16 +0200 Subject: [PATCH 1/2] Switch the Atari ST formats to use 1-based sector IDs. --- src/formats/atarist360.textpb | 6 +++--- src/formats/atarist370.textpb | 6 +++--- src/formats/atarist400.textpb | 6 +++--- src/formats/atarist410.textpb | 6 +++--- src/formats/atarist720.textpb | 6 +++--- src/formats/atarist740.textpb | 6 +++--- src/formats/atarist800.textpb | 6 +++--- src/formats/atarist820.textpb | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/formats/atarist360.textpb b/src/formats/atarist360.textpb index d48a40b9..ded716df 100644 --- 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 } } } diff --git a/src/formats/atarist370.textpb b/src/formats/atarist370.textpb index 04a07cc0..5e9a2f9b 100644 --- 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 } } } diff --git a/src/formats/atarist400.textpb b/src/formats/atarist400.textpb index 3258ae62..cd234485 100644 --- 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 } } } diff --git a/src/formats/atarist410.textpb b/src/formats/atarist410.textpb index e20731a8..485eca8e 100644 --- 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 } } } diff --git a/src/formats/atarist720.textpb b/src/formats/atarist720.textpb index c3219f92..571acc03 100644 --- 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 } } } diff --git a/src/formats/atarist740.textpb b/src/formats/atarist740.textpb index 2e72b8bb..c51e3bac 100644 --- 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 } } } diff --git a/src/formats/atarist800.textpb b/src/formats/atarist800.textpb index 7cbf0e80..c89e3d27 100644 --- 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 } } } diff --git a/src/formats/atarist820.textpb b/src/formats/atarist820.textpb index f36e4832..f9775e28 100644 --- 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 } } } From 9874d4bec5bc02b343333fe98f0807f31e48707b Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 30 Oct 2021 13:22:00 +0200 Subject: [PATCH 2/2] Update compiler flags to make newer compilers happy. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 38528f67..f0001076 100644 --- a/Makefile +++ b/Makefile @@ -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