gdbserver: use common hexify/unhexify routines

[openocd] / src / target / smp.c

diff --git a/src/target/smp.c b/src/target/smp.c
index c0936ff5ca8ae4a47f5449af78789f2710a73447..66dbfec16c8f634b95395c7c3732a539c637f3e2 100644 (file)
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -23,12 +23,12 @@
 #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          */
 /*                                                                         */
@@ -54,8 +54,6 @@
 /*  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,
                char *packet, int packet_size)
@@ -66,18 +64,12 @@ int gdb_read_smp_packet(struct connection *connection,
        char *hex_buffer;
        int retval = ERROR_OK;
        if (target->smp) {
-               if (strstr(packet, "jc")) {
+               if (strncmp(packet, "jc", 2) == 0) {
                        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);
+                       int pkt_len = hexify(hex_buffer, (char *)buffer, len, len * 2 + 1);
 
+                       retval = gdb_put_packet(connection, hex_buffer, pkt_len);
                        free(hex_buffer);
                }
        } else
@@ -96,7 +88,7 @@ int gdb_write_smp_packet(struct connection *connection,
 
        /* skip command character */
        if (target->smp) {
-               if (strstr(packet, "Jc")) {
+               if (strncmp(packet, "Jc", 2) == 0) {
                        packet += 2;
                        coreid = strtoul(packet, &separator, 16);
                        target->gdb_service->core[1] = coreid;