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/1771
-- gerrit commit 8cacbcef67523a80e3f1fb18be74c57e7898329b Author: Andreas Fritiofson <[email protected]> Date: Sat Sep 28 22:11:45 2013 +0200 lpcspifi: Fix byte order bug Found by grepping for pointer casts. Change-Id: I42ef3ebcce9fc6391154888b48601ede8377c34e Signed-off-by: Andreas Fritiofson <[email protected]> diff --git a/src/flash/nor/lpcspifi.c b/src/flash/nor/lpcspifi.c index 0c12e64..a7032d5 100644 --- a/src/flash/nor/lpcspifi.c +++ b/src/flash/nor/lpcspifi.c @@ -774,6 +774,7 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id) uint32_t ssp_base = lpcspifi_info->ssp_base; uint32_t io_base = lpcspifi_info->io_base; uint32_t value; + uint8_t id_buf[3]; int retval; if (target->state != TARGET_HALTED) { @@ -808,7 +809,7 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id) if (retval == ERROR_OK) retval = ssp_read_reg(target, ssp_base, SSP_DATA, &value); if (retval == ERROR_OK) - ((uint8_t *)id)[0] = value; + id_buf[0] = value; /* Dummy write to clock in data */ if (retval == ERROR_OK) @@ -818,7 +819,7 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id) if (retval == ERROR_OK) retval = ssp_read_reg(target, ssp_base, SSP_DATA, &value); if (retval == ERROR_OK) - ((uint8_t *)id)[1] = value; + id_buf[1] = value; /* Dummy write to clock in data */ if (retval == ERROR_OK) @@ -828,10 +829,12 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id) if (retval == ERROR_OK) retval = ssp_read_reg(target, ssp_base, SSP_DATA, &value); if (retval == ERROR_OK) - ((uint8_t *)id)[2] = value; + id_buf[2] = value; if (retval == ERROR_OK) retval = ssp_setcs(target, io_base, 1); + if (retval == ERROR_OK) + *id = id_buf[2] << 16 | id_buf[1] << 8 | id_buf[0]; return retval; } @@ -844,7 +847,7 @@ static int lpcspifi_probe(struct flash_bank *bank) uint32_t io_base; uint32_t ioconfig_base; struct flash_sector *sectors; - uint32_t id = 0; /* silence uninitialized warning */ + uint32_t id; struct lpcspifi_target *target_device; int retval; -- ------------------------------------------------------------------------------ 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=60135991&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
