[Openocd-svn] r1935 - trunk/src/flash

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-28 01:54:16 +0200 (Thu, 28 May 2009)
New Revision: 1935

Modified:
   trunk/src/flash/mflash.c
Log:
Fix potentialyl unaligned memory accesses in mflash driver.

Modified: trunk/src/flash/mflash.c
===================================================================
--- trunk/src/flash/mflash.c	2009-05-27 21:03:51 UTC (rev 1934)
+++ trunk/src/flash/mflash.c	2009-05-27 23:54:16 UTC (rev 1935)
@@ -1126,8 +1126,9 @@
 	u8 buff[512];
 
 	memset(buff, 0xff, 512);
-	*((u32 *)&buff[0]) = pll->lock_cyc;	/* PLL Lock cycle */
-	*((u16 *)&buff[4]) = pll->feedback_div;	/* PLL Feedback 9bit Divider */
+	/* PLL Lock cycle and Feedback 9bit Divider */
+	memcpy(buff, &pll->lock_cyc, sizeof(u32));
+	memcpy(buff + 4, &pll->feedback_div, sizeof(u16));
 	buff[6] = pll->input_div;		/* PLL Input 5bit Divider */
 	buff[7] = pll->output_div;		/* PLL Output Divider */