Apple-1-Tools
/
FruitMachine-Swift
mirror of https://github.com/Luigi30/FruitMachine-Swift.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed prodos sector loading

This commit is contained in:
Luigi Thirty 2017-08-10 19:42:10 -04:00
parent cfb764b85a
commit 7575e135b4
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
FruitMachine/AppleII/Peripherals/DiskII/DiskImage.swift
View File

@ -74,31 +74,33 @@ class ProdosImage: DiskImageFormat {
var sector1 = 0 var sector1 = 0
var sector2 = 0 var sector2 = 0
//static let SECTOR_ORDER = [0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15]
switch blockOffset8 { switch blockOffset8 {
case 0: case 0:
sector1 = 0 sector1 = 0
sector2 = 0x1 sector2 = 0xE
case 1: case 1:
sector1 = 0x2 sector1 = 0xD
sector2 = 0x3 sector2 = 0xC
case 2: case 2:
sector1 = 0x4 sector1 = 0xB
sector2 = 0x5 sector2 = 0xA
case 3: case 3:
sector1 = 0x6 sector1 = 0x9
sector2 = 0x7 sector2 = 0x8
case 4: case 4:
sector1 = 0x8 sector1 = 0x7
sector2 = 0x9 sector2 = 0x6
case 5: case 5:
sector1 = 0xA sector1 = 0x5
sector2 = 0xB sector2 = 0x4
case 6: case 6:
sector1 = 0xC sector1 = 0x3
sector2 = 0xD sector2 = 0x2
case 7: case 7:
sector1 = 0xE sector1 = 0x1
sector2 = 0xF sector2 = 0xF
default: default:
print("should never happen") print("should never happen")
@ -162,6 +164,13 @@ class DiskImage: NSObject {
} }
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 0)) blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 0))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 1))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 2))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 3))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 4))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 5))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 6))
blks.append(contentsOf: ProdosImage.readBlock(imageData: rawData!, blockNum: 7))
var ptr = UnsafeBufferPointer(start: blks, count: blks.count) var ptr = UnsafeBufferPointer(start: blks, count: blks.count)
var data = Data(buffer: ptr) var data = Data(buffer: ptr)