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

[<oh...@ma...>]

Author: oharboe
Date: 2009-04-21 07:36:53 +0200 (Tue, 21 Apr 2009)
New Revision: 1484

Modified:
   trunk/src/flash/str9x.c
Log:
Zach Welch <zw...@su...> fix str9x type-punned pointer

Modified: trunk/src/flash/str9x.c
===================================================================
--- trunk/src/flash/str9x.c	2009-04-21 05:35:51 UTC (rev 1483)
+++ trunk/src/flash/str9x.c	2009-04-21 05:36:53 UTC (rev 1484)
@@ -194,6 +194,7 @@
 	int i;
 	u32 adr;
 	u32 status = 0;
+	u16 hstatus = 0;
 
 	if (bank->target->state != TARGET_HALTED)
 	{
@@ -212,10 +213,11 @@
 			{
 				return retval;
 			}
-			if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK)
+			if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
 			{
 				return retval;
 			}
+			status = hstatus;
 		}
 		else
 		{
@@ -237,10 +239,11 @@
 		{
 			return retval;
 		}
-		if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK)
+		if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
 		{
 			return retval;
 		}
+		status = hstatus;
 	}
 	
 	/* read array command */