Revision 29:b1ec19000e15, committed 2015-01-26

Comitter:

embeddedartists

Date:

Mon Jan 26 10:12:57 2015 +0100

Parent:

28:8ae20cb0b943

Child:

30:a97015441bb4

Commit message:

- Fixed compiler warnings

Changed in this revision

--- a/Bios/BiosLoader.cpp	Fri Jan 23 17:31:56 2015 +0100
+++ b/Bios/BiosLoader.cpp	Mon Jan 26 10:12:57 2015 +0100
@@ -225,7 +225,7 @@
       uint8_t* p = NULL;
       uint32_t size = 0;
       err = readBIOS(&p, &size);
-      if (err != BiosError_Ok) {
+      if (err != DMBoard::Ok) {
         break;
       }
       
@@ -257,7 +257,7 @@
       // 2) The header size (the code/data comes after it)
       uint32_t offset = ((uint32_t)p) + file_header->headerSize;
       uint32_t* functions = (uint32_t*)&_bios;
-      for (int i = 0; i < (sizeof(bios_header_t)/sizeof(uint32_t)); i++) {
+      for (uint32_t i = 0; i < (sizeof(bios_header_t)/sizeof(uint32_t)); i++) {
         functions[i] += offset;
       }
 

--- a/DM_HttpServer.lib	Fri Jan 23 17:31:56 2015 +0100
+++ b/DM_HttpServer.lib	Mon Jan 26 10:12:57 2015 +0100
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/embeddedartists/code/DM_HttpServer/#5779cee2e94a
+http://developer.mbed.org/users/embeddedartists/code/DM_HttpServer/#10b4d4075fbb

--- a/FileSystems/QSPIFileSystem.cpp	Fri Jan 23 17:31:56 2015 +0100
+++ b/FileSystems/QSPIFileSystem.cpp	Mon Jan 26 10:12:57 2015 +0100
@@ -29,7 +29,7 @@
 
 #define MEM_SIZE    (memInfo.memSize)
 #define ERASE_SIZE  (memInfo.eraseBlockSize)
-#define NUM_BLOCKS  (memInfo.numEraseBlocks)
+#define NUM_BLOCKS  ((int)(memInfo.numEraseBlocks))
 
 typedef uint32_t toc_entry_t;
 
@@ -348,7 +348,7 @@
 
   // Search for the first unused TOC, keeping track of the valid
   // ones as we go.
-  for (i = 0; (i < NUM_TOCS) && !invalid; i++)
+  for (i = 0; (i < (int)NUM_TOCS) && !invalid; i++)
   {
     p = (toc_entry_t*)(TOC_BLOCK_ADDR + i*TOC_SIZE);
     for (j = 0; j < NUM_BLOCKS; j++)
@@ -457,7 +457,7 @@
     opers.scratch = NULL;
     opers.protect = 0;
     opers.options = S_VERIFY_PROG | S_CALLER_ERASE;
-    for (int i = 0; i < (TOC_SIZE / PROG_SIZE); i++) 
+    for (uint32_t i = 0; i < (TOC_SIZE / PROG_SIZE); i++)
     {
       opers.dest = (char *)(TOC_BLOCK_ADDR + activeTOC*TOC_SIZE + i*PROG_SIZE);
       rc = spifi->spifi_program(obj, ((char*)TOC)+i*PROG_SIZE, &opers);
@@ -800,12 +800,12 @@
  *****************************************************************************/
 static fresult qspifs_format(unsigned int minReservedBytes)
 {
-  int i, rc;
-  int numReserved = 0;
+  int rc;
+  uint32_t i, numReserved = 0;
   
   if (minReservedBytes > 0) {
     numReserved = (minReservedBytes + ERASE_SIZE - 1) / ERASE_SIZE;
-    if (numReserved >= (NUM_BLOCKS - 2)) {
+    if (numReserved >= (uint32_t)(NUM_BLOCKS - 2)) {
       // Too many of the erase blocks are reserved - not even room for one file
       return FS_ERR_INVALID_PARAM;
     }
@@ -845,7 +845,7 @@
   for (; i < (NUM_BLOCKS - NUM_TOC_BLOCKS); i++) {
     TOC[i] = ~TOC_VALID_MASK;
   }
-  for (; i < NUM_BLOCKS; i++) {
+  for (; i < (uint32_t)NUM_BLOCKS; i++) {
     TOC[i] = ~(TOC_VALID_MASK | TOC_RESERVED_MASK);
   }
   

--- a/Memory/InternalEEPROM.cpp	Fri Jan 23 17:31:56 2015 +0100
+++ b/Memory/InternalEEPROM.cpp	Mon Jan 26 10:12:57 2015 +0100
@@ -81,7 +81,7 @@
   clearInterrupt(EEPROM_INT_ENDOFRW);
   setAddr(pageAddr, pageOffset);
   setCmd(EEPROM_CMD_8BITS_READ | EEPROM_CMD_RDPREFETCH);
-  for (int i = 0; i < size; i++) {
+  for (uint32_t i = 0; i < size; i++) {
     buf[i] = LPC_EEPROM->RDATA & 0xff;
     waitForInterrupt(EEPROM_INT_ENDOFRW);
   }
@@ -92,7 +92,7 @@
   clearInterrupt(EEPROM_INT_ENDOFRW);
   setCmd(EEPROM_CMD_8BITS_WRITE);
   setAddr(pageAddr, pageOffset);
-  for (int i = 0; i < size; i++) {
+  for (uint32_t i = 0; i < size; i++) {
     LPC_EEPROM->WDATA = buf[i];
     waitForInterrupt(EEPROM_INT_ENDOFRW);
   }

--- a/Registry.cpp	Fri Jan 23 17:31:56 2015 +0100
+++ b/Registry.cpp	Mon Jan 26 10:12:57 2015 +0100
@@ -163,7 +163,7 @@
       break;
     }
     
-    int read = eeprom.read(0,_data,eeprom.memorySize());
+    uint32_t read = eeprom.read(0,_data,eeprom.memorySize());
     if (read != eeprom.memorySize()) {
       err = EEPROMReadError;
       break;

--- a/crc.cpp	Fri Jan 23 17:31:56 2015 +0100
+++ b/crc.cpp	Mon Jan 26 10:12:57 2015 +0100
@@ -77,7 +77,7 @@
 uint32_t crc_Buffer(const uint32_t* data, uint32_t size)
 {
   CRC32_INIT();
-  for (int i = 0; i < size; i++) {
+  for (uint32_t i = 0; i < size; i++) {
     CRC32_WRITE32(data[i]);
   }
   return CRC32_SUM();