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

now it at least loads the boot loader, but it can't read Track 2?

This commit is contained in:
Luigi Thirty 2017-08-04 17:06:03 -04:00
parent e29b94ccbe
commit f603cdaf58
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FruitMachine/AppleII/AppleII.swift
View File

@ -150,7 +150,8 @@ final class AppleII: NSObject, EmulatedSystem {
CVPixelBufferUnlockBaseAddress(emulatorViewDelegate.pixels!, CVPixelBufferLockFlags(rawValue: 0))
emulatorView.display()
//emulatorView.display()
emulatorView.setNeedsDisplay(emulatorView.frame)
}
func putLoresPixels(buffer: UnsafeMutablePointer<BitmapPixelsLE555.PixelData>, start: UInt16, end: UInt16) {

33
FruitMachine/AppleII/Peripherals/DiskII/DiskII.swift
View File

@ -51,6 +51,9 @@ class DiskII: NSObject, Peripheral {
static let N_Drive1TrackChanged = NSNotification.Name(rawValue: "Drive1TrackChanged")
static let N_Drive2TrackChanged = NSNotification.Name(rawValue: "Drive2TrackChanged")
var motor1OffTimer: Timer?
var motor2OffTimer: Timer?
/* Softswitches */
struct Softswitches {
var Phase0 = false
@ -160,20 +163,40 @@ class DiskII: NSObject, Peripheral {
softswitches.MotorPowered = false
if(softswitches.DriveSelect == false) {
NotificationCenter.default.post(name: DiskII.N_Drive1MotorOff, object: nil)
/*
motor1OffTimer = Timer.scheduledTimer(timeInterval: 1.0,
target: self,
selector: #selector(disableDrive2Motor),
userInfo: nil,
repeats: false)
*/
print("Drive 1 Motor will turn off in 1 second")
} else {
NotificationCenter.default.post(name: DiskII.N_Drive2MotorOff, object: nil)
/*
motor2OffTimer = Timer.scheduledTimer(timeInterval: 1.0,
target: self,
selector: #selector(disableDrive2Motor),
userInfo: nil,
repeats: false)
*/
print("Drive 2 Motor will turn off in 1 second")
}
case 9:
softswitches.MotorPowered = true
if(softswitches.DriveSelect == false) {
NotificationCenter.default.post(name: DiskII.N_Drive1MotorOn, object: nil)
print("Drive 1 Motor is on")
} else {
NotificationCenter.default.post(name: DiskII.N_Drive2MotorOn, object: nil)
print("Drive 2 Motor is on")
}
case 10:
softswitches.DriveSelect = false
print("Drive 1 selected")
case 11:
softswitches.DriveSelect = true
print("Drive 2 selected")
case 12:
softswitches.Q6 = false
if(softswitches.Q7 == false) {
@ -233,4 +256,14 @@ class DiskII: NSObject, Peripheral {
return romManager.ROM[Int(address)]
}
@objc func disableDrive1Motor() {
softswitches.MotorPowered = false
print("Drive 1 motor is disabled")
}
@objc func disableDrive2Motor() {
softswitches.MotorPowered = false
print("Drive 2 motor is disabled")
}
}

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

@ -22,6 +22,7 @@ class Dos33Image: DiskImageFormat {
static let BYTES_PER_TRACK: Int = BYTES_PER_SECTOR * SECTORS_PER_TRACK
//Sectors in a track are in this order.
// 0 7 14 6 13 5 12 4 11 3 10 2 9 1 8 15
static let sectorOrder = [0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15]
struct VTOC {
@ -50,7 +51,7 @@ class Dos33Image: DiskImageFormat {
//Find the track in our disk.
let trackOffset = trackNum * Dos33Image.BYTES_PER_TRACK
//Find the sector in this track.
let sectorOffset = sectorNum * Dos33Image.BYTES_PER_SECTOR
let sectorOffset = sectorOrder[sectorNum] * Dos33Image.BYTES_PER_SECTOR
let offset = trackOffset + sectorOffset
return Array<UInt8>(imageData[offset ..< offset + Dos33Image.BYTES_PER_SECTOR])
@ -91,7 +92,7 @@ class DiskImage: NSObject {
encodedTracks.append(encodeDos33Track(imageData: rawData!, index: track, volumeNumber: Int(catalogSector[0x06])))
}
let pointer = UnsafeBufferPointer(start:encodedTracks[0], count:encodedTracks[0].count)
let pointer = UnsafeBufferPointer(start:encodedTracks[2], count:encodedTracks[2].count)
let data = Data(buffer:pointer)
try! data.write(to: URL(fileURLWithPath: "/Users/luigi/apple2/master.dmp"))
}
@ -177,7 +178,6 @@ class DiskImage: NSObject {
var nibblized: [UInt8] = [UInt8](repeating: 0x00, count: 342)
for byte in 0x00...0x55 {
//nibblized[byte] = SixAndTwoTranslationTable[Int(sector[byte] >> 2)]
nibblized[byte] = sector[byte] >> 2
let b0 = (sector[byte] & 0b00000001)
let b1 = (sector[byte] & 0b00000010)
@ -187,7 +187,6 @@ class DiskImage: NSObject {
}
for byte in 0x56...0xAA {
//nibblized[byte] = SixAndTwoTranslationTable[Int(sector[byte] >> 2)]
nibblized[byte] = sector[byte] >> 2
let b0 = (sector[byte] & 0b00000001)
let b1 = (sector[byte] & 0b00000010)
@ -197,7 +196,6 @@ class DiskImage: NSObject {
}
for byte in 0xAB...0xFF {
//nibblized[byte] = SixAndTwoTranslationTable[Int(sector[byte] >> 2)]
nibblized[byte] = sector[byte] >> 2
let b0 = (sector[byte] & 0b00000001)
let b1 = (sector[byte] & 0b00000010)
@ -205,7 +203,6 @@ class DiskImage: NSObject {
//Now we have a full six bits.
let completeLow: UInt8 = nibblized[0x155 - (byte % 0x56)] | (low << 4)
//nibblized[0x155 - (byte % 0x56)] = SixAndTwoTranslationTable[Int(completeLow)]
nibblized[0x155 - (byte % 0x56)] = completeLow
}