X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_dma.c;h=8779ddf414dfd188fe5777bb23070e3fc32b2c4e;hp=6052964a5fb7e323445195488033da1216bb4b7c;hb=3fe5c2f9fc01258d45c20070e9874d76bc6c8c07;hpb=9513be7f9d3d0b0ec29f6487fa9dc8f1ac24d0de

diff --git a/src/cc1111/ao_dma.c b/src/cc1111/ao_dma.c
index 6052964a..8779ddf4 100644
--- a/src/cc1111/ao_dma.c
+++ b/src/cc1111/ao_dma.c
@@ -46,6 +46,10 @@ ao_dma_alloc(__xdata uint8_t *done)
 		DMAIRQ = 0;
 		DMAIF = 0;
 		IEN1 |= IEN1_DMAIE;
+		DMA0CFGH = ((uint16_t) (&ao_dma_config[0])) >> 8;
+		DMA0CFGL = ((uint16_t) (&ao_dma_config[0]));
+		DMA1CFGH = ((uint16_t) (&ao_dma_config[1])) >> 8;
+		DMA1CFGL = ((uint16_t) (&ao_dma_config[1]));
 	}
 
 	return id;
@@ -69,25 +73,20 @@ ao_dma_set_transfer(uint8_t id,
 	ao_dma_config[id].len_low = count;
 	ao_dma_config[id].cfg0 = cfg0;
 	ao_dma_config[id].cfg1 = cfg1 | DMA_CFG1_IRQMASK;
-	if (id == 0) {
-		DMA0CFGH = ((uint16_t) (&ao_dma_config[0])) >> 8;
-		DMA0CFGL = ((uint16_t) (&ao_dma_config[0]));
-	} else {
-		DMA1CFGH = ((uint16_t) (&ao_dma_config[1])) >> 8;
-		DMA1CFGL = ((uint16_t) (&ao_dma_config[1]));
-	}
 }
 
-#define nop()	_asm nop _endasm;
+#define nop()	__asm nop __endasm;
 
 void
 ao_dma_start(uint8_t id)
 {
 	uint8_t	mask = (1 << id);
 	DMAIRQ &= ~mask;
-	DMAARM = 0x80 | mask;
-	nop(); nop(); nop(); nop();
-	nop(); nop(); nop(); nop();
+	if (DMAARM & mask) {
+		DMAARM = 0x80 | mask;
+		nop(); nop(); nop(); nop();
+		nop(); nop(); nop(); nop();
+	}
 	*(ao_dma_done[id]) = 0;
 	DMAARM = mask;
 	nop(); nop(); nop(); nop();