From f6a3fc818bc6a24b6c5bbcc6057f72d2b0b2e2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Fri, 3 Sep 2010 22:49:37 +0200 Subject: [PATCH] warnings: fix alignment warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These warnings are for architectures that do not support non-aligned word access. Signed-off-by: Øyvind Harboe --- src/flash/mflash.c | 4 ++-- src/flash/nand/lpc3180.c | 4 ++-- src/flash/nor/at91sam3.c | 4 ++-- src/helper/types.h | 2 +- src/pld/virtex2.c | 2 +- src/target/arm11.c | 4 ++-- src/target/arm_adi_v5.c | 2 +- src/target/arm_jtag.h | 4 ++-- src/target/avr32_ap7k.c | 8 ++++---- src/target/avr32_mem.c | 6 +++--- src/target/etb.c | 2 +- src/target/mips_m4k.c | 2 +- src/target/xscale.c | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 43721280e..26b85b1fb 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -1121,7 +1121,7 @@ static int mg_storage_config(void) != ERROR_OK) return ret; - mg_gen_ataid((mg_io_type_drv_info *)buff); + mg_gen_ataid((mg_io_type_drv_info *)(void *)buff); if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo)) != ERROR_OK) @@ -1149,7 +1149,7 @@ static int mg_boot_config(void) buff[0] = mg_op_mode_snd; /* operation mode */ buff[1] = MG_UNLOCK_OTP_AREA; buff[2] = 4; /* boot size */ - *((uint32_t *)(buff + 4)) = 0; /* XIP size */ + *((uint32_t *)(void *)(buff + 4)) = 0; /* XIP size */ if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo)) != ERROR_OK) diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c index 93d00d5c8..d81443d1e 100644 --- a/src/flash/nand/lpc3180.c +++ b/src/flash/nand/lpc3180.c @@ -1119,9 +1119,9 @@ static int lpc3180_read_page(struct nand_device *nand, uint32_t page, uint8_t *d target_read_memory(target, target_mem_base+SPARE_OFFS, 4, 16, ecc_flash_buffer); target_read_memory(target, target_mem_base+ECC_OFFS, 4, 8, ecc_hw_buffer); for(i=0;istruct_offset)); + return ((uint32_t *)(void *)(((char *)(pCfg)) + pList->struct_offset)); } @@ -1756,7 +1756,7 @@ sam3_GetReg(struct sam3_chip *pChip, uint32_t *goes_here) // calculate where this one go.. // it is "possibly" this register. - pPossible = ((uint32_t *)(((char *)(&(pChip->cfg))) + pReg->struct_offset)); + pPossible = ((uint32_t *)(void *)(((char *)(&(pChip->cfg))) + pReg->struct_offset)); // well? Is it this register if (pPossible == goes_here) { diff --git a/src/helper/types.h b/src/helper/types.h index 1010dcd96..04b005945 100644 --- a/src/helper/types.h +++ b/src/helper/types.h @@ -80,7 +80,7 @@ typedef bool _Bool; */ #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) + (type *)( (void *) ( (char *)__mptr - offsetof(type,member) ) );}) /** diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 19637366a..f4657bcf4 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -78,7 +78,7 @@ static int virtex2_send_32(struct pld_device *pld_device, static __inline__ void virtexflip32(jtag_callback_data_t arg) { uint8_t *in = (uint8_t *)arg; - *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32); + *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32); } static int virtex2_receive_32(struct pld_device *pld_device, diff --git a/src/target/arm11.c b/src/target/arm11.c index 85d45b009..9955143ad 100644 --- a/src/target/arm11.c +++ b/src/target/arm11.c @@ -901,7 +901,7 @@ static int arm11_read_memory_inner(struct target *target, { uint32_t instr = !arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00; /** \todo TODO: buffer cast to uint32_t* causes alignment warnings */ - uint32_t *words = (uint32_t *)buffer; + uint32_t *words = (uint32_t *)(void *)buffer; /* LDC p14,c5,[R0],#4 */ /* LDC p14,c5,[R0] */ @@ -1023,7 +1023,7 @@ static int arm11_write_memory_inner(struct target *target, uint32_t instr = !no_increment ? 0xeca05e01 : 0xed805e00; /** \todo TODO: buffer cast to uint32_t* causes alignment warnings */ - uint32_t *words = (uint32_t*)buffer; + uint32_t *words = (uint32_t*)(void *)buffer; /* "burst" here just means trusting each instruction executes * fully before we run the next one: per-word roundtrips, to diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index b26175b30..34147967a 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -316,7 +316,7 @@ int mem_ap_write_buf_u32(struct adiv5_dap *dap, uint8_t *buffer, int count, uint for (writecount = 0; writecount < blocksize; writecount++) { retval = dap_queue_ap_write(dap, AP_REG_DRW, - *(uint32_t *) (buffer + 4 * writecount)); + *(uint32_t *) ((void *) (buffer + 4 * writecount))); if (retval != ERROR_OK) break; } diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h index f58127818..e90abfe04 100644 --- a/src/target/arm_jtag.h +++ b/src/target/arm_jtag.h @@ -77,13 +77,13 @@ int arm_jtag_setup_connection(struct arm_jtag *jtag_info); static __inline__ void arm7flip32(jtag_callback_data_t arg) { uint8_t *in = (uint8_t *)arg; - *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32); + *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32); } static __inline__ void arm_le_to_h_u32(jtag_callback_data_t arg) { uint8_t *in = (uint8_t *)arg; - *((uint32_t *)in) = le_to_h_u32(in); + *((uint32_t *)arg) = le_to_h_u32(in); } diff --git a/src/target/avr32_ap7k.c b/src/target/avr32_ap7k.c index a5cdbe47b..ed10847ab 100644 --- a/src/target/avr32_ap7k.c +++ b/src/target/avr32_ap7k.c @@ -499,10 +499,10 @@ static int avr32_ap7k_read_memory(struct target *target, uint32_t address, switch (size) { case 4: - return avr32_jtag_read_memory32(&ap7k->jtag, address, count, (uint32_t*)buffer); + return avr32_jtag_read_memory32(&ap7k->jtag, address, count, (uint32_t*)(void *)buffer); break; case 2: - return avr32_jtag_read_memory16(&ap7k->jtag, address, count, (uint16_t*)buffer); + return avr32_jtag_read_memory16(&ap7k->jtag, address, count, (uint16_t*)(void *)buffer); break; case 1: return avr32_jtag_read_memory8(&ap7k->jtag, address, count, buffer); @@ -537,10 +537,10 @@ static int avr32_ap7k_write_memory(struct target *target, uint32_t address, switch (size) { case 4: - return avr32_jtag_write_memory32(&ap7k->jtag, address, count, (uint32_t*)buffer); + return avr32_jtag_write_memory32(&ap7k->jtag, address, count, (uint32_t*)(void *)buffer); break; case 2: - return avr32_jtag_write_memory16(&ap7k->jtag, address, count, (uint16_t*)buffer); + return avr32_jtag_write_memory16(&ap7k->jtag, address, count, (uint16_t*)(void *)buffer); break; case 1: return avr32_jtag_write_memory8(&ap7k->jtag, address, count, buffer); diff --git a/src/target/avr32_mem.c b/src/target/avr32_mem.c index 0767c55c7..fe6b8f0f1 100644 --- a/src/target/avr32_mem.c +++ b/src/target/avr32_mem.c @@ -112,7 +112,7 @@ int avr32_jtag_read_memory8(struct avr32_jtag *jtag_info, if (addr & 3) { retval = avr32_jtag_mwa_read(jtag_info, SLAVE_HSB_UNCACHED, - addr + i, (uint32_t*)data); + addr + i, (uint32_t*)(void *)data); if (retval != ERROR_OK) return retval; @@ -126,7 +126,7 @@ int avr32_jtag_read_memory8(struct avr32_jtag *jtag_info, for (; i < (count & ~3); i+=4) { retval = avr32_jtag_mwa_read(jtag_info, SLAVE_HSB_UNCACHED, - addr + i, (uint32_t*)data); + addr + i, (uint32_t*)(void *)data); if (retval != ERROR_OK) return retval; @@ -139,7 +139,7 @@ int avr32_jtag_read_memory8(struct avr32_jtag *jtag_info, if (i < count) { retval = avr32_jtag_mwa_read(jtag_info, SLAVE_HSB_UNCACHED, - addr + i, (uint32_t*)data); + addr + i, (uint32_t*)(void *)data); if (retval != ERROR_OK) return retval; diff --git a/src/target/etb.c b/src/target/etb.c index ba47c39ae..489b9ed56 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -166,7 +166,7 @@ static void etb_getbuf(jtag_callback_data_t arg) { uint8_t *in = (uint8_t *)arg; - *((uint32_t *)in) = buf_get_u32(in, 0, 32); + *((uint32_t *)arg) = buf_get_u32(in, 0, 32); } diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index 62c484a98..c0adc066e 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -1000,7 +1000,7 @@ static int mips_m4k_bulk_write_memory(struct target *target, uint32_t address, } retval = mips32_pracc_fastdata_xfer(ejtag_info, source, write_t, address, - count, (uint32_t*) buffer); + count, (uint32_t*) (void *)buffer); if (retval != ERROR_OK) { /* FASTDATA access failed, try normal memory write */ diff --git a/src/target/xscale.c b/src/target/xscale.c index 37a243857..e0ce400b4 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -244,7 +244,7 @@ static int xscale_read_dcsr(struct target *target) static void xscale_getbuf(jtag_callback_data_t arg) { uint8_t *in = (uint8_t *)arg; - *((uint32_t *)in) = buf_get_u32(in, 0, 32); + *((uint32_t *)arg) = buf_get_u32(in, 0, 32); } static int xscale_receive(struct target *target, uint32_t *buffer, int num_words)