summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-12-30 15:42:28 -0800
committerKeith Packard <keithp@keithp.com>2011-12-30 15:42:28 -0800
commit085625ff3992454b59583d95a3c415597c51f754 (patch)
tree083ce13132c387402294ac10585bb8c1f4b5fc54
parent614ab6a991258a5caad0ca12ae35d0288a5b7503 (diff)
altos: More _asm -> __asm changes
Missed a few last time Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/cc1111/ao_dbg.c6
-rw-r--r--src/cc1111/ao_dma.c2
2 files changed, 4 insertions, 4 deletions
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)