From: Keith Packard Date: Fri, 30 Dec 2011 23:42:28 +0000 (-0800) Subject: altos: More _asm -> __asm changes X-Git-Tag: 1.0.9.4~61 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=085625ff3992454b59583d95a3c415597c51f754 altos: More _asm -> __asm changes Missed a few last time Signed-off-by: Keith Packard --- diff --git a/src/cc1111/ao_dbg.c b/src/cc1111/ao_dbg.c index d4c9567f..847b5aaf 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) diff --git a/src/cc1111/ao_dma.c b/src/cc1111/ao_dma.c index ca33facb..8779ddf4 100644 --- a/src/cc1111/ao_dma.c +++ b/src/cc1111/ao_dma.c @@ -75,7 +75,7 @@ ao_dma_set_transfer(uint8_t id, ao_dma_config[id].cfg1 = cfg1 | DMA_CFG1_IRQMASK; } -#define nop() _asm nop _endasm; +#define nop() __asm nop __endasm; void ao_dma_start(uint8_t id)