X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fdmac_sam3.c;h=06dba6ea9d558b158454a80a8d89b2e567d7c34a;hb=6970f4233dd70293d45f2df4406c581128e887dc;hp=621dc8487142c33376f26a3c8dad0e4a06740309;hpb=327806d9c3793f6e250c19df053686e200f1c559;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/dmac_sam3.c b/bertos/cpu/cortex-m3/drv/dmac_sam3.c
index 621dc848..06dba6ea 100644
--- a/bertos/cpu/cortex-m3/drv/dmac_sam3.c
+++ b/bertos/cpu/cortex-m3/drv/dmac_sam3.c
@@ -56,7 +56,7 @@ struct DmacCh
 	reg32_t *ctrlb;
 };
 
-#define DMAC_CHANNEL_CNT   5
+#define DMAC_CHANNEL_CNT   6
 struct DmacCh dmac_ch[] =
 {
 	{
@@ -109,26 +109,15 @@ struct DmacCh dmac_ch[] =
 	},
 };
 
-
 /* We use event to signal the end of conversion */
-static Event data_ready;
 static Dmac dmac[DMAC_CHANNEL_CNT];
 static uint8_t dmac_ch_enabled;
 
-void dmac_configureDmacLLI(int ch, DmacDesc *lli, size_t transfer_size, uint32_t cfg, uint32_t ctrla, uint32_t ctrlb)
-{
-	DMAC_CHDR = BV(ch);
-
-	*dmac_ch[ch].cfg = cfg | DMAC_CFG_FIFOCFG_ALAP_CFG | (0x1 << DMAC_CFG_AHB_PROT_SHIFT);
-	lli->ctrla = ctrla | (transfer_size & DMAC_CTRLA_BTSIZE_MASK);
-	lli->ctrlb = ctrlb;// & ~BV(DMAC_CTRLB_IEN);
-	*dmac_ch[ch].desc = (uint32_t)lli;
-}
-
-
-void dmac_configureDmaCfgLLI(int ch, DmacDesc *lli, uint32_t cfg)
+void dmac_setLLITransfer(int ch, DmacDesc *lli, uint32_t cfg)
 {
 	DMAC_CHDR = BV(ch);
+	reg32_t reg = DMAC_EBCISR;
+	(void)reg;
 
 	*dmac_ch[ch].cfg = cfg | DMAC_CFG_FIFOCFG_ALAP_CFG | (0x1 << DMAC_CFG_AHB_PROT_SHIFT);
 	*dmac_ch[ch].desc = (uint32_t)lli;
@@ -147,7 +136,7 @@ void dmac_configureDmac(int ch, size_t transfer_size, uint32_t cfg, uint32_t ctr
 {
 	DMAC_CHDR = BV(ch);
 
-	*dmac_ch[ch].cfg = cfg | DMAC_CFG_FIFOCFG_ALAP_CFG | (0x1 << DMAC_CFG_AHB_PROT_SHIFT) | BV(DMAC_CFG_SOD);
+	*dmac_ch[ch].cfg = cfg | DMAC_CFG_FIFOCFG_ALAP_CFG | (0x1 << DMAC_CFG_AHB_PROT_SHIFT);
 	*dmac_ch[ch].ctrla = ctrla | (transfer_size & DMAC_CTRLA_BTSIZE_MASK);
 	*dmac_ch[ch].ctrlb = ctrlb & ~BV(DMAC_CTRLB_IEN);
 }
@@ -160,40 +149,14 @@ int dmac_start(int ch)
 		return -1;
 	}
 	DMAC_CHER = BV(ch);
+	dmac_ch_enabled |= BV(ch);
 	return 0;
 }
 
-int dmac_stop(int ch)
-{
-	DMAC_CHDR = BV(ch);
-	return 0;
-}
-
-bool dmac_isLLIDone(int ch)
-{
-	return (DMAC_EBCIMR |= (BV(ch) << DMAC_EBCISR_CBTC0));
-}
-
-bool dmac_waitLLIDone(int ch)
-{
-	while(!(DMAC_EBCIMR |= (BV(ch) << DMAC_EBCISR_CBTC0)))
-		cpu_relax();
-
-	DMAC_CHDR = BV(ch);
-	return true;
-}
-
-bool dmac_isDone(int ch)
+void dmac_stop(int ch)
 {
-	//event_wait(&data_ready);
-	return (*dmac_ch[ch].ctrla & BV(31));//(DMAC_CHSR |= (BV(dmac->ch) << DMAC_CHSR_EMPT0));
-}
-
-bool dmac_waitDone(int ch)
-{
-	event_wait(&data_ready);
 	DMAC_CHDR = BV(ch);
-	return true;
+	dmac_ch_enabled &= ~BV(ch);
 }
 
 int dmac_error(int ch)