From f47c69714ffc7fe00c061fb90b4cfbb1bd9c91e9 Mon Sep 17 00:00:00 2001 From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com> Date: Wed, 29 May 2024 21:27:27 +0200 Subject: [PATCH] Changed data types to fixed width types & formatting fixes - stlink_serial( ) - stlink_probe_usb( ) --- inc/stm32.h | 34 +++++++------- inc/stm32flash.h | 42 +++++++++--------- src/st-flash/flash.c | 2 +- src/st-flash/flash_opts.c | 8 ++-- src/st-info/info.c | 2 +- src/st-trace/trace.c | 2 +- src/st-util/gdb-remote.c | 2 +- src/st-util/gdb-server.c | 56 +++++++++++------------ src/st-util/semihosting.c | 26 +++++------ src/stlink-gui/gui.c | 4 +- src/stlink-lib/calculate.c | 2 +- src/stlink-lib/chipid.c | 2 +- src/stlink-lib/common.c | 40 ++++++++--------- src/stlink-lib/common_flash.c | 10 ++--- src/stlink-lib/flash_loader.c | 8 ++-- src/stlink-lib/helper.c | 4 +- src/stlink-lib/lib_md5.c | 60 ++++++++++++------------- src/stlink-lib/map_file.c | 8 ++-- src/stlink-lib/md5.c | 4 +- src/stlink-lib/option_bytes.c | 6 +-- src/stlink-lib/read_write.c | 10 ++--- src/stlink-lib/sg.c | 4 +- src/stlink-lib/usb.c | 84 +++++++++++++++++------------------ src/stlink-lib/usb.h | 4 +- src/win32/mmap.c | 2 +- src/win32/sys_time.c | 4 +- tests/flash.c | 2 +- 27 files changed, 216 insertions(+), 216 deletions(-) diff --git a/inc/stm32.h b/inc/stm32.h index 615484ee3..928b03233 100644 --- a/inc/stm32.h +++ b/inc/stm32.h @@ -142,37 +142,37 @@ enum stm32_chipids { }; /* Constant STM32 option bytes base memory address */ -#define STM32_C0_OPTION_BYTES_BASE ((uint32_t)0x1fff7800) +#define STM32_C0_OPTION_BYTES_BASE ((uint32_t) 0x1fff7800) -#define STM32_F4_OPTION_BYTES_BASE ((uint32_t)0x40023c14) +#define STM32_F4_OPTION_BYTES_BASE ((uint32_t) 0x40023c14) -#define STM32_H7_OPTION_BYTES_BASE ((uint32_t)0x5200201c) +#define STM32_H7_OPTION_BYTES_BASE ((uint32_t) 0x5200201c) -#define STM32_L0_OPTION_BYTES_BASE ((uint32_t)0x1ff80000) -#define STM32_L1_OPTION_BYTES_BASE ((uint32_t)0x1ff80000) +#define STM32_L0_OPTION_BYTES_BASE ((uint32_t) 0x1ff80000) +#define STM32_L1_OPTION_BYTES_BASE ((uint32_t) 0x1ff80000) -#define STM32_F7_OPTION_BYTES_BASE ((uint32_t)0x1fff0000) +#define STM32_F7_OPTION_BYTES_BASE ((uint32_t) 0x1fff0000) -#define STM32_G0_OPTION_BYTES_BASE ((uint32_t)0x1fff7800) -#define STM32_L4_OPTION_BYTES_BASE ((uint32_t)0x1fff7800) +#define STM32_G0_OPTION_BYTES_BASE ((uint32_t) 0x1fff7800) +#define STM32_L4_OPTION_BYTES_BASE ((uint32_t) 0x1fff7800) -#define STM32_F2_OPTION_BYTES_BASE ((uint32_t)0x1fffc000) +#define STM32_F2_OPTION_BYTES_BASE ((uint32_t) 0x1fffc000) -#define STM32_F0_OPTION_BYTES_BASE ((uint32_t)0x1ffff800) -#define STM32_F1_OPTION_BYTES_BASE ((uint32_t)0x1ffff800) -#define STM32_F3_OPTION_BYTES_BASE ((uint32_t)0x1ffff800) -#define STM32_G4_OPTION_BYTES_BASE ((uint32_t)0x1ffff800) +#define STM32_F0_OPTION_BYTES_BASE ((uint32_t) 0x1ffff800) +#define STM32_F1_OPTION_BYTES_BASE ((uint32_t) 0x1ffff800) +#define STM32_F3_OPTION_BYTES_BASE ((uint32_t) 0x1ffff800) +#define STM32_G4_OPTION_BYTES_BASE ((uint32_t) 0x1ffff800) /* ============ */ /* Old defines from common.c are below */ /* ============ */ /* Constant STM32 memory address */ -#define STM32_SRAM_BASE ((uint32_t)0x20000000) -#define STM32_FLASH_BASE ((uint32_t)0x08000000) +#define STM32_SRAM_BASE ((uint32_t) 0x20000000) +#define STM32_FLASH_BASE ((uint32_t) 0x08000000) -#define STM32_F1_FLASH_BANK2_BASE ((uint32_t)0x08080000) -#define STM32_H7_FLASH_BANK2_BASE ((uint32_t)0x08100000) +#define STM32_F1_FLASH_BANK2_BASE ((uint32_t) 0x08080000) +#define STM32_H7_FLASH_BANK2_BASE ((uint32_t) 0x08100000) #define STM32F0_DBGMCU_CR 0xE0042004 #define STM32F0_DBGMCU_CR_IWDG_STOP 8 diff --git a/inc/stm32flash.h b/inc/stm32flash.h index a5081d694..96d44f751 100644 --- a/inc/stm32flash.h +++ b/inc/stm32flash.h @@ -48,19 +48,19 @@ #define FLASH_CR_OPTWRE 9 #define FLASH_CR_OBL_LAUNCH 13 -#define FLASH_ACR_OFF ((uint32_t)0x00) -#define FLASH_PECR_OFF ((uint32_t)0x04) -#define FLASH_PDKEYR_OFF ((uint32_t)0x08) -#define FLASH_PEKEYR_OFF ((uint32_t)0x0c) -#define FLASH_PRGKEYR_OFF ((uint32_t)0x10) -#define FLASH_OPTKEYR_OFF ((uint32_t)0x14) -#define FLASH_SR_OFF ((uint32_t)0x18) -#define FLASH_OBR_OFF ((uint32_t)0x1c) -#define FLASH_WRPR_OFF ((uint32_t)0x20) +#define FLASH_ACR_OFF ((uint32_t) 0x00) +#define FLASH_PECR_OFF ((uint32_t) 0x04) +#define FLASH_PDKEYR_OFF ((uint32_t) 0x08) +#define FLASH_PEKEYR_OFF ((uint32_t) 0x0c) +#define FLASH_PRGKEYR_OFF ((uint32_t) 0x10) +#define FLASH_OPTKEYR_OFF ((uint32_t) 0x14) +#define FLASH_SR_OFF ((uint32_t) 0x18) +#define FLASH_OBR_OFF ((uint32_t) 0x1c) +#define FLASH_WRPR_OFF ((uint32_t) 0x20) // == STM32C0 == (RM0490) // C0 Flash registers -#define FLASH_C0_REGS_ADDR ((uint32_t)0x40022000) +#define FLASH_C0_REGS_ADDR ((uint32_t) 0x40022000) #define FLASH_C0_KEYR (FLASH_C0_REGS_ADDR + 0x08) #define FLASH_C0_OPT_KEYR (FLASH_C0_REGS_ADDR + 0x0C) #define FLASH_C0_SR (FLASH_C0_REGS_ADDR + 0x10) @@ -87,7 +87,7 @@ #define FLASH_F0_OPTKEY2 0xcdef89ab // == STM32F2 == -#define FLASH_F2_REGS_ADDR ((uint32_t)0x40023c00) +#define FLASH_F2_REGS_ADDR ((uint32_t) 0x40023c00) #define FLASH_F2_KEYR (FLASH_F2_REGS_ADDR + 0x04) #define FLASH_F2_OPT_KEYR (FLASH_F2_REGS_ADDR + 0x08) #define FLASH_F2_SR (FLASH_F2_REGS_ADDR + 0x0c) @@ -107,7 +107,7 @@ // == STM32F4 == // F4 Flash registers -#define FLASH_F4_REGS_ADDR ((uint32_t)0x40023c00) +#define FLASH_F4_REGS_ADDR ((uint32_t) 0x40023c00) #define FLASH_F4_KEYR (FLASH_F4_REGS_ADDR + 0x04) #define FLASH_F4_OPT_KEYR (FLASH_F4_REGS_ADDR + 0x08) #define FLASH_F4_SR (FLASH_F4_REGS_ADDR + 0x0c) @@ -131,7 +131,7 @@ // == STM32F7 == // F7 Flash registers -#define FLASH_F7_REGS_ADDR ((uint32_t)0x40023c00) +#define FLASH_F7_REGS_ADDR ((uint32_t) 0x40023c00) #define FLASH_F7_KEYR (FLASH_F7_REGS_ADDR + 0x04) #define FLASH_F7_OPT_KEYR (FLASH_F7_REGS_ADDR + 0x08) #define FLASH_F7_SR (FLASH_F7_REGS_ADDR + 0x0c) @@ -165,7 +165,7 @@ // == STM32G0/G4 == // G0/G4 Flash registers (RM0440, p.146) -#define FLASH_Gx_REGS_ADDR ((uint32_t)0x40022000) +#define FLASH_Gx_REGS_ADDR ((uint32_t) 0x40022000) #define FLASH_Gx_ACR (FLASH_Gx_REGS_ADDR + 0x00) #define FLASH_Gx_KEYR (FLASH_Gx_REGS_ADDR + 0x08) #define FLASH_Gx_OPTKEYR (FLASH_Gx_REGS_ADDR + 0x0c) @@ -232,7 +232,7 @@ // == STM32H7 == // H7 Flash registers -#define FLASH_H7_REGS_ADDR ((uint32_t)0x52002000) +#define FLASH_H7_REGS_ADDR ((uint32_t) 0x52002000) #define FLASH_H7_KEYR1 (FLASH_H7_REGS_ADDR + 0x04) #define FLASH_H7_KEYR2 (FLASH_H7_REGS_ADDR + 0x104) #define FLASH_H7_OPT_KEYR (FLASH_H7_REGS_ADDR + 0x08) @@ -278,7 +278,7 @@ // == STM32L0/L1/L4/L5 == // Lx Flash registers -#define FLASH_Lx_REGS_ADDR ((uint32_t)0x40023c00) +#define FLASH_Lx_REGS_ADDR ((uint32_t) 0x40023c00) #define FLASH_Lx_ACR (FLASH_Lx_REGS_ADDR + 0x00) #define FLASH_Lx_PECR (FLASH_Lx_REGS_ADDR + 0x04) #define FLASH_Lx_PDKEYR (FLASH_Lx_REGS_ADDR + 0x08) @@ -300,7 +300,7 @@ #define FLASH_L0_OPTKEY1 0xFBEAD9C8 #define FLASH_L0_OPTKEY2 0x24252627 -#define FLASH_L0_REGS_ADDR ((uint32_t)0x40022000) +#define FLASH_L0_REGS_ADDR ((uint32_t) 0x40022000) #define FLASH_L0_PELOCK (0) #define FLASH_L0_OPTLOCK (2) @@ -352,16 +352,16 @@ #define FLASH_L4_CR_OBL_LAUNCH 27 /* Option bytes reload */ // Bits requesting flash operations (useful when we want to clear them) #define FLASH_L4_CR_OPBITS \ - (uint32_t)((1lu << FLASH_L4_CR_PG) | (1lu << FLASH_L4_CR_PER) | \ + (uint32_t) ((1lu << FLASH_L4_CR_PG) | (1lu << FLASH_L4_CR_PER) | \ (1lu << FLASH_L4_CR_MER1) | (1lu << FLASH_L4_CR_MER1)) // Page is fully specified by BKER and PNB -#define FLASH_L4_CR_PAGEMASK (uint32_t)(0x1fflu << FLASH_L4_CR_PNB) +#define FLASH_L4_CR_PAGEMASK (uint32_t) (0x1fflu << FLASH_L4_CR_PNB) #define FLASH_L4_OPTR_DUALBANK 21 // == STM32L5 == (RM0438, p.241) // L5 Flash registers -#define FLASH_L5_REGS_ADDR ((uint32_t)0x40022000) +#define FLASH_L5_REGS_ADDR ((uint32_t) 0x40022000) #define FLASH_L5_ACR (FLASH_L5_REGS_ADDR + 0x00) #define FLASH_L5_NSKEYR (FLASH_L5_REGS_ADDR + 0x08) #define FLASH_L5_OPTKEYR (FLASH_L5_REGS_ADDR + 0x10) @@ -399,7 +399,7 @@ // == STM32WB == (RM0434) // WB Flash registers -#define FLASH_WB_REGS_ADDR ((uint32_t)0x58004000) +#define FLASH_WB_REGS_ADDR ((uint32_t) 0x58004000) #define FLASH_WB_ACR (FLASH_WB_REGS_ADDR + 0x00) #define FLASH_WB_KEYR (FLASH_WB_REGS_ADDR + 0x08) #define FLASH_WB_OPT_KEYR (FLASH_WB_REGS_ADDR + 0x0c) diff --git a/src/st-flash/flash.c b/src/st-flash/flash.c index c6c8768e8..56556ee25 100644 --- a/src/st-flash/flash.c +++ b/src/st-flash/flash.c @@ -281,7 +281,7 @@ int32_t main(int32_t ac, char** av) { fprintf(stderr, "open(%s) == -1\n", o.filename); goto on_error; } - err = (uint32_t)write(fd, &option_byte, 4); + err = (uint32_t) write(fd, &option_byte, 4); if (err == -1) { printf("could not write buffer to file (%d)\n", err); goto on_error; diff --git a/src/st-flash/flash_opts.c b/src/st-flash/flash_opts.c index 4e2f11fde..9fe35cad8 100644 --- a/src/st-flash/flash_opts.c +++ b/src/st-flash/flash_opts.c @@ -17,7 +17,7 @@ #include static bool starts_with(const char * str, const char * prefix) { - uint32_t n = (uint32_t)strlen(prefix); + uint32_t n = (uint32_t) strlen(prefix); if (strlen(str) < n) { return (false); } @@ -70,7 +70,7 @@ static int32_t get_integer_from_char_array (const char *const str, uint32_t *rea fprintf (stderr, "*** Error: Integer greater than UINT32_MAX, cannot convert to int32_t\n"); return (-1); } else { - *read_value = (uint32_t)value; + *read_value = (uint32_t) value; return (0); } } @@ -201,7 +201,7 @@ int32_t flash_get_opts(struct flash_opts* o, int32_t ac, char** av) { if (result != 0) { return (bad_arg ("--flash")); } else { - o->flash_size = (uint32_t)flash_size; + o->flash_size = (uint32_t) flash_size; } } else if (strcmp(av[0], "--connect-under-reset") == 0) { o->connect = CONNECT_UNDER_RESET; @@ -372,7 +372,7 @@ int32_t flash_get_opts(struct flash_opts* o, int32_t ac, char** av) { if (result != 0) { return (bad_arg ("addr")); } else { - o->addr = (stm32_addr_t)addr; + o->addr = (stm32_addr_t) addr; } } else if (o->format == FLASH_FORMAT_IHEX) { // expect filename if (ac != 1) { return (invalid_args("write ")); } diff --git a/src/st-info/info.c b/src/st-info/info.c index 31deeba45..ffdf521cc 100644 --- a/src/st-info/info.c +++ b/src/st-info/info.c @@ -55,7 +55,7 @@ static void stlink_probe(enum connect_type connect, int32_t freq) { stlink_t **stdevs; uint32_t size; - size = (uint32_t)stlink_probe_usb(&stdevs, connect, freq); + size = stlink_probe_usb(&stdevs, connect, freq); printf("Found %u stlink programmers\n", size); diff --git a/src/st-trace/trace.c b/src/st-trace/trace.c index 591e29252..0be4e6342 100644 --- a/src/st-trace/trace.c +++ b/src/st-trace/trace.c @@ -158,7 +158,7 @@ static bool parse_frequency(char* text, uint32_t* result) { return false; } - *result = (uint32_t)value; + *result = (uint32_t) value; return true; } diff --git a/src/st-util/gdb-remote.c b/src/st-util/gdb-remote.c index 0e6c69e72..6ab9d1158 100644 --- a/src/st-util/gdb-remote.c +++ b/src/st-util/gdb-remote.c @@ -20,7 +20,7 @@ static const char hex[] = "0123456789abcdef"; int32_t gdb_send_packet(int32_t fd, char* data) { - uint32_t data_length = (uint32_t)strlen(data); + uint32_t data_length = (uint32_t) strlen(data); int32_t length = data_length + 4; char* packet = malloc(length); // '$' data (hex) '#' cksum (hex) diff --git a/src/st-util/gdb-server.c b/src/st-util/gdb-server.c index 3eadd974d..a2f735824 100644 --- a/src/st-util/gdb-server.c +++ b/src/st-util/gdb-server.c @@ -98,7 +98,7 @@ static void cleanup(int32_t signum) { #if defined(_WIN32) BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) { - printf("Receive signal %i. Exiting...\r\n", (int32_t)fdwCtrlType); + printf("Receive signal %i. Exiting...\r\n", (int32_t) fdwCtrlType); _cleanup(); return FALSE; } @@ -684,7 +684,7 @@ static int32_t flash_go(stlink_t *sl, st_state_t *st) { for (struct flash_block* fb = flash_root; fb; fb = fb->next) { ILOG("flash_erase: block %08x -> %04x\n", fb->addr, fb->length); - for (stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += (uint32_t)FLASH_PAGE) { + for (stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += (uint32_t) FLASH_PAGE) { // update FLASH_PAGE stlink_calculate_pagesize(sl, page); @@ -700,14 +700,14 @@ static int32_t flash_go(stlink_t *sl, st_state_t *st) { for (struct flash_block* fb = flash_root; fb; fb = fb->next) { ILOG("flash_do: block %08x -> %04x\n", fb->addr, fb->length); - for (stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += (uint32_t)FLASH_PAGE) { + for (stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += (uint32_t) FLASH_PAGE) { uint32_t length = fb->length - (page - fb->addr); // update FLASH_PAGE stlink_calculate_pagesize(sl, page); ILOG("flash_do: page %08x\n", page); - uint32_t len = (length > FLASH_PAGE) ? (uint32_t)FLASH_PAGE : length; + uint32_t len = (length > FLASH_PAGE) ? (uint32_t) FLASH_PAGE : length; ret = stlink_flashloader_write(sl, &fl, page, fb->data + (page - fb->addr), len); if (ret) { goto error; } } @@ -983,7 +983,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { params = separator + 1; } - uint32_t queryNameLength = (uint32_t)(separator - &packet[1]); + uint32_t queryNameLength = (uint32_t) (separator - &packet[1]); char* queryName = calloc(queryNameLength + 1, 1); strncpy(queryName, &packet[1], queryNameLength); @@ -1002,8 +1002,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { __s_addr = strsep(&tok, ","); s_length = tok; - uint32_t addr = (uint32_t)strtoul(__s_addr, NULL, 16), - length = (uint32_t)strtoul(s_length, NULL, 16); + uint32_t addr = (uint32_t) strtoul(__s_addr, NULL, 16), + length = (uint32_t) strtoul(s_length, NULL, 16); DLOG("Xfer: type:%s;op:%s;annex:%s;addr:%d;length:%d\n", type, op, annex, addr, length); @@ -1020,7 +1020,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { } if (data) { - uint32_t data_length = (uint32_t)strlen(data); + uint32_t data_length = (uint32_t) strlen(data); if (addr + length > data_length) { length = data_length - addr; } @@ -1043,7 +1043,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { params = separator + 1; } - uint32_t hex_len = (uint32_t)strlen(params); + uint32_t hex_len = (uint32_t) strlen(params); uint32_t alloc_size = (hex_len / 2) + 1; uint32_t cmd_len; char *cmd = malloc(alloc_size); @@ -1163,8 +1163,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { __s_addr = strsep(&tok, ","); s_length = tok; - uint32_t addr = (uint32_t)strtoul(__s_addr, NULL, 16), - length = (uint32_t)strtoul(s_length, NULL, 16); + uint32_t addr = (uint32_t) strtoul(__s_addr, NULL, 16), + length = (uint32_t) strtoul(s_length, NULL, 16); DLOG("FlashErase: addr:%08x,len:%04x\n", addr, length); @@ -1181,8 +1181,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { __s_addr = strsep(&tok, ":"); data = tok; - uint32_t addr = (uint32_t)strtoul(__s_addr, NULL, 16); - uint32_t data_length = status - (uint32_t)(data - packet); + uint32_t addr = (uint32_t) strtoul(__s_addr, NULL, 16); + uint32_t data_length = status - (uint32_t) (data - packet); // Length of decoded data cannot be more than encoded, as escapes are removed. // Additional byte is reserved for alignment fix. @@ -1345,13 +1345,13 @@ int32_t serve(stlink_t *sl, st_state_t *st) { reply = calloc(8 * 16 + 1, 1); for (int32_t i = 0; i < 16; i++) { - sprintf(&reply[i * 8], "%08x", (uint32_t)htonl(regp.r[i])); + sprintf(&reply[i * 8], "%08x", (uint32_t) htonl(regp.r[i])); } break; case 'p': { - uint32_t id = (uint32_t)strtoul(&packet[1], NULL, 16); + uint32_t id = (uint32_t) strtoul(&packet[1], NULL, 16); uint32_t myreg = 0xDEADDEAD; if (id < 16) { @@ -1404,8 +1404,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { char* s_reg = &packet[1]; char* s_value = strstr(&packet[1], "=") + 1; - uint32_t reg = (uint32_t)strtoul(s_reg, NULL, 16); - uint32_t value = (uint32_t)strtoul(s_value, NULL, 16); + uint32_t reg = (uint32_t) strtoul(s_reg, NULL, 16); + uint32_t value = (uint32_t) strtoul(s_value, NULL, 16); if (reg < 16) { @@ -1445,7 +1445,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { for (int32_t i = 0; i < 16; i++) { char str[9] = {0}; strncpy(str, &packet[1 + i * 8], 8); - uint32_t reg = (uint32_t)strtoul(str, NULL, 16); + uint32_t reg = (uint32_t) strtoul(str, NULL, 16); ret = stlink_write_reg(sl, ntohl(reg), i); if (ret) { DLOG("G packet: stlink_write_reg failed"); } @@ -1458,8 +1458,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { char* s_start = &packet[1]; char* s_count = strstr(&packet[1], ",") + 1; - stm32_addr_t start = (stm32_addr_t)strtoul(s_start, NULL, 16); - uint32_t count = (uint32_t)strtoul(s_count, NULL, 16); + stm32_addr_t start = (stm32_addr_t) strtoul(s_start, NULL, 16); + uint32_t count = (uint32_t) strtoul(s_count, NULL, 16); uint32_t adj_start = start % 4; uint32_t count_rnd = (count + adj_start + 4 - 1) / 4 * 4; @@ -1489,8 +1489,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { char* s_count = strstr(&packet[1], ",") + 1; char* hexdata = strstr(packet, ":") + 1; - stm32_addr_t start = (stm32_addr_t)strtoul(s_start, NULL, 16); - uint32_t count = (uint32_t)strtoul(s_count, NULL, 16); + stm32_addr_t start = (stm32_addr_t) strtoul(s_start, NULL, 16); + uint32_t count = (uint32_t) strtoul(s_count, NULL, 16); int32_t err = 0; if (start % 4) { @@ -1500,7 +1500,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { for (uint32_t i = 0; i < align_count; i++) { char hextmp[3] = { hexdata[i * 2], hexdata[i * 2 + 1], 0 }; - uint8_t byte = (uint8_t)strtoul(hextmp, NULL, 16); + uint8_t byte = (uint8_t) strtoul(hextmp, NULL, 16); sl->q_buf[i] = byte; } @@ -1516,7 +1516,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { for (uint32_t i = 0; i < aligned_count; i++) { char hextmp[3] = { hexdata[i * 2], hexdata[i * 2 + 1], 0 }; - uint8_t byte = (uint8_t)strtoul(hextmp, NULL, 16); + uint8_t byte = (uint8_t) strtoul(hextmp, NULL, 16); sl->q_buf[i] = byte; } @@ -1530,7 +1530,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { if (count) { for (uint32_t i = 0; i < count; i++) { char hextmp[3] = { hexdata[i * 2], hexdata[i * 2 + 1], 0 }; - uint8_t byte = (uint8_t)strtoul(hextmp, NULL, 16); + uint8_t byte = (uint8_t) strtoul(hextmp, NULL, 16); sl->q_buf[i] = byte; } @@ -1544,8 +1544,8 @@ int32_t serve(stlink_t *sl, st_state_t *st) { case 'Z': { char *endptr; - stm32_addr_t addr = (stm32_addr_t)strtoul(&packet[3], &endptr, 16); - stm32_addr_t len = (stm32_addr_t)strtoul(&endptr[1], NULL, 16); + stm32_addr_t addr = (stm32_addr_t) strtoul(&packet[3], &endptr, 16); + stm32_addr_t len = (stm32_addr_t) strtoul(&endptr[1], NULL, 16); switch (packet[1]) { case '1': @@ -1587,7 +1587,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { } case 'z': { char *endptr; - stm32_addr_t addr = (stm32_addr_t)strtoul(&packet[3], &endptr, 16); + stm32_addr_t addr = (stm32_addr_t) strtoul(&packet[3], &endptr, 16); // stm32_addr_t len = strtoul(&endptr[1], NULL, 16); switch (packet[1]) { diff --git a/src/st-util/semihosting.c b/src/st-util/semihosting.c index 8e9828ce8..4a86e4db2 100644 --- a/src/st-util/semihosting.c +++ b/src/st-util/semihosting.c @@ -191,7 +191,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { DLOG("Semihosting: open('%s', (SH open mode)%d, 0644)\n", name, mode); - *ret = (uint32_t)open(name, open_mode_flags[mode], 0644); + *ret = (uint32_t) open(name, open_mode_flags[mode], 0644); saved_errno = errno; DLOG("Semihosting: return %d\n", *ret); @@ -210,11 +210,11 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { return (-1); } - fd = (int32_t)args[0]; + fd = (int32_t) args[0]; DLOG("Semihosting: close(%d)\n", fd); - *ret = (uint32_t)close(fd); + *ret = (uint32_t) close(fd); saved_errno = errno; DLOG("Semihosting: return %d\n", *ret); @@ -234,7 +234,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { return (-1); } - fd = (int32_t)args[0]; + fd = (int32_t) args[0]; buffer_address = args[1]; buffer_len = args[2]; @@ -262,7 +262,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { DLOG("Semihosting: write(%d, target_addr:0x%08x, %u)\n", fd, buffer_address, buffer_len); - *ret = (uint32_t)write(fd, buffer, buffer_len); + *ret = (uint32_t) write(fd, buffer, buffer_len); saved_errno = errno; if (*ret == (uint32_t)-1) { @@ -290,7 +290,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { return (-1); } - fd = (int32_t)args[0]; + fd = (int32_t) args[0]; buffer_address = args[1]; buffer_len = args[2]; @@ -323,7 +323,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { *ret = buffer_len; return (-1); } else { - *ret = buffer_len - (uint32_t)read_result; + *ret = buffer_len - (uint32_t) read_result; } } @@ -333,7 +333,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { } case SEMIHOST_SYS_ERRNO: { - *ret = (uint32_t)saved_errno; + *ret = (uint32_t) saved_errno; DLOG("Semihosting: Errno return %d\n", *ret); break; } @@ -381,7 +381,7 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { } DLOG("Semihosting: unlink('%s')\n", name); - *ret = (uint32_t)unlink(name); + *ret = (uint32_t) unlink(name); saved_errno = errno; DLOG("Semihosting: return %d\n", *ret); free(name); @@ -399,11 +399,11 @@ int32_t do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) { return (-1); } - fd = (int32_t)args[0]; - offset = (off_t)args[1]; + fd = (int32_t) args[0]; + offset = (off_t) args[1]; - DLOG("Semihosting: lseek(%d, %d, SEEK_SET)\n", fd, (int32_t)offset); - *ret = (uint32_t)lseek(fd, offset, SEEK_SET); + DLOG("Semihosting: lseek(%d, %d, SEEK_SET)\n", fd, (int32_t) offset); + *ret = (uint32_t) lseek(fd, offset, SEEK_SET); saved_errno = errno; if (*ret != (uint32_t)-1) { *ret = 0; /* Success */ } diff --git a/src/stlink-gui/gui.c b/src/stlink-gui/gui.c index 57dbe997a..bc24591e5 100644 --- a/src/stlink-gui/gui.c +++ b/src/stlink-gui/gui.c @@ -442,7 +442,7 @@ static gchar *dev_format_chip_id(guint32 chip_id) { } static gchar *dev_format_mem_size(gsize flash_size) { - return (g_strdup_printf("%u kB", (uint32_t)(flash_size / 1024))); + return (g_strdup_printf("%u kB", (uint32_t) (flash_size / 1024))); } @@ -594,7 +594,7 @@ static gpointer stlink_gui_write_flash(gpointer data) { g_return_val_if_fail((gui->filename != NULL), NULL); if (stlink_mwrite_flash( - gui->sl, gui->file_mem.memory, (uint32_t)gui->file_mem.size, gui->sl->flash_base) < 0) { + gui->sl, gui->file_mem.memory, (uint32_t) gui->file_mem.size, gui->sl->flash_base) < 0) { stlink_gui_set_info_error_message(gui, "Failed to write to flash"); } diff --git a/src/stlink-lib/calculate.c b/src/stlink-lib/calculate.c index 95a94143b..d214c7c03 100644 --- a/src/stlink-lib/calculate.c +++ b/src/stlink-lib/calculate.c @@ -65,7 +65,7 @@ uint32_t calculate_L4_page(stlink_t *sl, uint32_t flashaddr) { sl->chip_id == STM32_CHIPID_L496x_L4A6x || sl->chip_id == STM32_CHIPID_L4Rx) { // these chips use dual bank flash - if (flashopt & (uint32_t)(1lu << FLASH_L4_OPTR_DUALBANK)) { + if (flashopt & (uint32_t) (1lu << FLASH_L4_OPTR_DUALBANK)) { uint32_t banksize = sl->flash_size / 2; if (flashaddr >= banksize) { diff --git a/src/stlink-lib/chipid.c b/src/stlink-lib/chipid.c index c5ec08e6a..d20c5f58c 100644 --- a/src/stlink-lib/chipid.c +++ b/src/stlink-lib/chipid.c @@ -224,7 +224,7 @@ void init_chipids(char *dir_to_scan) { if (d) { while ((dir = readdir(d)) != NULL) { - nl = (uint32_t)strlen(dir->d_name); + nl = (uint32_t) strlen(dir->d_name); if (strcmp(dir->d_name + nl - 5, ".chip") == 0) { char buf[1024]; diff --git a/src/stlink-lib/common.c b/src/stlink-lib/common.c index 3ce1dd688..42209485d 100644 --- a/src/stlink-lib/common.c +++ b/src/stlink-lib/common.c @@ -620,7 +620,7 @@ void stlink_print_data(stlink_t *sl) { */ } // DLOG(" %02x", (uint32_t) sl->q_buf[i]); - fprintf(stderr, " %02x", (uint32_t)sl->q_buf[i]); + fprintf(stderr, " %02x", (uint32_t) sl->q_buf[i]); } // DLOG("\n\n"); fprintf(stderr, "\n"); @@ -669,12 +669,12 @@ int32_t stlink_mwrite_sram(stlink_t *sl, uint8_t *data, uint32_t length, stm32_a size += 2; } // round size if needed - stlink_write_mem32(sl, addr + off, (uint16_t)size); + stlink_write_mem32(sl, addr + off, (uint16_t) size); } if (length > len) { memcpy(sl->q_buf, data + len, length - len); - stlink_write_mem8(sl, addr + len, (uint16_t)(length - len)); + stlink_write_mem8(sl, addr + len, (uint16_t) (length - len)); } error = 0; // success @@ -737,12 +737,12 @@ int32_t stlink_fwrite_sram(stlink_t *sl, const char *path, stm32_addr_t addr) { size += 2; } // round size if needed - stlink_write_mem32(sl, addr + off, (uint16_t)size); + stlink_write_mem32(sl, addr + off, (uint16_t) size); } if (mf.len > len) { memcpy(sl->q_buf, mf.base + len, mf.len - len); - stlink_write_mem8(sl, addr + len, (uint16_t)(mf.len - len)); + stlink_write_mem8(sl, addr + len, (uint16_t) (mf.len - len)); } // check the file has been written @@ -913,7 +913,7 @@ int32_t stlink_parse_ihex(const char *path, uint8_t erased_pattern, uint8_t **me break; } - uint32_t l = (uint32_t)strlen(line); + uint32_t l = (uint32_t) strlen(line); while (l > 0 && (line[l - 1] == '\n' || line[l - 1] == '\r')) { --l; @@ -941,14 +941,14 @@ int32_t stlink_parse_ihex(const char *path, uint8_t erased_pattern, uint8_t **me uint8_t reclen = stlink_parse_hex(line + 1); - if (((uint32_t)reclen + 5) * 2 + 1 != l) { + if (((uint32_t) reclen + 5) * 2 + 1 != l) { ELOG("Wrong file format - record length mismatch\n"); res = -1; break; } - uint16_t offset = ((uint16_t)stlink_parse_hex(line + 3) << 8) | - ((uint16_t)stlink_parse_hex(line + 5)); + uint16_t offset = ((uint16_t) stlink_parse_hex(line + 3) << 8) | + ((uint16_t) stlink_parse_hex(line + 5)); uint8_t rectype = stlink_parse_hex(line + 7); switch (rectype) { @@ -986,8 +986,8 @@ int32_t stlink_parse_ihex(const char *path, uint8_t erased_pattern, uint8_t **me break; case 4: /* Extended Linear Address */ if (reclen == 2) { - lba = ((uint32_t)stlink_parse_hex(line + 9) << 24) | - ((uint32_t)stlink_parse_hex(line + 11) << 16); + lba = ((uint32_t) stlink_parse_hex(line + 9) << 24) | + ((uint32_t) stlink_parse_hex(line + 11) << 16); } else { ELOG("Wrong file format - wrong LBA length\n"); res = -1; @@ -1181,8 +1181,8 @@ void _parse_version(stlink_t *sl, stlink_version_t *slv) { slv->stlink_v = sl->q_buf[0]; slv->swim_v = sl->q_buf[1]; slv->jtag_v = sl->q_buf[2]; - slv->st_vid = (uint32_t)((sl->q_buf[9] << 8) | sl->q_buf[8]); - slv->stlink_pid = (uint32_t)((sl->q_buf[11] << 8) | sl->q_buf[10]); + slv->st_vid = (uint32_t) ((sl->q_buf[9] << 8) | sl->q_buf[8]); + slv->stlink_pid = (uint32_t) ((sl->q_buf[11] << 8) | sl->q_buf[10]); slv->jtag_api = STLINK_JTAG_API_V3; /* preferred API to get last R/W status */ sl->version.flags |= STLINK_F_HAS_GETLASTRWSTATUS2; @@ -1230,7 +1230,7 @@ static int32_t stlink_read(stlink_t *sl, stm32_addr_t addr, uint32_t size, save_ aligned_size = (cmp_size + 4) & ~(4 - 1); } - stlink_read_mem32(sl, addr + off, (uint16_t)aligned_size); + stlink_read_mem32(sl, addr + off, (uint16_t) aligned_size); if (!fn(fn_arg, sl->q_buf, aligned_size)) { goto on_error; @@ -1277,11 +1277,11 @@ static uint8_t stlink_parse_hex(const char *hex) { static bool stlink_fread_ihex_newsegment(struct stlink_fread_ihex_worker_arg *the_arg) { uint32_t addr = the_arg->addr; - uint8_t sum = 2 + 4 + (uint8_t)((addr & 0xFF000000) >> 24) + - (uint8_t)((addr & 0x00FF0000) >> 16); + uint8_t sum = 2 + 4 + (uint8_t) ((addr & 0xFF000000) >> 24) + + (uint8_t) ((addr & 0x00FF0000) >> 16); if (17 != fprintf(the_arg->file, ":02000004%04X%02X\r\n", - (addr & 0xFFFF0000) >> 16, (uint8_t)(0x100 - sum))) { + (addr & 0xFFFF0000) >> 16, (uint8_t) (0x100 - sum))) { return (false); } @@ -1304,8 +1304,8 @@ static bool stlink_fread_ihex_writeline(struct stlink_fread_ihex_worker_arg *the } } - uint8_t sum = count + (uint8_t)((addr & 0x0000FF00) >> 8) + - (uint8_t)(addr & 0x000000FF); + uint8_t sum = count + (uint8_t) ((addr & 0x0000FF00) >> 8) + + (uint8_t) (addr & 0x000000FF); if (9 != fprintf(the_arg->file, ":%02X%04X00", count, (addr & 0x0000FFFF))) { return (false); @@ -1320,7 +1320,7 @@ static bool stlink_fread_ihex_writeline(struct stlink_fread_ihex_worker_arg *the } } - if (4 != fprintf(the_arg->file, "%02X\r\n", (uint8_t)(0x100 - sum))) { + if (4 != fprintf(the_arg->file, "%02X\r\n", (uint8_t) (0x100 - sum))) { return (false); } diff --git a/src/stlink-lib/common_flash.c b/src/stlink-lib/common_flash.c index 73c77d090..663dd8132 100644 --- a/src/stlink-lib/common_flash.c +++ b/src/stlink-lib/common_flash.c @@ -885,7 +885,7 @@ static inline void write_flash_cr_bker_pnb(stlink_t *sl, uint32_t n) { x &= ~(1 << FLASH_L4_CR_MER1); x &= ~(1 << FLASH_L4_CR_MER2); x |= (n << FLASH_L4_CR_PNB); - x |= (uint32_t)(1lu << FLASH_L4_CR_PER); + x |= (uint32_t) (1lu << FLASH_L4_CR_PER); #if DEBUG_FLASH fprintf(stdout, "BKER:PNB:0x%x 0x%x\n", x, n); #endif @@ -1344,7 +1344,7 @@ int32_t stlink_fwrite_flash(stlink_t *sl, const char *path, stm32_addr_t addr) { stlink_checksum(&mf); if (sl->opt) { - idx = (uint32_t)mf.len; + idx = (uint32_t) mf.len; for (num_empty = 0; num_empty != mf.len; ++num_empty) { if (mf.base[--idx] != erased_pattern) { @@ -1370,10 +1370,10 @@ int32_t stlink_fwrite_flash(stlink_t *sl, const char *path, stm32_addr_t addr) { /* In case the address is within the OTP area we use a different flash method */ if(addr >= sl->otp_base && addr < sl->otp_base + sl->otp_size) { err = stlink_write_otp(sl, addr, mf.base, - (num_empty == mf.len) ? (uint32_t)mf.len : (uint32_t)mf.len - num_empty); + (num_empty == mf.len) ? (uint32_t) mf.len : (uint32_t) mf.len - num_empty); } else { err = stlink_write_flash(sl, addr, mf.base, - (num_empty == mf.len) ? (uint32_t)mf.len : (uint32_t)mf.len - num_empty, + (num_empty == mf.len) ? (uint32_t) mf.len : (uint32_t) mf.len - num_empty, num_empty == mf.len); } stlink_fwrite_finalize(sl, addr); @@ -1424,7 +1424,7 @@ int32_t stlink_verify_write_flash(stlink_t *sl, stm32_addr_t address, uint8_t *d aligned_size = (cmp_size + 4) & ~(4 - 1); } - stlink_read_mem32(sl, address + off, (uint16_t)aligned_size); + stlink_read_mem32(sl, address + off, (uint16_t) aligned_size); if (memcmp(sl->q_buf, data + off, cmp_size)) { ELOG("Verification of flash failed at offset: %u\n", off); diff --git a/src/stlink-lib/flash_loader.c b/src/stlink-lib/flash_loader.c index 503dcce37..34033a0f8 100644 --- a/src/stlink-lib/flash_loader.c +++ b/src/stlink-lib/flash_loader.c @@ -320,7 +320,7 @@ int32_t stlink_flash_loader_write_to_sram(stlink_t *sl, stm32_addr_t* addr, uint } memcpy(sl->q_buf, loader_code, loader_size); - int32_t ret = stlink_write_mem32(sl, sl->sram_base, (uint16_t)loader_size); + int32_t ret = stlink_write_mem32(sl, sl->sram_base, (uint16_t) loader_size); if (ret) { return (ret); } @@ -400,7 +400,7 @@ int32_t stlink_flash_loader_run(stlink_t *sl, flash_loader_t* fl, stm32_addr_t t * several bytes garbage have been written due to the unaligned * firmware size. */ - if ((int32_t)rr.r[2] > 0 || (int32_t)rr.r[2] < -7) { + if ((int32_t) rr.r[2] > 0 || (int32_t) rr.r[2] < -7) { ELOG("Flash loader write error\n"); goto error; } @@ -460,7 +460,7 @@ int32_t stm32l1_write_half_pages(stlink_t *sl, flash_loader_t *fl, stm32_addr_t for (off = 0; off < pagesize && !ret; off += 64) { uint32_t chunk = (pagesize - off > 64) ? 64 : pagesize - off; memcpy(sl->q_buf, base + count * pagesize + off, chunk); - ret = stlink_write_mem32(sl, addr + count * pagesize + off, (uint16_t)chunk); + ret = stlink_write_mem32(sl, addr + count * pagesize + off, (uint16_t) chunk); } } @@ -788,7 +788,7 @@ int32_t stlink_flashloader_write(stlink_t *sl, flash_loader_t *fl, stm32_addr_t if (stm32l1_write_half_pages(sl, fl, addr, base, len, pagesize)) { return (-1); } else { - off = (uint32_t)(len / pagesize) * pagesize; + off = (uint32_t) (len / pagesize) * pagesize; } } diff --git a/src/stlink-lib/helper.c b/src/stlink-lib/helper.c index 1e756f1de..860d1b409 100644 --- a/src/stlink-lib/helper.c +++ b/src/stlink-lib/helper.c @@ -19,12 +19,12 @@ uint32_t time_ms() { struct timeval tv; gettimeofday(&tv, NULL); - return (uint32_t)(tv.tv_sec * 1000 + tv.tv_usec / 1000); + return (uint32_t) (tv.tv_sec * 1000 + tv.tv_usec / 1000); } int32_t arg_parse_freq(const char *str) { char *tail; - int32_t value = (int32_t)strtol(str, &tail, 10); + int32_t value = (int32_t) strtol(str, &tail, 10); if (tail[0] == 'M' && tail[1] == '\0') { value = value*1000; diff --git a/src/stlink-lib/lib_md5.c b/src/stlink-lib/lib_md5.c index 62e77252e..1f4a915af 100644 --- a/src/stlink-lib/lib_md5.c +++ b/src/stlink-lib/lib_md5.c @@ -46,10 +46,10 @@ static void* TransformFunction(Md5Context* ctx, void const* data, uintmax_t size uint32_t saved_d; #define GET(n) (ctx->block[(n)]) - #define SET(n) (ctx->block[(n)] = ((uint32_t)ptr[(n) * 4 + 0] << 0) | \ - ((uint32_t)ptr[(n) * 4 + 1] << 8) | \ - ((uint32_t)ptr[(n) * 4 + 2] << 16) | \ - ((uint32_t)ptr[(n) * 4 + 3] << 24)) + #define SET(n) (ctx->block[(n)] = ((uint32_t) ptr[(n) * 4 + 0] << 0) | \ + ((uint32_t) ptr[(n) * 4 + 1] << 8) | \ + ((uint32_t) ptr[(n) * 4 + 2] << 16) | \ + ((uint32_t) ptr[(n) * 4 + 3] << 24)) ptr = (uint8_t*)data; @@ -188,7 +188,7 @@ void Md5Update(Md5Context* Context /* [in out] */, void const* Buffer /* [in] */ Context->hi++; } - Context->hi += (uint32_t)(BufferSize >> 29); + Context->hi += (uint32_t) (BufferSize >> 29); used = saved_lo & 0x3f; @@ -207,7 +207,7 @@ void Md5Update(Md5Context* Context /* [in out] */, void const* Buffer /* [in] */ } if ( BufferSize >= 64 ) { - Buffer = TransformFunction( Context, Buffer, BufferSize & ~(uint32_t)0x3f ); + Buffer = TransformFunction( Context, Buffer, BufferSize & ~(uint32_t) 0x3f ); BufferSize &= 0x3f; } @@ -239,33 +239,33 @@ void Md5Finalise(Md5Context* Context /* [in out] */, MD5_HASH* Digest /* [in] */ memset( &Context->buffer[used], 0, free - 8 ); Context->lo <<= 3; - Context->buffer[56] = (uint8_t)(Context->lo); - Context->buffer[57] = (uint8_t)(Context->lo >> 8); - Context->buffer[58] = (uint8_t)(Context->lo >> 16); - Context->buffer[59] = (uint8_t)(Context->lo >> 24); - Context->buffer[60] = (uint8_t)(Context->hi); - Context->buffer[61] = (uint8_t)(Context->hi >> 8); - Context->buffer[62] = (uint8_t)(Context->hi >> 16); - Context->buffer[63] = (uint8_t)(Context->hi >> 24); + Context->buffer[56] = (uint8_t) (Context->lo); + Context->buffer[57] = (uint8_t) (Context->lo >> 8); + Context->buffer[58] = (uint8_t) (Context->lo >> 16); + Context->buffer[59] = (uint8_t) (Context->lo >> 24); + Context->buffer[60] = (uint8_t) (Context->hi); + Context->buffer[61] = (uint8_t) (Context->hi >> 8); + Context->buffer[62] = (uint8_t) (Context->hi >> 16); + Context->buffer[63] = (uint8_t) (Context->hi >> 24); TransformFunction( Context, Context->buffer, 64 ); - Digest->bytes[0] = (uint8_t)(Context->a); - Digest->bytes[1] = (uint8_t)(Context->a >> 8); - Digest->bytes[2] = (uint8_t)(Context->a >> 16); - Digest->bytes[3] = (uint8_t)(Context->a >> 24); - Digest->bytes[4] = (uint8_t)(Context->b); - Digest->bytes[5] = (uint8_t)(Context->b >> 8); - Digest->bytes[6] = (uint8_t)(Context->b >> 16); - Digest->bytes[7] = (uint8_t)(Context->b >> 24); - Digest->bytes[8] = (uint8_t)(Context->c); - Digest->bytes[9] = (uint8_t)(Context->c >> 8); - Digest->bytes[10] = (uint8_t)(Context->c >> 16); - Digest->bytes[11] = (uint8_t)(Context->c >> 24); - Digest->bytes[12] = (uint8_t)(Context->d); - Digest->bytes[13] = (uint8_t)(Context->d >> 8); - Digest->bytes[14] = (uint8_t)(Context->d >> 16); - Digest->bytes[15] = (uint8_t)(Context->d >> 24); + Digest->bytes[0] = (uint8_t) (Context->a); + Digest->bytes[1] = (uint8_t) (Context->a >> 8); + Digest->bytes[2] = (uint8_t) (Context->a >> 16); + Digest->bytes[3] = (uint8_t) (Context->a >> 24); + Digest->bytes[4] = (uint8_t) (Context->b); + Digest->bytes[5] = (uint8_t) (Context->b >> 8); + Digest->bytes[6] = (uint8_t) (Context->b >> 16); + Digest->bytes[7] = (uint8_t) (Context->b >> 24); + Digest->bytes[8] = (uint8_t) (Context->c); + Digest->bytes[9] = (uint8_t) (Context->c >> 8); + Digest->bytes[10] = (uint8_t) (Context->c >> 16); + Digest->bytes[11] = (uint8_t) (Context->c >> 24); + Digest->bytes[12] = (uint8_t) (Context->d); + Digest->bytes[13] = (uint8_t) (Context->d >> 8); + Digest->bytes[14] = (uint8_t) (Context->d >> 16); + Digest->bytes[15] = (uint8_t) (Context->d >> 24); } /* Md5Calculate diff --git a/src/stlink-lib/map_file.c b/src/stlink-lib/map_file.c index f75996be5..5dae9f27a 100644 --- a/src/stlink-lib/map_file.c +++ b/src/stlink-lib/map_file.c @@ -52,7 +52,7 @@ int32_t check_file(stlink_t *sl, mapped_file_t *mf, stm32_addr_t addr) { aligned_size = (cmp_size + 4) & ~(4 - 1); } - stlink_read_mem32(sl, addr + off, (uint16_t)aligned_size); + stlink_read_mem32(sl, addr + off, (uint16_t) aligned_size); if (memcmp(sl->q_buf, mf->base + off, cmp_size)) { return (-1); @@ -80,7 +80,7 @@ int32_t map_file(mapped_file_t *mf, const char *path) { if (sizeof(st.st_size) != sizeof(size_t)) { // on 32 bit systems, check if there is an overflow - if (st.st_size > (off_t)MAX_FILE_SIZE /*1 GB*/ ) { + if (st.st_size > (off_t) MAX_FILE_SIZE /*1 GB*/ ) { // limit file size to 1 GB fprintf(stderr, "mmap() uint32_t overflow for file %s\n", path); goto on_error; @@ -88,14 +88,14 @@ int32_t map_file(mapped_file_t *mf, const char *path) { } mf->base = - (uint8_t *)mmap(NULL, (size_t)(st.st_size), PROT_READ, MAP_SHARED, fd, 0); + (uint8_t *)mmap(NULL, (size_t) (st.st_size), PROT_READ, MAP_SHARED, fd, 0); if (mf->base == MAP_FAILED) { fprintf(stderr, "mmap() == MAP_FAILED for file %s\n", path); goto on_error; } - mf->len = (uint32_t)st.st_size; + mf->len = (uint32_t) st.st_size; error = 0; // success on_error: diff --git a/src/stlink-lib/md5.c b/src/stlink-lib/md5.c index a5347de59..271a01a20 100644 --- a/src/stlink-lib/md5.c +++ b/src/stlink-lib/md5.c @@ -18,11 +18,11 @@ void md5_calculate(mapped_file_t *mf) { Md5Context md5Context; MD5_HASH md5Hash; Md5Initialise(&md5Context); - Md5Update(&md5Context, mf->base, (uint32_t)mf->len); + Md5Update(&md5Context, mf->base, (uint32_t) mf->len); Md5Finalise(&md5Context, &md5Hash); printf("md5 checksum: "); - for (int32_t i = 0; i < (int32_t)sizeof(md5Hash); i++) { + for (int32_t i = 0; i < (int32_t) sizeof(md5Hash); i++) { printf("%x", md5Hash.bytes[i]); } diff --git a/src/stlink-lib/option_bytes.c b/src/stlink-lib/option_bytes.c index d49c346ef..a5f164506 100644 --- a/src/stlink-lib/option_bytes.c +++ b/src/stlink-lib/option_bytes.c @@ -211,7 +211,7 @@ static int32_t stlink_write_option_control_register_f0(stlink_t *sl, uint32_t op user_options = (option_cr >> option_offset >> 2) & 0xFFFF; user_data = (option_cr >> user_data_offset) & 0xFFFF; -#define VAL_WITH_COMPLEMENT(v) (uint16_t)(((v)&0xFF) | (((~(v))<<8)&0xFF00)) +#define VAL_WITH_COMPLEMENT(v) (uint16_t) (((v)&0xFF) | (((~(v))<<8)&0xFF00)) opt_val[0] = (option_cr & (1 << 1/*OPT_READOUT*/)) ? 0xFFFF : rdp; opt_val[1] = VAL_WITH_COMPLEMENT(user_options); @@ -330,7 +330,7 @@ int32_t stlink_read_option_bytes_f7(stlink_t *sl, uint32_t *option_byte) { return stlink_read_debug32( sl, - sl->option_base + (uint32_t)(sl->option_size / 4 - 1) * sizeof(uint32_t), + sl->option_base + (uint32_t) (sl->option_size / 4 - 1) * sizeof(uint32_t), option_byte); } @@ -919,7 +919,7 @@ int32_t stlink_fwrite_option_bytes(stlink_t *sl, const char *path, stm32_addr_t md5_calculate(&mf); stlink_checksum(&mf); - err = stlink_write_option_bytes(sl, addr, mf.base, (uint32_t)mf.len); + err = stlink_write_option_bytes(sl, addr, mf.base, (uint32_t) mf.len); stlink_fwrite_finalize(sl, addr); unmap_file(&mf); diff --git a/src/stlink-lib/read_write.c b/src/stlink-lib/read_write.c index 4e43d8aa5..877ab3b48 100644 --- a/src/stlink-lib/read_write.c +++ b/src/stlink-lib/read_write.c @@ -18,17 +18,17 @@ // These functions encode and decode little endian uint16 and uint32 values. uint16_t read_uint16(const unsigned char *c, const int32_t pt) { - return ((uint16_t)c[pt]) | ((uint16_t)c[pt + 1] << 8); + return ((uint16_t) c[pt]) | ((uint16_t) c[pt + 1] << 8); } void write_uint16(unsigned char *buf, uint16_t ui) { - buf[0] = (uint8_t)ui; - buf[1] = (uint8_t)(ui >> 8); + buf[0] = (uint8_t) ui; + buf[1] = (uint8_t) (ui >> 8); } uint32_t read_uint32(const unsigned char *c, const int32_t pt) { - return ((uint32_t)c[pt]) | ((uint32_t)c[pt + 1] << 8) | - ((uint32_t)c[pt + 2] << 16) | ((uint32_t)c[pt + 3] << 24); + return ((uint32_t) c[pt]) | ((uint32_t) c[pt + 1] << 8) | + ((uint32_t) c[pt + 2] << 16) | ((uint32_t) c[pt + 3] << 24); } void write_uint32(unsigned char *buf, uint32_t ui) { diff --git a/src/stlink-lib/sg.c b/src/stlink-lib/sg.c index b1d5d7689..c58e22b64 100644 --- a/src/stlink-lib/sg.c +++ b/src/stlink-lib/sg.c @@ -172,7 +172,7 @@ static int32_t dump_CDB_command(uint8_t *cdb, uint8_t cdb_len) { dbugp += sprintf(dbugp, "Sending CDB ["); for (uint8_t i = 0; i < cdb_len; i++) { - dbugp += sprintf(dbugp, " 0x%02x", (uint32_t)cdb[i]); + dbugp += sprintf(dbugp, " 0x%02x", (uint32_t) cdb[i]); } sprintf(dbugp, "]\n"); @@ -288,7 +288,7 @@ static void get_sense(libusb_device_handle *handle, uint8_t endpoint_in, uint8_t } if (transferred != sizeof(sense)) { - WLOG("received unexpected amount of sense: %d != %u\n", transferred, (uint32_t)sizeof(sense)); + WLOG("received unexpected amount of sense: %d != %u\n", transferred, (uint32_t) sizeof(sense)); } uint32_t received_tag; diff --git a/src/stlink-lib/usb.c b/src/stlink-lib/usb.c index e666101a1..e37b531ea 100644 --- a/src/stlink-lib/usb.c +++ b/src/stlink-lib/usb.c @@ -31,7 +31,7 @@ #include "register.h" static inline uint32_t le_to_h_u32(const uint8_t* buf) { - return ((uint32_t)((uint32_t)buf[0] | (uint32_t)buf[1] << 8 | (uint32_t)buf[2] << 16 | (uint32_t)buf[3] << 24)); + return ((uint32_t) ((uint32_t) buf[0] | (uint32_t) buf[1] << 8 | (uint32_t) buf[2] << 16 | (uint32_t) buf[3] << 24)); } static int32_t _stlink_match_speed_map(const uint32_t *map, uint32_t map_size, uint32_t khz) { @@ -98,17 +98,17 @@ ssize_t send_recv(struct stlink_libusb* handle, int32_t terminate, unsigned char while (1) { res = 0; - t = libusb_bulk_transfer(handle->usb_handle, handle->ep_req, txbuf, (int32_t)txsize, &res, 3000); + t = libusb_bulk_transfer(handle->usb_handle, handle->ep_req, txbuf, (int32_t) txsize, &res, 3000); if (t) { ELOG("%s send request failed: %s\n", cmd, libusb_error_name(t)); return (-1); - } else if ((size_t)res != txsize) { - ELOG("%s send request wrote %u bytes, instead of %u\n", cmd, (uint32_t)res, (uint32_t)txsize); + } else if ((size_t) res != txsize) { + ELOG("%s send request wrote %u bytes, instead of %u\n", cmd, (uint32_t) res, (uint32_t) txsize); } if (rxsize != 0) { - t = libusb_bulk_transfer(handle->usb_handle, handle->ep_rep, rxbuf, (int32_t)rxsize, &res, 3000); + t = libusb_bulk_transfer(handle->usb_handle, handle->ep_rep, rxbuf, (int32_t) rxsize, &res, 3000); if (t) { ELOG("%s read reply failed: %s\n", cmd, libusb_error_name(t)); @@ -143,7 +143,7 @@ ssize_t send_recv(struct stlink_libusb* handle, int32_t terminate, unsigned char return (-1); } - if (check_error == CMD_CHECK_REP_LEN && res != (int32_t)rxsize) { + if (check_error == CMD_CHECK_REP_LEN && res != (int32_t) rxsize) { ELOG("%s wrong reply length\n", cmd); res = -1; } @@ -169,7 +169,7 @@ ssize_t send_recv(struct stlink_libusb* handle, int32_t terminate, unsigned char static inline int32_t send_only(struct stlink_libusb* handle, int32_t terminate, unsigned char* txbuf, uint32_t txsize, const char *cmd) { - return ((int32_t)send_recv(handle, terminate, txbuf, txsize, NULL, 0, CMD_CHECK_NO, cmd)); + return ((int32_t) send_recv(handle, terminate, txbuf, txsize, NULL, 0, CMD_CHECK_NO, cmd)); } @@ -682,10 +682,10 @@ int32_t _stlink_usb_set_swdclk(stlink_t* sl, int32_t clk_freq) { cmd[i++] = STLINK_DEBUG_APIV3_SET_COM_FREQ; cmd[i++] = 0; // SWD mode cmd[i++] = 0; - cmd[i++] = (uint8_t)((map[speed_index] >> 0) & 0xFF); - cmd[i++] = (uint8_t)((map[speed_index] >> 8) & 0xFF); - cmd[i++] = (uint8_t)((map[speed_index] >> 16) & 0xFF); - cmd[i++] = (uint8_t)((map[speed_index] >> 24) & 0xFF); + cmd[i++] = (uint8_t) ((map[speed_index] >> 0) & 0xFF); + cmd[i++] = (uint8_t) ((map[speed_index] >> 8) & 0xFF); + cmd[i++] = (uint8_t) ((map[speed_index] >> 16) & 0xFF); + cmd[i++] = (uint8_t) ((map[speed_index] >> 24) & 0xFF); size = send_recv(slu, 1, cmd, slu->cmd_len, data, 8, CMD_CHECK_STATUS, "SET_COM_FREQ"); @@ -728,7 +728,7 @@ int32_t _stlink_usb_read_mem32(stlink_t *sl, uint32_t addr, uint16_t len) { return (-1); } - sl->q_len = (int32_t)size; + sl->q_len = (int32_t) size; stlink_print_data(sl); return (0); @@ -759,7 +759,7 @@ int32_t _stlink_usb_read_all_regs(stlink_t *sl, struct stlink_reg *regp) { /* V1: regs data from offset 0 */ /* V2: status at offset 0, regs data from offset 4 */ int32_t reg_offset = sl->version.jtag_api == STLINK_JTAG_API_V1 ? 0 : 4; - sl->q_len = (int32_t)size; + sl->q_len = (int32_t) size; stlink_print_data(sl); for (i = 0; i < 16; i++) regp->r[i] = read_uint32(sl->q_buf, reg_offset + i * 4); @@ -799,14 +799,14 @@ int32_t _stlink_usb_read_reg(stlink_t *sl, int32_t r_idx, struct stlink_reg *reg cmd[i++] = STLINK_DEBUG_APIV2_READREG; } - cmd[i++] = (uint8_t)r_idx; + cmd[i++] = (uint8_t) r_idx; size = send_recv(slu, 1, cmd, slu->cmd_len, data, rep_len, CMD_CHECK_RETRY, "READREG"); if (size < 0) { return (-1); } - sl->q_len = (int32_t)size; + sl->q_len = (int32_t) size; stlink_print_data(sl); r = read_uint32(sl->q_buf, reg_offset); DLOG("r_idx (%2d) = 0x%08x\n", r_idx, r); @@ -856,10 +856,10 @@ int32_t _stlink_usb_read_unsupported_reg(stlink_t *sl, int32_t r_idx, struct stl switch (r_idx) { case 0x14: - regp->primask = (uint8_t)(r & 0xFF); - regp->basepri = (uint8_t)((r >> 8) & 0xFF); - regp->faultmask = (uint8_t)((r >> 16) & 0xFF); - regp->control = (uint8_t)((r >> 24) & 0xFF); + regp->primask = (uint8_t) (r & 0xFF); + regp->basepri = (uint8_t) ((r >> 8) & 0xFF); + regp->faultmask = (uint8_t) ((r >> 16) & 0xFF); + regp->control = (uint8_t) ((r >> 24) & 0xFF); break; case 0x21: regp->fpscr = r; @@ -902,32 +902,32 @@ int32_t _stlink_usb_write_unsupported_reg(stlink_t *sl, uint32_t val, int32_t r_ if (ret == -1) { return (ret); } - val = (uint8_t)(val >> 24); + val = (uint8_t) (val >> 24); switch (r_idx) { case 0x1C: /* control */ - val = (((uint32_t)val) << 24) | - (((uint32_t)regp->faultmask) << 16) | - (((uint32_t)regp->basepri) << 8) | - ((uint32_t)regp->primask); + val = (((uint32_t) val) << 24) | + (((uint32_t) regp->faultmask) << 16) | + (((uint32_t) regp->basepri) << 8) | + ((uint32_t) regp->primask); break; case 0x1D: /* faultmask */ - val = (((uint32_t)regp->control) << 24) | - (((uint32_t)val) << 16) | - (((uint32_t)regp->basepri) << 8) | - ((uint32_t)regp->primask); + val = (((uint32_t) regp->control) << 24) | + (((uint32_t) val) << 16) | + (((uint32_t) regp->basepri) << 8) | + ((uint32_t) regp->primask); break; case 0x1E: /* basepri */ - val = (((uint32_t)regp->control) << 24) | - (((uint32_t)regp->faultmask) << 16) | - (((uint32_t)val) << 8) | - ((uint32_t)regp->primask); + val = (((uint32_t) regp->control) << 24) | + (((uint32_t) regp->faultmask) << 16) | + (((uint32_t) val) << 8) | + ((uint32_t) regp->primask); break; case 0x1F: /* primask */ - val = (((uint32_t)regp->control) << 24) | - (((uint32_t)regp->faultmask) << 16) | - (((uint32_t)regp->basepri) << 8) | - ((uint32_t)val); + val = (((uint32_t) regp->control) << 24) | + (((uint32_t) regp->faultmask) << 16) | + (((uint32_t) regp->basepri) << 8) | + ((uint32_t) val); break; } @@ -1026,7 +1026,7 @@ int32_t _stlink_usb_read_trace(stlink_t* sl, uint8_t* buf, uint32_t size) { if (send_size < 0) { return (-1); } else if (send_size != 2) { - ELOG("STLINK_DEBUG_APIV2_GET_TRACE_NB reply size %d\n", (int32_t)send_size); + ELOG("STLINK_DEBUG_APIV2_GET_TRACE_NB reply size %d\n", (int32_t) send_size); return (-1); } @@ -1041,7 +1041,7 @@ int32_t _stlink_usb_read_trace(stlink_t* sl, uint8_t* buf, uint32_t size) { int32_t res = 0; int32_t t = libusb_bulk_transfer(slu->usb_handle, slu->ep_trace, buf, trace_count, &res, 3000); - if (t || res != (int32_t)trace_count) { + if (t || res != (int32_t) trace_count) { ELOG("read_trace read error %d\n", t); return (-1); } @@ -1084,7 +1084,7 @@ static stlink_backend_t _stlink_usb_backend = { }; /* return the length of serial or (0) in case of errors */ -size_t stlink_serial(struct libusb_device_handle *handle, struct libusb_device_descriptor *desc, char *serial) { +uint32_t stlink_serial(struct libusb_device_handle *handle, struct libusb_device_descriptor *desc, char *serial) { unsigned char desc_serial[(STLINK_SERIAL_LENGTH) * 2]; /* truncate the string in the serial buffer */ @@ -1172,7 +1172,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, enum connect_type connect, if (ret) { continue; } // could not open device - uint32_t serial_len = (uint32_t)stlink_serial(handle, &desc, sl->serial); + uint32_t serial_len = stlink_serial(handle, &desc, sl->serial); libusb_close(handle); @@ -1376,7 +1376,7 @@ static uint32_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[], break; } - uint32_t serial_len = (uint32_t)stlink_serial(handle, &desc, serial); + uint32_t serial_len = stlink_serial(handle, &desc, serial); libusb_close(handle); @@ -1397,7 +1397,7 @@ static uint32_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[], return (slcur); } -size_t stlink_probe_usb(stlink_t **stdevs[], enum connect_type connect, int32_t freq) { +uint32_t stlink_probe_usb(stlink_t **stdevs[], enum connect_type connect, int32_t freq) { libusb_device **devs; stlink_t **sldevs; diff --git a/src/stlink-lib/usb.h b/src/stlink-lib/usb.h index 783144471..2a76182b0 100644 --- a/src/stlink-lib/usb.h +++ b/src/stlink-lib/usb.h @@ -102,10 +102,10 @@ int32_t _stlink_usb_read_trace(stlink_t* sl, uint8_t* buf, uint32_t size); // static stlink_backend_t _stlink_usb_backend = { }; -size_t stlink_serial(struct libusb_device_handle *handle, struct libusb_device_descriptor *desc, char *serial); +uint32_t stlink_serial(struct libusb_device_handle *handle, struct libusb_device_descriptor *desc, char *serial); stlink_t *stlink_open_usb(enum ugly_loglevel verbose, enum connect_type connect, char serial[STLINK_SERIAL_BUFFER_SIZE], int32_t freq); // static uint32_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[], enum connect_type connect, int32_t freq); -size_t stlink_probe_usb(stlink_t **stdevs[], enum connect_type connect, int32_t freq); +uint32_t stlink_probe_usb(stlink_t **stdevs[], enum connect_type connect, int32_t freq); void stlink_probe_usb_free(stlink_t **stdevs[], uint32_t size); #endif // USB_H diff --git a/src/win32/mmap.c b/src/win32/mmap.c index 8bddb5094..1e2f3c7d4 100644 --- a/src/win32/mmap.c +++ b/src/win32/mmap.c @@ -23,7 +23,7 @@ void *mmap (void *addr, uint32_t len, int32_t prot, int32_t flags, int32_t fd, i count = read(fd, buf, len); - if (count != (ssize_t)len) { + if (count != (ssize_t) len) { free (buf); return (MAP_FAILED); } diff --git a/src/win32/sys_time.c b/src/win32/sys_time.c index f1ebd63b9..7cdc51c17 100644 --- a/src/win32/sys_time.c +++ b/src/win32/sys_time.c @@ -17,8 +17,8 @@ int32_t gettimeofday(struct timeval *tv, struct timezone *tz) { ulint.LowPart = ftime.dwLowDateTime; ulint.HighPart = ftime.dwHighDateTime; - tv->tv_sec = (int32_t)(ulint.QuadPart / 10000000L); - tv->tv_usec = (int32_t)(ulint.QuadPart % 10000000L); + tv->tv_sec = (int32_t) (ulint.QuadPart / 10000000L); + tv->tv_usec = (int32_t) (ulint.QuadPart % 10000000L); } if (NULL != tz) { diff --git a/tests/flash.c b/tests/flash.c index 4d9ac5185..7c54221f5 100644 --- a/tests/flash.c +++ b/tests/flash.c @@ -49,7 +49,7 @@ static bool execute_test(const struct Test * test) { strcpy(cmd_line, test->cmd_line); for (char * tok = strtok(cmd_line, " "); tok; tok = strtok(NULL, " ")) { - if ((size_t)ac >= sizeof(av) / sizeof(av[0])) return (false); + if ((size_t) ac >= sizeof(av) / sizeof(av[0])) return (false); av[ac] = tok; ++ac;