Diff: IAP_STM32L1.cpp

Revision:

9:7e19f12b81b4

Parent:

8:8af7acf9dbf3

Child:

10:a0c5bb26d159

--- a/IAP_STM32L1.cpp	Sun Apr 10 11:32:54 2016 +0000
+++ b/IAP_STM32L1.cpp	Mon Apr 11 03:09:59 2016 +0000
@@ -77,22 +77,23 @@
  */
 int IAP::read_ID( void )
 {
-    // TODO
+    IAP_result[1] = HAL_GetDEVID();
     return ( (int)IAP_result[ 1 ] );    //  to return the number itself (this command always returns CMD_SUCCESS)
 }
 
 int *IAP::read_serial( void ) {
-    // TODO
+    memcpy(&IAP_result[1], (void*)0x1ff800d0, sizeof(uint32_t) * 3);
+    IAP_result[4] = 0; 
     return ( (int *)&IAP_result[ 1 ] );    //  to return the number itself (this command always returns CMD_SUCCESS)
 }
 
 int IAP::blank_check( int start, int end )
 {
-    for(int i = start; i <= end; i++) {
-        for(int j = 0; j < FLASH_PAGE_SIZE; j++) {
-            if (*(char*)(i * FLASH_PAGE_SIZE + j) != 0x00) {
-                return SECTOR_NOT_BLANK;
-            }
+    uint8_t* p = reinterpret_cast<uint8_t*>(FLASH_BASE + start * FLASH_PAGE_SIZE);
+    uint8_t* e = p + (end - start + 1) * FLASH_PAGE_SIZE;
+    while(p < e) {
+        if (*p++ != 0x00) {
+            return SECTOR_NOT_BLANK;
         }
     }
     return CMD_SUCCESS;
@@ -122,6 +123,9 @@
 
 int IAP::write( char *source_addr, char *target_addr, int size )
 {
+    if (!IS_FLASH_PROGRAM_ADDRESS((uint32_t)target_addr) || !IS_FLASH_PROGRAM_ADDRESS((uint32_t)target_addr + size)) {
+        return DST_ADDR_NOT_MAPPED;
+    }
     uint32_t data;
     FLASH_Unlock unlock;
     for(int n = 0; n < size; n += sizeof(data)) {