flash/nor/efm32: fixed BG1x identification

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

diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c
index f461956c10d242298a876118bc26f3a189219fc3..fb4b09624b4a3aac188861972ab99cea6fb010d0 100644 (file)
--- a/src/flash/nor/efm32.c
+++ b/src/flash/nor/efm32.c
@@ -119,9 +119,9 @@ static const struct efm32_family_data efm32_families[] = {
                { 16, "EFR32MG1P Mighty", .series = 1 },
                { 17, "EFR32MG1B Mighty", .series = 1 },
                { 18, "EFR32MG1V Mighty", .series = 1 },
-               { 19, "EFR32MG1P Blue", .series = 1 },
-               { 20, "EFR32MG1B Blue", .series = 1 },
-               { 21, "EFR32MG1V Blue", .series = 1 },
+               { 19, "EFR32BG1P Blue", .series = 1 },
+               { 20, "EFR32BG1B Blue", .series = 1 },
+               { 21, "EFR32BG1V Blue", .series = 1 },
                { 25, "EFR32FG1P Flex", .series = 1 },
                { 26, "EFR32FG1B Flex", .series = 1 },
                { 27, "EFR32FG1V Flex", .series = 1 },
@@ -271,7 +271,7 @@ static int efm32x_read_info(struct flash_bank *bank,
                        efm32_info->family_data = &efm32_families[i];
        }
 
-       if (efm32_info->family_data == NULL) {
+       if (!efm32_info->family_data) {
                LOG_ERROR("Unknown MCU family %d", efm32_info->part_family);
                return ERROR_FAIL;
        }
@@ -386,7 +386,7 @@ static int efm32x_wait_status(struct flash_bank *bank, int timeout,
 
                LOG_DEBUG("status: 0x%" PRIx32 "", status);
 
-               if (((status & wait_mask) == 0) && (0 == wait_for_set))
+               if (((status & wait_mask) == 0) && (wait_for_set == 0))
                        break;
                else if (((status & wait_mask) != 0) && wait_for_set)
                        break;
@@ -457,7 +457,7 @@ static int efm32x_erase(struct flash_bank *bank, unsigned int first,
        struct target *target = bank->target;
        int ret = 0;
 
-       if (TARGET_HALTED != target->state) {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -885,7 +885,7 @@ static int efm32x_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t old_count = count;
                count = (old_count | 3) + 1;
                new_buffer = malloc(count);
-               if (new_buffer == NULL) {
+               if (!new_buffer) {
                        LOG_ERROR("odd number of bytes to write and no memory "
                                "for padding buffer");
                        return ERROR_FAIL;
@@ -958,7 +958,7 @@ static int efm32x_probe(struct flash_bank *bank)
        LOG_INFO("flash size = %dkbytes", efm32_mcu_info.flash_sz_kib);
        LOG_INFO("flash page size = %dbytes", efm32_mcu_info.page_size);
 
-       assert(0 != efm32_mcu_info.page_size);
+       assert(efm32_mcu_info.page_size != 0);
 
        int num_pages = efm32_mcu_info.flash_sz_kib * 1024 /
                efm32_mcu_info.page_size;
@@ -1016,7 +1016,7 @@ static int efm32x_protect_check(struct flash_bank *bank)
                return ret;
        }
 
-       assert(NULL != bank->sectors);
+       assert(bank->sectors);
 
        for (unsigned int i = 0; i < bank->num_sectors; i++)
                bank->sectors[i].is_protected = efm32x_get_page_lock(bank, i);