This is an automated email from Gerrit. Andreas Fritiofson ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/1669
-- gerrit commit abe5742db2777f66348fd0b333a1cf145bd69efd Author: Andreas Fritiofson <[email protected]> Date: Sat Sep 28 17:28:25 2013 +0200 Remove unnecessary (void *) When pointer casts are needed, cast directly to the correct type, instead of going via void*. Don't explicitly cast to void* if it would have been done implicitly. Change-Id: I4093209200051c5eb62847d00a4b9c8567480068 Signed-off-by: Andreas Fritiofson <[email protected]> diff --git a/src/flash/mflash.c b/src/flash/mflash.c index b329c7f..ea1673f 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -1073,16 +1073,16 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo) pSegIdDrvInfo->vendor_unique1[1] = 0x7570; pSegIdDrvInfo->vendor_unique1[2] = 0x8888; - memcpy(pSegIdDrvInfo->serial_number, (void *)g_strSEG_SerialNum, 20); + memcpy(pSegIdDrvInfo->serial_number, g_strSEG_SerialNum, 20); /* 0x2 : dual buffer */ pSegIdDrvInfo->buffer_type = 0x2; /* buffer size : 2KB */ pSegIdDrvInfo->buffer_sector_size = 0x800; pSegIdDrvInfo->number_of_ecc_bytes = 0; - memcpy(pSegIdDrvInfo->firmware_revision, (void *)g_strSEG_FWRev, 8); + memcpy(pSegIdDrvInfo->firmware_revision, g_strSEG_FWRev, 8); - memcpy(pSegIdDrvInfo->model_number, (void *)g_strSEG_ModelNum, 40); + memcpy(pSegIdDrvInfo->model_number, g_strSEG_ModelNum, 40); pSegIdDrvInfo->maximum_block_transfer = 0x4; pSegIdDrvInfo->vendor_unique2 = 0x0; @@ -1131,7 +1131,7 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo) pSegIdDrvInfo->recommend_dma_cyc = 0x1E0; pSegIdDrvInfo->min_pio_cyc_no_iordy = 0x1E0; pSegIdDrvInfo->min_pio_cyc_with_iordy = 0x1E0; - memset((void *)pSegIdDrvInfo->reserved3, 0x00, 22); + memset(pSegIdDrvInfo->reserved3, 0x00, 22); /* b7 : ATA/ATAPI-7 ,b6 : ATA/ATAPI-6 ,b5 : ATA/ATAPI-5,b4 : ATA/ATAPI-4 */ pSegIdDrvInfo->major_ver_num = 0x7E; /* 0x1C : ATA/ATAPI-6 T13 1532D revision1 */ @@ -1155,13 +1155,13 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo) /* Advanced power management level 1 */ pSegIdDrvInfo->adv_pwr_mgm_lvl_val = 0x0; pSegIdDrvInfo->reserved5 = 0x0; - memset((void *)pSegIdDrvInfo->reserved6, 0x00, 68); + memset(pSegIdDrvInfo->reserved6, 0x00, 68); /* Security mode feature is disabled */ pSegIdDrvInfo->security_stas = 0x0; - memset((void *)pSegIdDrvInfo->vendor_uniq_bytes, 0x00, 62); + memset(pSegIdDrvInfo->vendor_uniq_bytes, 0x00, 62); /* CFA power mode 1 support in maximum 200mA */ pSegIdDrvInfo->cfa_pwr_mode = 0x0100; - memset((void *)pSegIdDrvInfo->reserved7, 0x00, 190); + memset(pSegIdDrvInfo->reserved7, 0x00, 190); } static int mg_storage_config(void) diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c index 62eb7d1..7f61563 100644 --- a/src/target/adi_v5_jtag.c +++ b/src/target/adi_v5_jtag.c @@ -356,7 +356,7 @@ static int jtag_idcode_q_read(struct adiv5_dap *dap, fields[0].num_bits = 32; fields[0].out_value = NULL; - fields[0].in_value = (void *) data; + fields[0].in_value = (uint8_t *) data; jtag_add_dr_scan(jtag_info->tap, 1, fields, TAP_IDLE); diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c index d7cd020..fd8d254 100644 --- a/src/target/arm11_dbgtap.c +++ b/src/target/arm11_dbgtap.c @@ -599,7 +599,7 @@ int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap, uint8_t *ReadyPos = Readies; while (count--) { - chain5_fields[0].out_value = (void *)(data++); + chain5_fields[0].out_value = (uint8_t *)(data++); chain5_fields[1].in_value = ReadyPos++; if (count > 0) { diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c index bdf572e..06a433f 100644 --- a/src/target/arm_semihosting.c +++ b/src/target/arm_semihosting.c @@ -323,7 +323,7 @@ static int do_semihosting(struct target *target) if (l < s) result = -1; else { - retval = target_write_buffer(target, a, s, (void *)arg); + retval = target_write_buffer(target, a, s, (uint8_t *)arg); if (retval != ERROR_OK) return retval; result = 0; diff --git a/src/target/armv7a.c b/src/target/armv7a.c index 80d7a6e..ae58909 100644 --- a/src/target/armv7a.c +++ b/src/target/armv7a.c @@ -468,7 +468,7 @@ static int armv7a_l2x_cache_init(struct target *target, uint32_t base, uint32_t l2x_cache->base,l2x_cache->way);*/ if (armv7a->armv7a_mmu.armv7a_cache.l2_cache) LOG_INFO("cache l2 already initialized\n"); - armv7a->armv7a_mmu.armv7a_cache.l2_cache = (void *) l2x_cache; + armv7a->armv7a_mmu.armv7a_cache.l2_cache = l2x_cache; /* initialize l1 / l2x cache function */ armv7a->armv7a_mmu.armv7a_cache.flush_all_data_cache = armv7a_l2x_flush_all_data; @@ -482,7 +482,7 @@ static int armv7a_l2x_cache_init(struct target *target, uint32_t base, uint32_t armv7a = target_to_armv7a(curr); if (armv7a->armv7a_mmu.armv7a_cache.l2_cache) LOG_ERROR("smp target : cache l2 already initialized\n"); - armv7a->armv7a_mmu.armv7a_cache.l2_cache = (void *) l2x_cache; + armv7a->armv7a_mmu.armv7a_cache.l2_cache = l2x_cache; armv7a->armv7a_mmu.armv7a_cache.flush_all_data_cache = armv7a_l2x_flush_all_data; armv7a->armv7a_mmu.armv7a_cache.display_cache_info = diff --git a/src/target/etm.c b/src/target/etm.c index be5dd02..ebffd48 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -318,7 +318,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target, etm_core, 1); etm_get_reg(reg_list); - etm_ctx->config = buf_get_u32((void *)&arch_info->value, 0, 32); + etm_ctx->config = buf_get_u32(&arch_info->value, 0, 32); config = etm_ctx->config; /* figure ETM version then add base registers */ @@ -334,7 +334,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target, etm_core + 1, 1); etm_get_reg(reg_list + 1); etm_ctx->id = buf_get_u32( - (void *)&arch_info[1].value, 0, 32); + &arch_info[1].value, 0, 32); LOG_DEBUG("ETM ID: %08x", (unsigned) etm_ctx->id); bcd_vers = 0x10 + (((etm_ctx->id) >> 4) & 0xff); diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index 3457b78..6d51c56 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -422,7 +422,7 @@ int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t, uint32_ fields[1].in_value = NULL; buf_set_u32(t, 0, 32, *data); } else - fields[1].in_value = (void *) data; + fields[1].in_value = (uint8_t *) data; jtag_add_dr_scan(tap, 2, fields, TAP_IDLE); -- ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
