[Openocd-svn] r1953 - trunk/src/target

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

Author: zwelch
Date: 2009-05-31 01:57:30 +0200 (Sun, 31 May 2009)
New Revision: 1953

Modified:
   trunk/src/target/target.c
Log:
Eliminate duplicated code in the handle_mw_command memory write loop.
- wordsize will always be 1, 2, or 4 due to preceeding switch statement.
- move call to keep_alive after successful writes, not upon failures


Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-05-30 22:23:12 UTC (rev 1952)
+++ trunk/src/target/target.c	2009-05-30 23:57:30 UTC (rev 1953)
@@ -1958,27 +1958,11 @@
 	}
 	for (i=0; i<count; i++)
 	{
-		int retval;
-		switch (wordsize)
-		{
-			case 4:
-				retval = target->type->write_memory(target, address + i*wordsize, 4, 1, value_buf);
-				break;
-			case 2:
-				retval = target->type->write_memory(target, address + i*wordsize, 2, 1, value_buf);
-				break;
-			case 1:
-				retval = target->type->write_memory(target, address + i*wordsize, 1, 1, value_buf);
-			break;
-			default:
-			return ERROR_OK;
-		}
-		keep_alive();
-
-		if (retval!=ERROR_OK)
-		{
+		int retval = target->type->write_memory(target,
+				address + i * wordsize, wordsize, 1, value_buf);
+		if (ERROR_OK != retval)
 			return retval;
-		}
+		keep_alive();
 	}
 
 	return ERROR_OK;