stm32f1x: Fix byte order bug and remove unnecessary cast

[openocd.git] / src / flash / nor / stm32f1x.c

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 3c360fcd0f89d748b9a2eeb00a245d4ba176f832..af7d9ea3970034cf04d446d12625cbb5bfb0231e 100644 (file)
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -150,6 +150,9 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
        stm32x_info->register_base = FLASH_REG_BASE_B0;
        stm32x_info->user_bank_size = bank->size;
 
+       /* the stm32l erased value is 0x00 */
+       bank->default_padded_value = 0x00;
+
        return ERROR_OK;
 }
 
@@ -623,7 +626,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
        };
 
        retval = target_write_buffer(target, write_algorithm->address,
-                       sizeof(stm32x_flash_write_code), (uint8_t *)stm32x_flash_write_code);
+                       sizeof(stm32x_flash_write_code), stm32x_flash_write_code);
        if (retval != ERROR_OK)
                return retval;
 
@@ -1030,7 +1033,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 
        switch (device_id) {
        case 0x410:
-               device_str = "stm32x (Medium Density)";
+               device_str = "STM32F10x (Medium Density)";
 
                switch (rev_id) {
                case 0x0000:
@@ -1052,7 +1055,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x412:
-               device_str = "stm32x (Low Density)";
+               device_str = "STM32F10x (Low Density)";
 
                switch (rev_id) {
                case 0x1000:
@@ -1062,7 +1065,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x414:
-               device_str = "stm32x (High Density)";
+               device_str = "STM32F10x (High Density)";
 
                switch (rev_id) {
                case 0x1000:
@@ -1072,11 +1075,15 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                case 0x1001:
                        rev_str = "Z";
                        break;
+
+               case 0x1003:
+                       rev_str = "Y";
+                       break;
                }
                break;
 
        case 0x418:
-               device_str = "stm32x (Connectivity)";
+               device_str = "STM32F10x (Connectivity)";
 
                switch (rev_id) {
                case 0x1000:
@@ -1090,7 +1097,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x420:
-               device_str = "stm32x (Value)";
+               device_str = "STM32F100 (Low/Medium Density)";
 
                switch (rev_id) {
                case 0x1000:
@@ -1104,7 +1111,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x422:
-               device_str = "stm32f30x";
+               device_str = "STM32F30x";
 
                switch (rev_id) {
                case 0x1000:
@@ -1115,6 +1122,10 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                        rev_str = "Z";
                        break;
 
+               case 0x1003:
+                       rev_str = "Y";
+                       break;
+
                case 0x2000:
                        rev_str = "B";
                        break;
@@ -1122,7 +1133,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x428:
-               device_str = "stm32x (Value HD)";
+               device_str = "STM32F100 (High Density)";
 
                switch (rev_id) {
                case 0x1000:
@@ -1136,7 +1147,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x430:
-               device_str = "stm32x (XL)";
+               device_str = "STM32F10x (XL Density)";
 
                switch (rev_id) {
                case 0x1000:
@@ -1146,7 +1157,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x432:
-               device_str = "stm32f37x";
+               device_str = "STM32F37x";
 
                switch (rev_id) {
                case 0x1000:
@@ -1161,7 +1172,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 
        case 0x440:
        case 0x444:
-               device_str = "stm32f0x";
+               device_str = "STM32F0xx";
 
                switch (rev_id) {
                case 0x1000:
@@ -1175,7 +1186,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        default:
-               snprintf(buf, buf_size, "Cannot identify target as a stm32x\n");
+               snprintf(buf, buf_size, "Cannot identify target as a STM32F0/1/3\n");
                return ERROR_FAIL;
        }
 
@@ -1305,10 +1316,10 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 
        int user_data = optionbyte;
 
-       if (buf_get_u32((uint8_t *)&optionbyte, OPT_ERROR, 1))
+       if (optionbyte >> OPT_ERROR & 1)
                command_print(CMD_CTX, "Option Byte Complement Error");
 
-       if (buf_get_u32((uint8_t *)&optionbyte, OPT_READOUT, 1))
+       if (optionbyte >> OPT_READOUT & 1)
                command_print(CMD_CTX, "Readout Protection On");
        else
                command_print(CMD_CTX, "Readout Protection Off");
@@ -1316,23 +1327,23 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
        /* user option bytes are offset depending on variant */
        optionbyte >>= stm32x_info->option_offset;
 
-       if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDWDGSW, 1))
+       if (optionbyte >> OPT_RDWDGSW & 1)
                command_print(CMD_CTX, "Software Watchdog");
        else
                command_print(CMD_CTX, "Hardware Watchdog");
 
-       if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDRSTSTOP, 1))
+       if (optionbyte >> OPT_RDRSTSTOP & 1)
                command_print(CMD_CTX, "Stop: No reset generated");
        else
                command_print(CMD_CTX, "Stop: Reset generated");
 
-       if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDRSTSTDBY, 1))
+       if (optionbyte >> OPT_RDRSTSTDBY & 1)
                command_print(CMD_CTX, "Standby: No reset generated");
        else
                command_print(CMD_CTX, "Standby: Reset generated");
 
        if (stm32x_info->has_dual_banks) {
-               if (buf_get_u32((uint8_t *)&optionbyte, OPT_BFB2, 1))
+               if (optionbyte >> OPT_BFB2 & 1)
                        command_print(CMD_CTX, "Boot: Bank 0");
                else
                        command_print(CMD_CTX, "Boot: Bank 1");