This is an automated email from Gerrit. Ivan Ovcherenko ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/1243
-- gerrit commit 1daff513b77f2f65d301fdf1fdb015bcf9915da5 Author: Ivan Ovcherenko <[email protected]> Date: Thu Mar 14 20:35:54 2013 +0400 build: fix up warnings Fix up build warnings due the clang build with -Werror by default. Change-Id: Ic04475720ae43a8928f50a599c7bfdd7c9ed6c7e Signed-off-by: Ivan Ovcherenko <[email protected]> diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c index 295c707..bcdbd9e 100644 --- a/src/flash/nor/efm32.c +++ b/src/flash/nor/efm32.c @@ -370,7 +370,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank) data_size = bank->num_sectors / 8; /* number of data bytes */ data_size /= 4; /* ...and data dwords */ - ptr = (uint32_t *)efm32x_info->lb_page; + ptr = (uint32_t *)(void *)efm32x_info->lb_page; for (i = 0; i < data_size; i++, ptr++) { ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+i*4, ptr); @@ -383,7 +383,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank) /* also, read ULW, DLW and MLW */ /* ULW, word 126 */ - ptr = ((uint32_t *)efm32x_info->lb_page) + 126; + ptr = ((uint32_t *)(void *)efm32x_info->lb_page) + 126; ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+126*4, ptr); if (ERROR_OK != ret) { LOG_ERROR("Failed to read ULW"); @@ -391,7 +391,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank) } /* DLW, word 127 */ - ptr = ((uint32_t *)efm32x_info->lb_page) + 127; + ptr = ((uint32_t *)(void *)efm32x_info->lb_page) + 127; ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+127*4, ptr); if (ERROR_OK != ret) { LOG_ERROR("Failed to read DLW"); @@ -399,7 +399,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank) } /* MLW, word 125, present in GG and LG */ - ptr = ((uint32_t *)efm32x_info->lb_page) + 125; + ptr = ((uint32_t *)(void *)efm32x_info->lb_page) + 125; ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+125*4, ptr); if (ERROR_OK != ret) { LOG_ERROR("Failed to read MLW"); @@ -427,7 +427,7 @@ static int efm32x_write_lock_data(struct flash_bank *bank) static int efm32x_get_page_lock(struct flash_bank *bank, size_t page) { struct efm32x_flash_bank *efm32x_info = bank->driver_priv; - uint32_t dw = ((uint32_t *)efm32x_info->lb_page)[page >> 5]; + uint32_t dw = ((uint32_t *)(void *)efm32x_info->lb_page)[page >> 5]; uint32_t mask = 0; mask = 1 << (page & 0x1f); @@ -438,7 +438,7 @@ static int efm32x_get_page_lock(struct flash_bank *bank, size_t page) static int efm32x_set_page_lock(struct flash_bank *bank, size_t page, int set) { struct efm32x_flash_bank *efm32x_info = bank->driver_priv; - uint32_t *dw = &((uint32_t *)efm32x_info->lb_page)[page >> 5]; + uint32_t *dw = &((uint32_t *)(void *)efm32x_info->lb_page)[page >> 5]; uint32_t mask = 0; mask = 1 << (page & 0x1f); diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 7e32098..5c58835 100644 --- a/src/flash/nor/stm32f1x.c +++ b/src/flash/nor/stm32f1x.c @@ -1372,9 +1372,9 @@ COMMAND_HANDLER(stm32x_handle_options_read_command) } command_print(CMD_CTX, "User Option0: 0x%02" PRIx8, - (user_data >> stm32x_info->user_data_offset) & 0xff); + (unsigned char)((user_data >> stm32x_info->user_data_offset) & 0xff)); command_print(CMD_CTX, "User Option1: 0x%02" PRIx8, - (user_data >> (stm32x_info->user_data_offset + 8)) & 0xff); + (unsigned char)((user_data >> (stm32x_info->user_data_offset + 8)) & 0xff)); return ERROR_OK; } diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index 9a40ed9..045555a 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -1503,8 +1503,6 @@ static void minimodule_reset(int trst, int srst) static void turtle_reset(int trst, int srst) { - trst = trst; - if (srst == 1) low_output |= nSRST; else if (srst == 0) diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 957aeae..3d0d27f 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -187,7 +187,7 @@ static char *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr) int rtos_qsymbol(struct connection *connection, char *packet, int packet_size) { int rtos_detected = 0; - uint64_t addr; + uint64_t addr = 0; size_t reply_len; char reply[GDB_BUFFER_SIZE], cur_sym[GDB_BUFFER_SIZE / 2] = "", *next_sym; struct target *target = get_target_from_connection(connection); diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c index 240f867..d11f9f5 100644 --- a/src/target/oocd_trace.c +++ b/src/target/oocd_trace.c @@ -113,7 +113,7 @@ static int oocd_trace_init(struct etm_context *etm_ctx) tcgetattr(oocd_trace->tty_fd, &oocd_trace->oldtio); /* save current port settings */ bzero(&oocd_trace->newtio, sizeof(oocd_trace->newtio)); - oocd_trace->newtio.c_cflag = CS8 | CLOCAL | CREAD | B2500000; + oocd_trace->newtio.c_cflag = CS8 | CLOCAL | CREAD | B230400; oocd_trace->newtio.c_iflag = IGNPAR | IGNBRK | IXON | IXOFF; oocd_trace->newtio.c_oflag = 0; diff --git a/src/target/target.c b/src/target/target.c index db676b9..962b1ff 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -5011,7 +5011,7 @@ static int target_create(Jim_GetOptInfo *goi) } /* now - create the new target name command */ - const const struct command_registration target_subcommands[] = { + const struct command_registration target_subcommands[] = { { .chain = target_instance_command_handlers, }, @@ -5020,7 +5020,7 @@ static int target_create(Jim_GetOptInfo *goi) }, COMMAND_REGISTRATION_DONE }; - const const struct command_registration target_commands[] = { + const struct command_registration target_commands[] = { { .name = cp, .mode = COMMAND_ANY, -- ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
