fix status (13) cmd, add to info

tz1 · Jan 16, 2014 · a9f0f8b · a9f0f8b
1 parent 0b310c0
commit a9f0f8b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/fat32cli/main.c b/fat32cli/main.c
@@ -1,6 +1,6 @@
 #include "typefix.h"
 #ifdef __AVR__
-#define BAUD 57600
+#define BAUD 115200
 #ifndef F_CPU
 #define F_CPU 16000000          // default to OpenLog
 #endif
@@ -272,6 +272,7 @@ int main(int argc, char *argv[])
             }
             break;
         case 'I':
+	    printf("sta: %02x\n", cardstat() );
             sta = sdhcinit();
             printf("init %d\n", sta);
             if (sta)
@@ -297,7 +298,6 @@ int main(int argc, char *argv[])
             for (sta = 0; sta < 18; sta++)
                 printf("%c", dochar(filesectbuf[sta]));
             printf("\n");
-
             break;
         case 'K':
             i = setlock(2);

diff --git a/fat32lib/sdhc.c b/fat32lib/sdhc.c
@@ -190,16 +190,13 @@ u8 setlock(u8 nyt)
     return ret;
 }
 
-static u16 gcardstat;
-u16 cardstat()
+u8 cardstat()
 {
-    gcardstat = 0xdead;
     csact();
     sendsimplecmd(13);
-    recvspiblock(2);
-    gcardstat = (filesectbuf[0] << 8) | filesectbuf[1];
+    recvspiblock(1);
     csinact();
-    return gcardstat;
+    return filesectbuf[0];
 }
 
 #include <string.h>

diff --git a/fat32lib/sdhc.h b/fat32lib/sdhc.h
@@ -21,6 +21,6 @@ void erasecard(void);
 u8 cardnotbusy(void);
 
 
-u16 cardstat(void);
+u8 cardstat(void);
 
 u8 cardpassword(u8 op, u8 * pw, u8 pwlen);