Revision 250:af83c1fe7b48, committed 2016-06-21

Comitter:

Andrea Palmieri

Date:

Tue Jun 21 17:00:00 2016 +0200

Parent:

248:920ecc2451b5

Parent:

249:2e94d2835c45

Child:

252:0c2cb16a7166

Commit message:

Merge branch 'master' into mbed_classic

Changed in this revision

--- a/source/bluenrg-hci/hci/controller/bluenrg_gap_aci.c	Tue Jun 21 10:33:21 2016 +0200
+++ b/source/bluenrg-hci/hci/controller/bluenrg_gap_aci.c	Tue Jun 21 17:00:00 2016 +0200
@@ -1164,7 +1164,7 @@
   if(rp.status)
     return rp.status;
   
-  Osal_MemCpy(actual_address, rp.address, sizeof(actual_address));  
+  Osal_MemCpy(actual_address, rp.address, 6);  
 
   return 0;
 }

--- a/source/bluenrg-hci/hci/controller/bluenrg_utils.c	Tue Jun 21 10:33:21 2016 +0200
+++ b/source/bluenrg-hci/hci/controller/bluenrg_utils.c	Tue Jun 21 17:00:00 2016 +0200
@@ -131,11 +131,11 @@
   /***********************************************************************
   * Erase and Program sectors
   ************************************************************************/  
-  for(int i = fw_offset; i < (number_sectors * SECTOR_SIZE); i += SECTOR_SIZE) {
+  for(unsigned int i = fw_offset; i < (number_sectors * SECTOR_SIZE); i += SECTOR_SIZE) {
     num_erase_retries = 0;
     while (num_erase_retries++ < MAX_ERASE_RETRIES) {
       aci_updater_erase_sector(BASE_ADDRESS + i);
-      if ((i/SECTOR_SIZE) < (number_sectors-1))
+      if ((i/SECTOR_SIZE) < (unsigned int)(number_sectors-1))
 	data_size = DATA_SIZE;
       else
 	data_size = MIN_WRITE_BLOCK_SIZE;