sh: kgdb-stub.c, sh-sci.c use the common ascii hex helpers
PATCH 8/9 sh: kgdb-stub.c, sh-sci.c use the common ascii hex helpers
Signed-off-by Harvey Harrison <[email protected]>
--- arch/sh/kernel/kgdb_stub.c | 16 ++++++++-------- drivers/serial/sh-sci.c | 8 ++++---- include/asm-sh/kgdb.h | 14 -------------- 3 files changed, 12 insertions(+), 26 deletions(-)
arch/sh/kernel/kgdb_stub.c +8 -8
@@ -274,8 +274,8 @@ static char *mem_to_hex(const char *mem, char *buf, const int count) }for (i =0 ; i < count; i++) { ch = *mem++; - *buf++ =highhex (ch); - *buf++ =lowhex (ch); + *buf++ =hex_asc_hi (ch); + *buf++ =hex_asc_lo (ch); } *buf =0 ;return (buf);
@@ -333,8 +333,8 @@ static char *ebin_to_mem(const char *buf, char *mem, int count)/* Pack a hex byte */ static char *pack_hex_byte (char *pkt,int byte) { - *pkt++ = hexchars[(byte >>4 ) &0xf ]; - *pkt++ = hexchars[(byte &0xf )]; + *pkt++ =hex_asc_hi (byte); + *pkt++ =hex_asc_lo (byte);return pkt; }
@@ -435,8 +435,8 @@ static void put_packet(char *buffer)/* '#' Separator, put high and low components of checksum */ put_debug_char ('#' ); -put_debug_char (highhex (checksum)); -put_debug_char (lowhex (checksum)); +put_debug_char (hex_asc_hi (checksum)); +put_debug_char (hex_asc_lo (checksum)); }while ((get_debug_char ()) !='+' );/* While no ack */ }
@@ -658,8 +658,8 @@ static void undo_single_step(void)static void send_signal_msg (const int signum) { out_buffer[0 ] ='S' ; - out_buffer[1 ] =highhex (signum); - out_buffer[2 ] =lowhex (signum); + out_buffer[1 ] =hex_asc_hi (signum); + out_buffer[2 ] =hex_asc_lo (signum); out_buffer[3 ] =0 ;put_packet (out_buffer); }
drivers/serial/sh-sci.c +4 -4
@@ -186,15 +186,15 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count)int h, l; c = *p++; - h =highhex (c); - l =lowhex (c); + h =hex_asc_hi (c); + l =hex_asc_lo (c);put_char (port, h);put_char (port, l); checksum += h + l; }put_char (port,'#' ); -put_char (port,highhex (checksum)); -put_char (port,lowhex (checksum)); +put_char (port,hex_asc_hi (checksum)); +put_char (port,hex_asc_lo (checksum)); }while (get_char (port) !='+' ); } else#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
include/asm-sh/kgdb.h +0 -14
@@ -66,18 +66,4 @@ extern int setjmp(jmp_buf __jmpb);/* Forced breakpoint */ #define breakpoint () __asm__ __volatile__("trapa #0x3c") -/* Taken from sh-stub.c of GDB 4.18 */ -static const char hexchars[] ="0123456789abcdef" ; - -/* Get high hex bits */ -static inline char highhex (const int x) -{ -return hexchars[(x >>4 ) &0xf ]; -} - -/* Get low hex bits */ -static inline char lowhex (const int x) -{ -return hexchars[x &0xf ]; -}#endif
Signature · 1 line
1.5.5.1.305.g7c84