X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftarget%2Fsmp.c;h=9cd4b013d3ea0a26b1cd3db5257146a921e5d94a;hb=321948b41f9a697c02d7c3f2ac7df71220250907;hp=aabfa5b8d63fd2ee62d0e4edd880d4605a468ac0;hpb=b778b36f29b74d6d571df85f984ae684672ea162;p=fw%2Fopenocd

diff --git a/src/target/smp.c b/src/target/smp.c
index aabfa5b8d..9cd4b013d 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -17,19 +17,18 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "server/server.h"
-#include <helper/types.h>
 
 #include "target/target.h"
 
 #include "server/gdb_server.h"
 #include "smp.h"
 
-
 /*  implementation of new packet in gdb interface for smp feature          */
 /*                                                                         */
 /*   j : smp  status request                                               */
@@ -53,64 +52,57 @@
 /*  Another way to test this packet is the usage of maintenance packet     */
 /*  maint packet Jc01                                                      */
 /*  maint packet jc                                                        */
-                                                
-static const char DIGITS[16] = "0123456789abcdef";
 
+static const char DIGITS[16] = "0123456789abcdef";
 
 /* packet j :smp status request */
 int gdb_read_smp_packet(struct connection *connection,
-		struct target *target, char *packet, int packet_size)
+		char *packet, int packet_size)
 {
+	struct target *target = get_target_from_connection(connection);
 	uint32_t len = sizeof(int32_t);
 	uint8_t *buffer;
 	char *hex_buffer;
 	int retval = ERROR_OK;
-	if (target->smp)
-	{
-		if (strstr(packet, "jc"))
-		{
+	if (target->smp) {
+		if (strstr(packet, "jc")) {
 			hex_buffer = malloc(len * 2 + 1);
 			buffer = (uint8_t *)&target->gdb_service->core[0];
 			uint32_t i;
-			for (i = 0; i < 4; i++)
-			{
+			for (i = 0; i < 4; i++) {
 				uint8_t t = buffer[i];
 				hex_buffer[2 * i] = DIGITS[(t >> 4) & 0xf];
 				hex_buffer[2 * i + 1] = DIGITS[t & 0xf];
 			}
 
-			gdb_put_packet(connection, hex_buffer, len * 2);
+			retval = gdb_put_packet(connection, hex_buffer, len * 2);
 
 			free(hex_buffer);
 		}
-	}
-	else
-		retval = gdb_put_packet(connection,"E01",3);
+	} else
+		retval = gdb_put_packet(connection, "E01", 3);
 	return retval;
 }
 
 /* J :  smp set request */
 int gdb_write_smp_packet(struct connection *connection,
-		struct target *target, char *packet, int packet_size)
+		char *packet, int packet_size)
 {
+	struct target *target = get_target_from_connection(connection);
 	char *separator;
 	int coreid = 0;
-    int retval = ERROR_OK;
+	int retval = ERROR_OK;
 
 	/* skip command character */
-	if (target->smp)
-	{
-		if (strstr(packet, "Jc"))
-		{
-			packet+=2;
+	if (target->smp) {
+		if (strstr(packet, "Jc")) {
+			packet += 2;
 			coreid = strtoul(packet, &separator, 16);
 			target->gdb_service->core[1] = coreid;
-			gdb_put_packet(connection, "OK", 2);
+			retval = gdb_put_packet(connection, "OK", 2);
 		}
-	}
-	else
-	{
-		retval = gdb_put_packet(connection,"E01",3);
-	}
-	return ERROR_OK;
+	} else
+		retval = gdb_put_packet(connection, "E01", 3);
+
+	return retval;
 }