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

Merge pull request #338 from davidgiven/atari

Browse Source 
Switch the Atari ST formats to use 1-based sector IDs.
This commit is contained in:
David Given
2021-10-30 13:30:57 +02:00
committed by GitHub
parent bc2d58bee3 9874d4bec5
commit 661940114e
9 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -1,6 +1,8 @@
PACKAGES = zlib sqlite3 libusb-1.0 protobuf 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 LDFLAGS = -pthread
export COPTFLAGS = -Os export COPTFLAGS = -Os

6
src/formats/atarist360.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -41,7 +41,6 @@ encoder {
gap3: 34 gap3: 34
sector_size: 512 sector_size: 512
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -50,6 +49,7 @@ encoder {
sector: 6 sector: 6
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9
} }
} }
} }

6
src/formats/atarist370.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -49,6 +48,7 @@ encoder {
sector: 6 sector: 6
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9
} }
} }
} }

6
src/formats/atarist400.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -50,6 +49,7 @@ encoder {
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9 sector: 9
sector: 10
} }
} }
} }

6
src/formats/atarist410.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -50,6 +49,7 @@ encoder {
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9 sector: 9
sector: 10
} }
} }
} }

6
src/formats/atarist720.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -49,6 +48,7 @@ encoder {
sector: 6 sector: 6
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9
} }
} }
} }

6
src/formats/atarist740.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 9 sector_count: 9
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -49,6 +48,7 @@ encoder {
sector: 6 sector: 6
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9
} }
} }
} }

6
src/formats/atarist800.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -50,6 +49,7 @@ encoder {
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9 sector: 9
sector: 10
} }
} }
} }

6
src/formats/atarist820.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -23,7 +23,7 @@ image_writer {
trackdata { trackdata {
sector_size: 512 sector_size: 512
sector_range { sector_range {
start_sector: 0 start_sector: 1
sector_count: 10 sector_count: 10
} }
} }
@@ -40,7 +40,6 @@ encoder {
gap2: 22 gap2: 22
gap3: 34 gap3: 34
sectors { sectors {
sector: 0
sector: 1 sector: 1
sector: 2 sector: 2
sector: 3 sector: 3
@@ -50,6 +49,7 @@ encoder {
sector: 7 sector: 7
sector: 8 sector: 8
sector: 9 sector: 9
sector: 10
} }
} }
} }