Revision 17:a47f74caa04e, committed 2015-07-08

Comitter:

neilt6

Date:

Wed Jul 08 16:45:12 2015 +0000

Parent:

16:c2c1f0b16380

Child:

18:2286a4e7fa31

Commit message:

Internal data type changes

Changed in this revision

--- a/SDFileSystem.cpp	Mon Jan 05 18:43:29 2015 +0000
+++ b/SDFileSystem.cpp	Wed Jul 08 16:45:12 2015 +0000
@@ -376,11 +376,11 @@
                 //Calculate the sector count based on the card type
                 if ((csd[0] >> 6) == 0x01) {
                     //Calculate the sector count for a high capacity card
-                    uint64_t size = (((csd[7] & 0x3F) << 16) | (csd[8] << 8) | csd[9]) + 1;
+                    unsigned int size = (((csd[7] & 0x3F) << 16) | (csd[8] << 8) | csd[9]) + 1;
                     return size << 10;
                 } else {
                     //Calculate the sector count for a standard capacity card
-                    uint64_t size = (((csd[6] & 0x03) << 10) | (csd[7] << 2) | ((csd[8] & 0xC0) >> 6)) + 1;
+                    unsigned int size = (((csd[6] & 0x03) << 10) | (csd[7] << 2) | ((csd[8] & 0xC0) >> 6)) + 1;
                     size <<= ((((csd[9] & 0x03) << 1) | ((csd[10] & 0x80) >> 7)) + 2);
                     size <<= (csd[5] & 0x0F);
                     return size >> 9;
@@ -639,7 +639,7 @@
     return (m_Spi.write(0xFF) & 0x1F);
 }
 
-inline bool SDFileSystem::readBlock(char* buffer, unsigned long long lba)
+inline bool SDFileSystem::readBlock(char* buffer, unsigned int lba)
 {
     //Try to read the block up to 3 times
     for (int f = 0; f < 3; f++) {
@@ -667,7 +667,7 @@
     return false;
 }
 
-inline bool SDFileSystem::readBlocks(char* buffer, unsigned long long lba, int count)
+inline bool SDFileSystem::readBlocks(char* buffer, unsigned int lba, unsigned int count)
 {
     //Try to read each block up to 3 times
     for (int f = 0; f < 3;) {
@@ -712,7 +712,7 @@
     return false;
 }
 
-inline bool SDFileSystem::writeBlock(const char* buffer, unsigned long long lba)
+inline bool SDFileSystem::writeBlock(const char* buffer, unsigned int lba)
 {
     //Try to write the block up to 3 times
     for (int f = 0; f < 3; f++) {
@@ -757,11 +757,11 @@
     return false;
 }
 
-inline bool SDFileSystem::writeBlocks(const char* buffer, unsigned long long lba, int count)
+inline bool SDFileSystem::writeBlocks(const char* buffer, unsigned int lba, unsigned int count)
 {
     char token;
     const char* currentBuffer = buffer;
-    unsigned long long currentLba = lba;
+    unsigned int currentLba = lba;
     int currentCount = count;
 
     //Try to write each block up to 3 times

--- a/SDFileSystem.h	Mon Jan 05 18:43:29 2015 +0000
+++ b/SDFileSystem.h	Wed Jul 08 16:45:12 2015 +0000
@@ -205,10 +205,10 @@
     char writeCommand(char cmd, unsigned int arg, unsigned int* resp = NULL);
     bool readData(char* buffer, int length);
     char writeData(const char* buffer, char token);
-    bool readBlock(char* buffer, unsigned long long lba);
-    bool readBlocks(char* buffer, unsigned long long lba, int count);
-    bool writeBlock(const char* buffer, unsigned long long lba);
-    bool writeBlocks(const char* buffer, unsigned long long lba, int count);
+    bool readBlock(char* buffer, unsigned int lba);
+    bool readBlocks(char* buffer, unsigned int lba, unsigned int count);
+    bool writeBlock(const char* buffer, unsigned int lba);
+    bool writeBlocks(const char* buffer, unsigned int lba, unsigned int count);
 };
 
 #endif