From f656800697b94221d86cfb3568c49f53012d22a2 Mon Sep 17 00:00:00 2001
From: Florian Reitz <freitz85@gmail.com>
Date: Sun, 17 Dec 2017 20:21:30 +0100
Subject: [PATCH] Updated to V1.1

---
 src/AppleIISd.s | 52 +++++++++++++++++++++++++++++++++++++++----------
 src/Helper.s    |  8 +++++---
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/AppleIISd.s b/src/AppleIISd.s
index 78bd3d4..9fc3ce3 100644
--- a/src/AppleIISd.s
+++ b/src/AppleIISd.s
@@ -1,7 +1,8 @@
 ;*******************************
 ;
 ; Apple][Sd Firmware
-; Version 1.0
+; Version 1.1
+; Main source
 ;
 ; (c) Florian Reitz, 2017
 ;
@@ -138,6 +139,8 @@
 ;*******************************
 
             .else
+;@BOOT:     CMP   #0 
+;           BNE   @NEXTSLOT   ; init not successful 
 @BOOT:      LDA   #$01
             STA   DCMD        ; load command
             LDX   SLOT16
@@ -264,7 +267,17 @@ DRIVER:     CLD
             RTS
 
 
-; Signature bytes
+;******************************* 
+; 
+; Signature bytes 
+; 
+; 65535 blocks 
+; Removable media 
+; Non-interruptable 
+; 2 drives 
+; Read, write and status allowed 
+; 
+;******************************* 
 
             .segment "SLOTID"
             .dbyt  $FFFF      ; 65535 blocks
@@ -317,18 +330,22 @@ INIT:       LDA   #$03        ; set SPI mode 3
             LDA   #>CMD8
             STA   CMDHI
             JSR   SDCMD
-            JSR   GETR3
+            JSR   GETR3       ; R7 is also 1+4 bytes 
             CMP   #$01
             BNE   @SDV1       ; may be SD Ver. 1
 
-; check for $01aa match!
+            LDY   SLOT        ; check for $aa in R33 
+            LDA   R33,Y 
+            CMP   #$AA 
+            BNE   @ERROR1     ; error! 
+
 @SDV2:      LDA   #<CMD55
             STA   CMDLO
             LDA   #>CMD55
             STA   CMDHI
             JSR   SDCMD
             JSR   GETR1
-            LDA   #<ACMD4140
+            LDA   #<ACMD4140  ; enable SDHC support 
             STA   CMDLO
             LDA   #>ACMD4140
             STA   CMDHI
@@ -338,12 +355,25 @@ INIT:       LDA   #$03        ; set SPI mode 3
             BEQ   @SDV2       ; wait for ready
             CMP   #0
             BNE   @ERROR1     ;  error!
-; send CMD58
+
 ; SD Ver. 2 initialized!
-            LDA   SS,X
+            LDA   #<CMD58     ; check for SDHC 
+            STA   CMDLO 
+            LDA   #>CMD58 
+            STA   CMDHI 
+            JSR   SDCMD 
+            JSR   GETR3 
+            CMP   #0 
+            BNE   @ERROR1     ; error! 
+            LDY   SLOT 
+            LDA   R30,Y 
+            AND   #$40        ; check CCS 
+            BEQ   @BLOCKSZ 
+ 
+            LDA   SS,X        ; card is SDHC 
             ORA   #SDHC
             STA   SS,X
-            JMP   @BLOCKSZ
+            JMP   @END
 
 @ERROR1:    JMP   @IOERROR    ; needed for far jump
 
@@ -661,7 +691,7 @@ TEST:       LDA   SLOT16
             .endif
 
 
-TEXT:       .asciiz "  Apple][Sd v1.0 (c)2017 Florian Reitz"
+TEXT:       .asciiz "  Apple][Sd v1.1 (c)2017 Florian Reitz"
 
 CMD0:       .byt $40, $00, $00
             .byt $00, $00, $95
@@ -672,7 +702,9 @@ CMD8:       .byt $48, $00, $00
 CMD16:      .byt $50, $00, $00
             .byt $02, $00, $FF
 CMD55:      .byt $77, $00, $00
-            .byt $00, $00, $65
+            .byt $00, $00, $FF 
+CMD58:      .byt $7A, $00, $00 
+            .byt $00, $00, $FF
 ACMD4140:   .byt $69, $40, $00
             .byt $00, $00, $77
 ACMD410:    .byt $69, $00, $00
diff --git a/src/Helper.s b/src/Helper.s
index 1855d46..4f7061c 100644
--- a/src/Helper.s
+++ b/src/Helper.s
@@ -1,7 +1,8 @@
 ;*******************************
 ;
 ; Apple][Sd Firmware
-; Version 1.0
+; Version 1.1
+; Helper functions
 ;
 ; (c) Florian Reitz, 2017
 ;
@@ -64,7 +65,7 @@ GETR1:      LDA   #DUMMY
 
 ;*******************************
 ;
-; Get R3
+; Get R3 or R7
 ; R1 is in A
 ; R3 is in scratchpad ram
 ;
@@ -74,6 +75,7 @@ GETR3:      JSR   GETR1       ; get R1 first
             PHA               ; save R1
             PHY               ; save Y
             LDY   #04         ; load counter
+            JMP   @WAIT       ; first byte is already there 
 @LOOP:      LDA   #DUMMY      ; send dummy
             STA   DATA,X
 @WAIT:      BIT   CTRL,X
@@ -90,7 +92,7 @@ GETR3:      JSR   GETR1       ; get R1 first
             PLA
             STA   R31,Y
             PLA
-            STA   R30,Y
+            STA   R30,Y       ; R30 is MSB
             PLY               ; restore Y
             LDA   #DUMMY
             STA   DATA,X      ; send another dummy