WebSVN - NaviCtrl - Diff - Rev 380 and 384

 #include "ssc.h"
 #include "timer1.h"
 #include "main.h"
 #include "crc16.h"
 //________________________________________________________________________________________________________________________________________
 // Module name:                 sdc.c
 // Compiler used:               avr-gcc 3.4.5
 // Last Modifikation:   08.06.2008
 #define DATA_RESPONSE_OK                0x05
 #define DATA_RESPONSE_CRC_ERR   0x0B
 #define DATA_RESPONSE_WRITE_ERR 0x1D
+volatile SDCardInfo_t SDCardInfo;
-volatile SDCardInfo_t SDCardInfo;
+u8 SDCardWriteRetryCounterMax;
+{
         u8 rsp = 0;
         u32 timestamp = 0;
         SSC_ClearRxFifo();
-        SSC_Enable();                           // enable chipselect.
+        SSC_Enable();                           // enable chipselect.  SSC_Disable
         timestamp = SetDelay(timeout);
         do
+        {
                 rsp = SSC_GetChar();
         crc16 = (crc16<<8)|SSC_GetChar(); // lowbyte last
 /*      if(crc16 != CRC16(Buffer, len)) result = SD_ERROR_CRC_DATA;
         else */
         result = SD_SUCCESS;
         end:
+        SSC_Disable();   // disable CS
         if(result != SD_SUCCESS)
+        {
                 sprintf(text,"Error %02X reading data from sd card (R1=%02X).\r\n", result, rsp);
                 UART1_PutString(text);
+        }
 SD_Result_t SDC_Init(void)
+{
         u32 timeout = 0;
         u8 rsp[6]; // SD-SPI response buffer
         SD_Result_t result = SD_ERROR_UNKNOWN;
+        //SDCardWriteRetryCounterMax = 0;
         if(SD_SWITCH) // init only if the SD-Switch is indicating a card in the slot
+        {
                 UART1_PutString("\r\n SSC init...");
                 SDC_PrintCID((u8 *)&SDCardInfo.CID);
                 SDCardInfo.Valid = 1;
                 // jump point for error condition before
                 end:
+                //SSC_Disable();
                 SSC_Disable();
+        }
         else
+        {
                 SSC_Deinit();
 // Returnvalue: SD_Result_t
 //________________________________________________________________________________________________________________________________________
 SD_Result_t SDC_PutSector(u32 addr, const u8 *Buffer)
+{
-{
+    u8 retryCounter = 0;
-        u8 rsp;
+    u8 rsp;
         u16 a, crc16;
         u16 timeout = 0;
-        SD_Result_t result = SD_ERROR_UNKNOWN;
+        SD_Result_t result;
+        addr = addr << 9; // convert sectoradress to byteadress
+  while(retryCounter < 10)
+  {
     result = SD_ERROR_UNKNOWN;
         addr = addr << 9; // convert sectoradress to byteadress
         rsp = SDC_SendCMDR1(CMD_WRITE_SINGLE_BLOCK, addr);
         if (rsp != R1_NO_ERR)
+        {
                 result =  SD_ERROR_WRITE_DATA;
                 SSC_GetChar();
                 goto end;
+        }
         end:
+        //SSC_Disable();   // disable CS
         if(result != SD_SUCCESS)
+        {
                 sprintf(text,"Error %02X writing data to sd card (R=%02X).\r\n", result, rsp);
                 UART1_PutString(text);
+                retryCounter++;
+        }
+        else break;      // Success -> end retry loop
+  }
+        if (retryCounter > SDCardWriteRetryCounterMax)
+        { SDCardWriteRetryCounterMax = retryCounter;
+          DebugOut.Analog[18] = SDCardWriteRetryCounterMax;
+        }
         return(result);
+}

Subversion Repositories NaviCtrl

(root)/tags/V0.28h/sdc.c @ 816 - Rev 380 → 384