X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fsmp.c;h=e688304a0e25ad2591c8f690b347560075dbb44d;hp=ec157d36105b198c68971d00bf71b8ec58d524c7;hb=677b02b475870b7d9e5d86e9bf61dc28dae5a6e4;hpb=d02dfff48b0051ddf4142c9e2d657811ff30eec8

diff --git a/src/target/smp.c b/src/target/smp.c
index ec157d3610..e688304a0e 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -15,20 +15,20 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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"
-
+#include "helper/binarybuffer.h"
 
 /*  implementation of new packet in gdb interface for smp feature          */
 /*                                                                         */
@@ -53,65 +53,47 @@
 /*  Another way to test this packet is the usage of maintenance packet     */
 /*  maint packet Jc01                                                      */
 /*  maint packet jc                                                        */
-                                                
-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 const *packet, int packet_size)
 {
-	uint32_t len = sizeof(int32_t);
-	uint8_t *buffer;
-	char *hex_buffer;
+	struct target *target = get_target_from_connection(connection);
 	int retval = ERROR_OK;
-	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++)
-			{
-				uint8_t t = buffer[i];
-				hex_buffer[2 * i] = DIGITS[(t >> 4) & 0xf];
-				hex_buffer[2 * i + 1] = DIGITS[t & 0xf];
-			}
-
-			retval = gdb_put_packet(connection, hex_buffer, len * 2);
+	if (target->smp) {
+		if (strncmp(packet, "jc", 2) == 0) {
+			const uint32_t len = sizeof(target->gdb_service->core[0]);
+			char hex_buffer[len * 2 + 1];
+			char buffer[len];
+			buf_set_u32(buffer, 0, len * 8, target->gdb_service->core[0]);
+			int pkt_len = hexify(hex_buffer, buffer, sizeof(buffer), sizeof(hex_buffer));
 
-			free(hex_buffer);
+			retval = gdb_put_packet(connection, hex_buffer, pkt_len);
 		}
-	}
-	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 const *packet, int packet_size)
 {
+	struct target *target = get_target_from_connection(connection);
 	char *separator;
 	int coreid = 0;
 	int retval = ERROR_OK;
 
 	/* skip command character */
-	if (target->smp)
-	{
-		if (strstr(packet, "Jc"))
-		{
-			packet+=2;
+	if (target->smp) {
+		if (strncmp(packet, "Jc", 2) == 0) {
+			packet += 2;
 			coreid = strtoul(packet, &separator, 16);
 			target->gdb_service->core[1] = coreid;
 			retval = gdb_put_packet(connection, "OK", 2);
 		}
-	}
-	else
-	{
-		retval = gdb_put_packet(connection,"E01",3);
-	}
+	} else
+		retval = gdb_put_packet(connection, "E01", 3);
 
 	return retval;
 }