This is an automated email from Gerrit. Saravanan Sekar ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/5650
-- gerrit commit 60f78bf86900ae683c7595b6aeee7770a9122673 Author: Saravanan Sekar <[email protected]> Date: Fri May 8 16:40:38 2020 +0200 flash/nor/numicro: fix camel case used in variables fix camel case used in variables Change-Id: I20709a7eb3ce41eb48e83e9117b5e4c37bac123a Signed-off-by: Saravanan Sekar <[email protected]> diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c index 248a86b..61400a0 100644 --- a/src/flash/nor/numicro.c +++ b/src/flash/nor/numicro.c @@ -136,7 +136,7 @@ struct numicro_cpu_type { {NUMICRO_LDROM_BASE, (ldrom_size)}, \ {NUMICRO_CONFIG_BASE, (config_size)} } -static const struct numicro_cpu_type NuMicroParts[] = { +static const struct numicro_cpu_type numicro_parts[] = { /*PART NO*/ /*PART ID*/ /*Banks*/ /* M031 */ @@ -836,8 +836,8 @@ struct numicro_flash_bank { }; /* Private variables */ -uint32_t m_pageSize = NUMICRO_PAGESIZE; -uint32_t m_addressMinusOffset; +static uint32_t m_page_size = NUMICRO_PAGESIZE; +static uint32_t m_addr_minus_offset; /* Private methods */ static int numicro_get_arm_arch(struct target *target) @@ -846,12 +846,12 @@ static int numicro_get_arm_arch(struct target *target) if (!armv7m->arm.is_armv6m) { LOG_DEBUG("NuMicro arm architecture: armv7m\n"); - m_pageSize = NUMICRO_PAGESIZE * 4; - m_addressMinusOffset = 0x10000000; + m_page_size = NUMICRO_PAGESIZE * 4; + m_addr_minus_offset = 0x10000000; } else { LOG_DEBUG("NuMicro arm architecture: armv6m\n"); - m_pageSize = NUMICRO_PAGESIZE; - m_addressMinusOffset = 0x0; + m_page_size = NUMICRO_PAGESIZE; + m_addr_minus_offset = 0x0; } return ERROR_OK; @@ -864,25 +864,25 @@ static int numicro_reg_unlock(struct target *target) int retval = ERROR_OK; /* Check to see if NUC is register unlocked or not */ - retval = target_read_u32(target, NUMICRO_SYS_WRPROT - m_addressMinusOffset, &is_protected); + retval = target_read_u32(target, NUMICRO_SYS_WRPROT - m_addr_minus_offset, &is_protected); if (retval != ERROR_OK) return retval; LOG_DEBUG("protected = 0x%08" PRIx32 "", is_protected); if (is_protected == 0) { /* means protected - so unlock it */ /* unlock flash registers */ - retval = target_write_u32(target, NUMICRO_SYS_WRPROT - m_addressMinusOffset, REG_KEY1); + retval = target_write_u32(target, NUMICRO_SYS_WRPROT - m_addr_minus_offset, REG_KEY1); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_SYS_WRPROT - m_addressMinusOffset, REG_KEY2); + retval = target_write_u32(target, NUMICRO_SYS_WRPROT - m_addr_minus_offset, REG_KEY2); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_SYS_WRPROT - m_addressMinusOffset, REG_KEY3); + retval = target_write_u32(target, NUMICRO_SYS_WRPROT - m_addr_minus_offset, REG_KEY3); if (retval != ERROR_OK) return retval; } /* Check that unlock worked */ - retval = target_read_u32(target, NUMICRO_SYS_WRPROT - m_addressMinusOffset, &is_protected); + retval = target_read_u32(target, NUMICRO_SYS_WRPROT - m_addr_minus_offset, &is_protected); if (retval != ERROR_OK) return retval; @@ -910,27 +910,27 @@ static int numicro_init_isp(struct target *target) return retval; /* Enable ISP/SRAM/TICK Clock */ - retval = target_read_u32(target, NUMICRO_SYSCLK_AHBCLK - m_addressMinusOffset, ®_stat); + retval = target_read_u32(target, NUMICRO_SYSCLK_AHBCLK - m_addr_minus_offset, ®_stat); if (retval != ERROR_OK) return retval; reg_stat |= AHBCLK_ISP_EN | AHBCLK_SRAM_EN | AHBCLK_TICK_EN; - retval = target_write_u32(target, NUMICRO_SYSCLK_AHBCLK - m_addressMinusOffset, reg_stat); + retval = target_write_u32(target, NUMICRO_SYSCLK_AHBCLK - m_addr_minus_offset, reg_stat); if (retval != ERROR_OK) return retval; /* Enable ISP */ - retval = target_read_u32(target, NUMICRO_FLASH_ISPCON - m_addressMinusOffset, ®_stat); + retval = target_read_u32(target, NUMICRO_FLASH_ISPCON - m_addr_minus_offset, ®_stat); if (retval != ERROR_OK) return retval; reg_stat |= ISPCON_ISPFF | ISPCON_LDUEN | ISPCON_APUEN | ISPCON_CFGUEN | ISPCON_ISPEN; - retval = target_write_u32(target, NUMICRO_FLASH_ISPCON - m_addressMinusOffset, reg_stat); + retval = target_write_u32(target, NUMICRO_FLASH_ISPCON - m_addr_minus_offset, reg_stat); if (retval != ERROR_OK) return retval; /* Write one to undocumented flash control register */ - retval = target_write_u32(target, NUMICRO_FLASH_CHEAT - m_addressMinusOffset, 1); + retval = target_write_u32(target, NUMICRO_FLASH_CHEAT - m_addr_minus_offset, 1); if (retval != ERROR_OK) return retval; @@ -942,26 +942,26 @@ static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t ad uint32_t timeout, status; int retval = ERROR_OK; - retval = target_write_u32(target, NUMICRO_FLASH_ISPCMD - m_addressMinusOffset, cmd); + retval = target_write_u32(target, NUMICRO_FLASH_ISPCMD - m_addr_minus_offset, cmd); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPDAT - m_addressMinusOffset, wdata); + retval = target_write_u32(target, NUMICRO_FLASH_ISPDAT - m_addr_minus_offset, wdata); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPADR - m_addressMinusOffset, addr); + retval = target_write_u32(target, NUMICRO_FLASH_ISPADR - m_addr_minus_offset, addr); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPTRG - m_addressMinusOffset, ISPTRG_ISPGO); + retval = target_write_u32(target, NUMICRO_FLASH_ISPTRG - m_addr_minus_offset, ISPTRG_ISPGO); if (retval != ERROR_OK) return retval; /* Wait for busy to clear - check the GO flag */ timeout = 100; for (;;) { - retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG - m_addressMinusOffset, &status); + retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG - m_addr_minus_offset, &status); if (retval != ERROR_OK) return retval; LOG_DEBUG("status: 0x%" PRIx32 "", status); @@ -974,7 +974,7 @@ static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t ad busy_sleep(1); /* can use busy sleep for short times. */ } - retval = target_read_u32(target, NUMICRO_FLASH_ISPDAT - m_addressMinusOffset, rdata); + retval = target_read_u32(target, NUMICRO_FLASH_ISPDAT - m_addr_minus_offset, rdata); if (retval != ERROR_OK) return retval; @@ -993,7 +993,6 @@ static int numicro_writeblock(struct flash_bank *bank, const uint8_t *buffer, struct reg_param reg_params[3]; struct armv7m_algorithm armv7m_info; int retval = ERROR_OK; - static const uint8_t numicro_flash_write_code[] = { #include "../../../contrib/loaders/flash/numicro/numicro_m0.inc" }; @@ -1022,8 +1021,9 @@ static int numicro_writeblock(struct flash_bank *bank, const uint8_t *buffer, LOG_WARNING("offset 0x%" PRIx32 " breaks required 2-byte alignment", offset); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } + /* Difference between M0 and M4 */ - if (m_pageSize == NUMICRO_PAGESIZE) { + if (m_page_size == NUMICRO_PAGESIZE) { /* allocate working area with flash programming code */ if (target_alloc_working_area(target, sizeof(numicro_flash_write_code), &write_algorithm) != ERROR_OK) { @@ -1050,7 +1050,7 @@ static int numicro_writeblock(struct flash_bank *bank, const uint8_t *buffer, if (retval != ERROR_OK) return retval; - buffer_size = m_pageSize; + buffer_size = m_page_size; } /* memory buffer */ @@ -1135,8 +1135,8 @@ static int numicro_protect_check(struct flash_bank *bank) return retval; /* Read CONFIG0,CONFIG1 */ - numicro_fmc_cmd(target, ISPCMD_READ, NUMICRO_CONFIG0 - m_addressMinusOffset, 0, &config[0]); - numicro_fmc_cmd(target, ISPCMD_READ, NUMICRO_CONFIG1 - m_addressMinusOffset, 0, &config[1]); + numicro_fmc_cmd(target, ISPCMD_READ, NUMICRO_CONFIG0 - m_addr_minus_offset, 0, &config[0]); + numicro_fmc_cmd(target, ISPCMD_READ, NUMICRO_CONFIG1 - m_addr_minus_offset, 0, &config[1]); LOG_DEBUG("CONFIG0: 0x%" PRIx32 ",CONFIG1: 0x%" PRIx32 "", config[0], config[1]); @@ -1180,19 +1180,19 @@ static int numicro_erase(struct flash_bank *bank, int first, int last) if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPCMD - m_addressMinusOffset, ISPCMD_ERASE); + retval = target_write_u32(target, NUMICRO_FLASH_ISPCMD - m_addr_minus_offset, ISPCMD_ERASE); if (retval != ERROR_OK) return retval; for (i = first; i <= last; i++) { LOG_DEBUG("erasing sector %d at address 0x%" PRIx32 "", i, (uint32_t)(bank->base + bank->sectors[i].offset)); - retval = target_write_u32(target, NUMICRO_FLASH_ISPADR - m_addressMinusOffset, + retval = target_write_u32(target, NUMICRO_FLASH_ISPADR - m_addr_minus_offset, bank->base + bank->sectors[i].offset); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPTRG - m_addressMinusOffset, + retval = target_write_u32(target, NUMICRO_FLASH_ISPTRG - m_addr_minus_offset, ISPTRG_ISPGO); /* This is the only bit available */ if (retval != ERROR_OK) return retval; @@ -1200,7 +1200,7 @@ static int numicro_erase(struct flash_bank *bank, int first, int last) /* wait for busy to clear - check the GO flag */ timeout = 100; for (;;) { - retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG - m_addressMinusOffset, &status); + retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG - m_addr_minus_offset, &status); if (retval != ERROR_OK) return retval; LOG_DEBUG("status: 0x%" PRIx32 "", status); @@ -1214,14 +1214,14 @@ static int numicro_erase(struct flash_bank *bank, int first, int last) } /* check for failure */ - retval = target_read_u32(target, NUMICRO_FLASH_ISPCON - m_addressMinusOffset, &status); + retval = target_read_u32(target, NUMICRO_FLASH_ISPCON - m_addr_minus_offset, &status); if (retval != ERROR_OK) return retval; if ((status & ISPCON_ISPFF) != 0) { LOG_DEBUG("failure: 0x%" PRIx32 "", status); /* if bit is set, then must write to it to clear it. */ - retval = target_write_u32(target, NUMICRO_FLASH_ISPCON - m_addressMinusOffset, (status | ISPCON_ISPFF)); + retval = target_write_u32(target, NUMICRO_FLASH_ISPCON - m_addr_minus_offset, (status | ISPCON_ISPFF)); if (retval != ERROR_OK) return retval; } else { @@ -1255,7 +1255,7 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer, if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPCMD - m_addressMinusOffset, ISPCMD_WRITE); + retval = target_write_u32(target, NUMICRO_FLASH_ISPCMD - m_addr_minus_offset, ISPCMD_WRITE); if (retval != ERROR_OK) return retval; @@ -1281,20 +1281,20 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer, uint8_t padding[4] = {0xff, 0xff, 0xff, 0xff}; memcpy(padding, buffer + i, MIN(4, count-i)); - retval = target_write_u32(target, NUMICRO_FLASH_ISPADR - m_addressMinusOffset, bank->base + offset + i); + retval = target_write_u32(target, NUMICRO_FLASH_ISPADR - m_addr_minus_offset, bank->base + offset + i); if (retval != ERROR_OK) return retval; - retval = target_write_memory(target, NUMICRO_FLASH_ISPDAT - m_addressMinusOffset, 4, 1, padding); + retval = target_write_memory(target, NUMICRO_FLASH_ISPDAT - m_addr_minus_offset, 4, 1, padding); if (retval != ERROR_OK) return retval; - retval = target_write_u32(target, NUMICRO_FLASH_ISPTRG - m_addressMinusOffset, ISPTRG_ISPGO); + retval = target_write_u32(target, NUMICRO_FLASH_ISPTRG - m_addr_minus_offset, ISPTRG_ISPGO); if (retval != ERROR_OK) return retval; /* wait for busy to clear - check the GO flag */ timeout = 100; for (;;) { - retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG - m_addressMinusOffset, &status); + retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG - m_addr_minus_offset, &status); if (retval != ERROR_OK) return retval; LOG_DEBUG("status: 0x%" PRIx32 "", status); @@ -1311,13 +1311,13 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer, } /* check for failure */ - retval = target_read_u32(target, NUMICRO_FLASH_ISPCON - m_addressMinusOffset, &status); + retval = target_read_u32(target, NUMICRO_FLASH_ISPCON - m_addr_minus_offset, &status); if (retval != ERROR_OK) return retval; if ((status & ISPCON_ISPFF) != 0) { LOG_DEBUG("failure: 0x%" PRIx32 "", status); /* if bit is set, then must write to it to clear it. */ - retval = target_write_u32(target, NUMICRO_FLASH_ISPCON - m_addressMinusOffset, (status | ISPCON_ISPFF)); + retval = target_write_u32(target, NUMICRO_FLASH_ISPCON - m_addr_minus_offset, (status | ISPCON_ISPFF)); if (retval != ERROR_OK) return retval; } else { @@ -1337,7 +1337,7 @@ static int numicro_get_cpu_type(struct target *target, const struct numicro_cpu_ numicro_get_arm_arch(target); /* Read NuMicro PartID */ - retval = target_read_u32(target, NUMICRO_SYS_BASE - m_addressMinusOffset, &part_id); + retval = target_read_u32(target, NUMICRO_SYS_BASE - m_addr_minus_offset, &part_id); if (retval != ERROR_OK) { LOG_WARNING("NuMicro flash driver: Failed to Get PartID\n"); return ERROR_FLASH_OPERATION_FAILED; @@ -1345,9 +1345,9 @@ static int numicro_get_cpu_type(struct target *target, const struct numicro_cpu_ LOG_INFO("Device ID: 0x%08" PRIx32 "", part_id); /* search part numbers */ - for (size_t i = 0; i < sizeof(NuMicroParts) / sizeof(NuMicroParts[0]); i++) { - if (part_id == NuMicroParts[i].partid) { - *cpu = &NuMicroParts[i]; + for (size_t i = 0; i < sizeof(numicro_parts) / sizeof(numicro_parts[0]); i++) { + if (part_id == numicro_parts[i].partid) { + *cpu = &numicro_parts[i]; LOG_INFO("Device Name: %s", (*cpu)->partname); return ERROR_OK; } @@ -1389,7 +1389,7 @@ static int numicro_probe(struct flash_bank *bank) return ERROR_FLASH_OPERATION_FAILED; } - num_pages = flash_size / m_pageSize; + num_pages = flash_size / m_page_size; bank->num_sectors = num_pages; bank->sectors = malloc(sizeof(struct flash_sector) * num_pages); @@ -1397,10 +1397,10 @@ static int numicro_probe(struct flash_bank *bank) for (int i = 0; i < num_pages; i++) { bank->sectors[i].offset = offset; - bank->sectors[i].size = m_pageSize; + bank->sectors[i].size = m_page_size; bank->sectors[i].is_erased = -1; bank->sectors[i].is_protected = 0; - offset += m_pageSize; + offset += m_page_size; } struct numicro_flash_bank *numicro_info = bank->driver_priv; -- _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
