X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_dbg.c;h=214cb013154d2a7ceb9a9904bee3a4745e6b6c44;hb=81648829defbaf49fc98c4520540f7a20c50c417;hp=d4c9567fe519039ec28713dd97282c126c919b42;hpb=f6f54d70b768dca1715ddddea64a4df00d82b09e;p=fw%2Faltos

diff --git a/src/cc1111/ao_dbg.c b/src/cc1111/ao_dbg.c
index d4c9567f..214cb013 100644
--- a/src/cc1111/ao_dbg.c
+++ b/src/cc1111/ao_dbg.c
@@ -22,10 +22,10 @@ static void
 ao_dbg_send_bits(uint8_t msk, uint8_t val) __reentrant
 {
 	DBG_PORT = (DBG_PORT & ~msk) | (val & msk);
-	_asm
+	__asm
 		nop
 		nop
-	_endasm;
+	__endasm;
 }
 
 void
@@ -187,7 +187,7 @@ ao_dbg_long_delay(void)
 	uint8_t	n;
 
 	for (n = 0; n < 20; n++)
-		_asm nop _endasm;
+		__asm nop __endasm;
 }
 
 #define AO_RESET_LOW_DELAY	AO_MS_TO_TICKS(100)
@@ -281,22 +281,6 @@ debug_get(void)
 	putchar('\n');
 }
 
-static uint8_t
-getnibble(void)
-{
-	__pdata char	c;
-
-	c = getchar();
-	if ('0' <= c && c <= '9')
-		return c - '0';
-	if ('a' <= c && c <= 'f')
-		return c - ('a' - 10);
-	if ('A' <= c && c <= 'F')
-		return c - ('A' - 10);
-	ao_cmd_status = ao_cmd_lex_error;
-	return 0;
-}
-
 static void
 debug_input(void)
 {
@@ -338,8 +322,8 @@ debug_output(void)
 		return;
 	ao_dbg_start_transfer(addr);
 	while (count--) {
-		b = getnibble() << 4;
-		b |= getnibble();
+		b = ao_getnibble() << 4;
+		b |= ao_getnibble();
 		if (ao_cmd_status != ao_cmd_success)
 			return;
 		ao_dbg_write_byte(b);