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

Make the AppleDOS and ProDOS settings options.

Browse Source
This commit is contained in:
David Given
2022-09-14 00:16:42 +02:00
parent 0665fc0a6f
commit b1a6fa4084
6 changed files with 91 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
doc/disk-apple2.md
View File

@@ -40,15 +40,17 @@ Just do:
fluxengine read apple2
```
You should end up with an `apple2.img` which is 143360 bytes long.
It will be in physical sector ordering. You can specify a sector ordering,
`appledos` or `prodos` to get an image intended for use in an emulator,
due to the logical sector mapping issue described above:
You should end up with an `apple2.img` which is 143360 bytes long. It will be in
physical sector ordering. You can specify a sector ordering, `--appledos` or
`--prodos` to get an image intended for use in an emulator, due to the logical
sector mapping issue described above:
```
fluxengine read apple2 prodos
fluxengine read apple2 --prodos
```
You will also need this for filesystem access.
Writing discs
-------------
@@ -58,10 +60,10 @@ fluxengine write apple2 -i apple2.img
```
If your image is in logical sector ordering (images intended for emulators
usually are), specify a modifier of `appledos` or `prodos`:
usually are), specify a modifier of `--appledos` or `--prodos`:
```
fluxengine write apple2 prodos -i apple2.img
fluxengine write apple2 --prodos -i apple2.img
```

2
lib/flags.cc
View File

@@ -65,7 +65,7 @@ static bool setFallbackFlag(
"allowed",
path);
Logger() << fmt::format("Option {}: {}", path, configs.message());
Logger() << fmt::format("OPTION: {}", configs.message());
config.MergeFrom(configs.config());
return false;
}

81
src/formats/apple2.textpb
View File

@@ -32,3 +32,84 @@ encoder {
tpi: 48
option {
name: "appledos"
comment: "specifies AppleDOS soft sector skew for filesystem access and images"
message: "compensating for AppleDOS soft sector skew"
config {
image_reader {
filesystem_sector_order: true
}
image_writer {
filesystem_sector_order: true
}
layout {
layoutdata {
filesystem {
sector: 0
sector: 14
sector: 13
sector: 12
sector: 11
sector: 10
sector: 9
sector: 8
sector: 7
sector: 6
sector: 5
sector: 4
sector: 3
sector: 2
sector: 1
sector: 15
}
}
}
}
}
option {
name: "prodos"
comment: "specifies ProDOS soft sector skew for filesystem access and images"
message: "compensating for ProDOS soft sector skew"
config {
image_reader {
filesystem_sector_order: true
}
image_writer {
filesystem_sector_order: true
}
filesystem {
prodos {}
}
layout {
layoutdata {
filesystem {
sector: 0
sector: 2
sector: 4
sector: 6
sector: 8
sector: 10
sector: 12
sector: 14
sector: 1
sector: 3
sector: 5
sector: 7
sector: 9
sector: 11
sector: 13
sector: 15
}
}
}
}
}

25
src/formats/appledos.textpb
View File

@@ -1,25 +0,0 @@
comment: 'Applies standard AppleDOS soft sector skew to the Apple II format'
is_extension: true
layout {
layoutdata {
filesystem {
sector: 0
sector: 14
sector: 13
sector: 12
sector: 11
sector: 10
sector: 9
sector: 8
sector: 7
sector: 6
sector: 5
sector: 4
sector: 3
sector: 2
sector: 1
sector: 15
}
}
}

2
src/formats/build.mk
View File

@@ -20,7 +20,6 @@ FORMATS = \
ampro800 \
apple2_drive \
apple2 \
appledos \
atarist360 \
atarist370 \
atarist400 \
@@ -62,7 +61,6 @@ FORMATS = \
northstar175 \
northstar350 \
northstar87 \
prodos \
rx50 \
shugart_drive \
tids990 \

31
src/formats/prodos.textpb
View File

@@ -1,31 +0,0 @@
comment: 'Applies standard ProDOS soft sector skew to the Apple II format'
is_extension: true
filesystem {
prodos {}
}
layout {
layoutdata {
filesystem {
sector: 0
sector: 2
sector: 4
sector: 6
sector: 8
sector: 10
sector: 12
sector: 14
sector: 1
sector: 3
sector: 5
sector: 7
sector: 9
sector: 11
sector: 13
sector: 15
}
}
}