From 7602dae70a74e5af49a3d940ad0c925a7210253d Mon Sep 17 00:00:00 2001
From: Terence Boldt <terence@boldt.ca>
Date: Sat, 16 Jan 2021 17:12:17 -0500
Subject: [PATCH] Fix firmware missing x

---
 Apple2/Driver.lst               |   2 +-
 Apple2/Firmware.asm             |  12 +-----------
 Apple2/Firmware.bin             | Bin 2048 -> 2048 bytes
 Apple2/Firmware_27256_EPROM.bin | Bin 32768 -> 32768 bytes
 RaspberryPi/Driver.go           |  10 +++++++++-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Apple2/Driver.lst b/Apple2/Driver.lst
index 966d058..fa96aad 100644
--- a/Apple2/Driver.lst
+++ b/Apple2/Driver.lst
@@ -1,4 +1,4 @@
-ca65 V2.19 - Git 59c58ac
+ca65 V2.19 - Git 59c58acb
 Main file   : Driver.asm
 Current file: Driver.asm
 
diff --git a/Apple2/Firmware.asm b/Apple2/Firmware.asm
index cdd4ee7..53b2cc9 100644
--- a/Apple2/Firmware.asm
+++ b/Apple2/Firmware.asm
@@ -11,7 +11,6 @@ IOError = $27
 NoDevice = $28
 WriteProtect = $2B
 
-SlotDrive = $50
 InputByte = $c08e
 OutputByte = $c08d
 InputFlags = $c08b
@@ -52,15 +51,6 @@ Boot:
  sta     BufferHi
  jsr     Driver  ;get the block
 
-; lda     #$00    ;block 1
-; sta     BlockLo
-; sta     BlockHi
-; sta     BufferLo   ;buffer at $A00
-; lda     #$0A
-; sta     BufferHi
-; jsr     Driver   ;get the block
-
-; ldx     #sdrive ;set up for slot n
  jmp     $801    ;execute the block
 
 ;;
@@ -170,7 +160,7 @@ waitRead:
  lda InputFlags,x
  rol
  bcs waitRead
- lda InputByte
+ lda InputByte,x
  pha
  lda #$0f ;set all flags high
  sta OutputFlags,x
diff --git a/Apple2/Firmware.bin b/Apple2/Firmware.bin
index 23f5cbcad9912ed67b5c25f2ba9a86eea5cacb32..7d55171cbe87812dd5740e4f0ea7532313f4f039 100644
GIT binary patch
delta 52
qcmZn=Xb_linQ`yLEB_hyPQJnjCYit_GnixnldNEp4M<MBq5}ZD%^KnW

delta 52
qcmZn=Xb_linQ`sJEB_hSPQJnjCYit_GnixnldNEp4M<MBq5}Z1T^eEl

diff --git a/Apple2/Firmware_27256_EPROM.bin b/Apple2/Firmware_27256_EPROM.bin
index 0b109d7afd2a371e55b9463e7d5d29a3f7320651..01e9c55caddf9c2d2290f8a803d9498f275d29ed 100644
GIT binary patch
delta 933
zcmZo@U}|V!nsAwM@5C$rK}6VOEvA)F1~ZT``3f^oeDW0*m@FGukPX6}s0CIFlN;3u
S3ct}18cjoxoJ5_JpaTHH0K@43

delta 933
zcmZo@U}|V!nsAwM?ZhkpK}6VOEvA)F1~ZT``3f^oeDW0*m@FGukPX6}s0CIFlN;3u
S3ct}18cjoxoJ5_JpaTFwF1zUf

diff --git a/RaspberryPi/Driver.go b/RaspberryPi/Driver.go
index 0d906a5..c0e2acf 100644
--- a/RaspberryPi/Driver.go
+++ b/RaspberryPi/Driver.go
@@ -103,7 +103,12 @@ func handleReadBlockCommand(file *os.File) {
 
 	file.ReadAt(buffer, int64(block)*512)
 	//dumpBlock(buffer)
-	readBlock(buffer)
+	err := readBlock(buffer)
+	if err == nil {
+		fmt.Printf("Read block completed\n")
+	} else {
+		fmt.Printf("Failed to read block\n")
+	}
 }
 
 func handleWriteBlockCommand(file *os.File) {
@@ -119,6 +124,7 @@ func handleWriteBlockCommand(file *os.File) {
 	writeBlock(buffer)
 	file.WriteAt(buffer, int64(block)*512)
 	file.Sync()
+	fmt.Printf("Write block completed\n")
 }
 
 func handleExecCommand() {
@@ -142,6 +148,7 @@ func handleExecCommand() {
 }
 
 func handleGetTimeCommand() {
+	fmt.Printf("Sending date/time...\n")
 	/*  49041 ($BF91)     49040 ($BF90)
 
 	        7 6 5 4 3 2 1 0   7 6 5 4 3 2 1 0
@@ -173,6 +180,7 @@ func handleGetTimeCommand() {
 	writeByte(bf91)
 	writeByte(bf92)
 	writeByte(bf93)
+	fmt.Printf("Send time complete\n")
 }
 
 func readBlock(buffer []byte) error {