Changeset 586 for trunk/softs/tsar_boot/src/sdcard.c

Timestamp:

Dec 4, 2013, 7:59:21 PM (10 years ago)

Author:

alain

Message:

Modify the name "boot" to "reset" to avoid confusion
between the pre-loader and the boot-loader...
Increase the size of the segment containing the stacks.

File:

• trunk/softs/tsar_boot/src/sdcard.c (modified) (8 diffs)

trunk/softs/tsar_boot/src/sdcard.c

@@ -8 +8 @@
 
 #include <sdcard.h>
-#include <boot_tty.h>
+#include <reset_tty.h>
 
 /**
@@ -184 +184 @@
         if ( sdcard_rsp != 0x01 )
         {
-                boot_puts("card CMD0 failed ");
+                reset_puts("card CMD0 failed ");
                 return sdcard_rsp;
         }
@@ -200 +200 @@
         sdcard_rsp = _sdcard_send_command(sdcard, 8, SDCARD_CMD, args, 0x63);
         if (!SDCARD_CHECK_R1_VALID(sdcard_rsp)) {
-                boot_puts("card CMD8 failed ");
+                reset_puts("card CMD8 failed ");
                 return sdcard_rsp;
         }
@@ -211 +211 @@
                 if ((ersp & 0xffff) != 0x0101) {
                         /* voltage mismatch */
-                        boot_puts("card CMD8 mismatch: ");
-                        boot_putx(ersp);
+                        reset_puts("card CMD8 mismatch: ");
+                        reset_putx(ersp);
                         return sdcard_rsp;
                 }
-                boot_puts("v2 or later ");
+                reset_puts("v2 or later ");
                 sdcard->sdhc = 1;
         } else if ((sdcard_rsp & SDCARD_R1_ILLEGAL_CMD) == 0) {
                 /* other error */
-                boot_puts("card CMD8 error ");
+                reset_puts("card CMD8 error ");
                 return sdcard_rsp;
         } else {
@@ -246 +246 @@
         _sdcard_disable(sdcard);
         if (sdcard_rsp) {
-                boot_puts("SD ACMD41 failed ");
+                reset_puts("SD ACMD41 failed ");
                 return sdcard_rsp;
         }
@@ -259 +259 @@
                     args, 0x00);
                 if (sdcard_rsp) {
-                        boot_puts("SD CMD58 failed ");
+                        reset_puts("SD CMD58 failed ");
                         return sdcard_rsp;
                 }
@@ -267 +267 @@
                 ersp = (ersp << 8) | _sdcard_receive_char(sdcard);
                 if (ersp & 0x40000000) {
-                        boot_puts("SDHC ");
+                        reset_puts("SDHC ");
                 } else {
                         sdcard->sdhc = 0;
@@ -273 +273 @@
                 _sdcard_disable(sdcard);
         }
-        boot_puts("card detected ");
+        reset_puts("card detected ");
         return 0;
 }