Skip to content

Commit

Permalink
kgdb: use common ascii helpers and put_unaligned_be32 helper
Browse files Browse the repository at this point in the history
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  • Loading branch information
Harvey Harrison authored and Jason Wessel committed May 28, 2008
1 parent 0a2ce2f commit 827e609
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
5 changes: 2 additions & 3 deletions drivers/misc/kgdbts.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
} while (0)
#define MAX_CONFIG_LEN 40

static const char hexchars[] = "0123456789abcdef";
static struct kgdb_io kgdbts_io_ops;
static char get_buf[BUFMAX];
static int get_buf_cnt;
Expand Down Expand Up @@ -619,8 +618,8 @@ static void fill_get_buf(char *buf)
count++;
}
strcat(get_buf, "#");
get_buf[count + 2] = hexchars[checksum >> 4];
get_buf[count + 3] = hexchars[checksum & 0xf];
get_buf[count + 2] = hex_asc_hi(checksum);
get_buf[count + 3] = hex_asc_lo(checksum);
get_buf[count + 4] = '\0';
v2printk("get%i: %s\n", ts.idx, get_buf);
}
Expand Down
16 changes: 6 additions & 10 deletions kernel/kgdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include <asm/byteorder.h>
#include <asm/atomic.h>
#include <asm/system.h>
#include <asm/unaligned.h>

static int kgdb_break_asap;

Expand Down Expand Up @@ -227,8 +228,6 @@ void __weak kgdb_disable_hw_debug(struct pt_regs *regs)
* GDB remote protocol parser:
*/

static const char hexchars[] = "0123456789abcdef";

static int hex(char ch)
{
if ((ch >= 'a') && (ch <= 'f'))
Expand Down Expand Up @@ -316,8 +315,8 @@ static void put_packet(char *buffer)
}

kgdb_io_ops->write_char('#');
kgdb_io_ops->write_char(hexchars[checksum >> 4]);
kgdb_io_ops->write_char(hexchars[checksum & 0xf]);
kgdb_io_ops->write_char(hex_asc_hi(checksum));
kgdb_io_ops->write_char(hex_asc_lo(checksum));
if (kgdb_io_ops->flush)
kgdb_io_ops->flush();

Expand Down Expand Up @@ -478,8 +477,8 @@ static void error_packet(char *pkt, int error)
{
error = -error;
pkt[0] = 'E';
pkt[1] = hexchars[(error / 10)];
pkt[2] = hexchars[(error % 10)];
pkt[1] = hex_asc[(error / 10)];
pkt[2] = hex_asc[(error % 10)];
pkt[3] = '\0';
}

Expand Down Expand Up @@ -510,10 +509,7 @@ static void int_to_threadref(unsigned char *id, int value)
scan = (unsigned char *)id;
while (i--)
*scan++ = 0;
*scan++ = (value >> 24) & 0xff;
*scan++ = (value >> 16) & 0xff;
*scan++ = (value >> 8) & 0xff;
*scan++ = (value & 0xff);
put_unaligned_be32(value, scan);
}

static struct task_struct *getthread(struct pt_regs *regs, int tid)
Expand Down

0 comments on commit 827e609

Please sign in to comment.