Clean up and reformart.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5060 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/drv/dmac_sam3.c b/bertos/cpu/cortex-m3/drv/dmac_sam3.c
index 764bb8660484f1469da498f4f63d521f95fb040b..7c5511749f87e2d3ae6f815e111d9a0c8b6e5ca6 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/dmac_sam3.c
+++ b/bertos/cpu/cortex-m3/drv/dmac_sam3.c
@@ -111,22 +111,10 @@ 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);
 

diff --git a/bertos/cpu/cortex-m3/drv/dmac_sam3.h b/bertos/cpu/cortex-m3/drv/dmac_sam3.h
index 8650ac7f9d9e6ab861549e55fdd9c5ab56b53760..041fac837f62459907b6660f1c68863e1e4280e0 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/dmac_sam3.h
+++ b/bertos/cpu/cortex-m3/drv/dmac_sam3.h
@@ -67,20 +67,7 @@ typedef struct Dmac
 
 #define DMAC_ERR_CH_ALREDY_ON    BV(0)
 
-INLINE void dmac_setSourcesLLI(int ch, DmacDesc *lli, uint32_t src, uint32_t dst, uint32_t desc)
-{
-       ASSERT(lli);
-       DMAC_CHDR = BV(ch);
-
-       lli->src_addr = src;
-       lli->dst_addr = dst;
-       lli->dsc_addr = desc;
-}
-
-void dmac_configureDmaCfgLLI(int ch, DmacDesc *lli, uint32_t cfg);
-void dmac_setSourcesLLI(int ch, DmacDesc *lli, uint32_t src, uint32_t dst, uint32_t desc);
-void dmac_configureDmacLLI(int ch, DmacDesc *lli, size_t transfer_size, uint32_t cfg, uint32_t ctrla, uint32_t ctrlb);
-
+void dmac_setLLITransfer(int ch, DmacDesc *lli, uint32_t cfg);
 void dmac_setSources(int ch, uint32_t src, uint32_t dst);
 void dmac_configureDmac(int ch, size_t transfer_size, uint32_t cfg, uint32_t ctrla, uint32_t ctrlb);
 int dmac_start(int ch);

diff --git a/bertos/cpu/cortex-m3/drv/i2s_sam3.c b/bertos/cpu/cortex-m3/drv/i2s_sam3.c
index 3da6dbc3c2e3c706e35308c854cebf31e8f0a323..4b17b80101dbcb15c31b099e795300afcd9c3765 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/i2s_sam3.c
+++ b/bertos/cpu/cortex-m3/drv/i2s_sam3.c
@@ -72,6 +72,11 @@ DmacDesc *curr;
 DmacDesc *next;
 DmacDesc *prev;
 
+bool error = false;
+uint32_t cfg;
+uint32_t ctrla;
+uint32_t ctrlb;
+
 static int16_t *sample_buff;
 static size_t next_idx = 0;
 static size_t chunk_size = 0;
@@ -97,11 +102,6 @@ static void sam3_i2s_txWait(I2s *i2s)
        event_wait(&data_ready);
 }
 
-bool error = false;
-uint32_t cfg;
-uint32_t ctrla;
-uint32_t ctrlb;
-
 static void i2s_dmac_irq(uint32_t status)
 {
        I2S_STROBE_ON();
@@ -203,7 +203,7 @@ static void sam3_i2s_txStart(I2s *i2s, void *buf, size_t len, size_t slice_len)
                next_idx += chunk_size;
        }
 
-       dmac_configureDmaCfgLLI(I2S_DMAC_CH, &lli0, cfg);
+       dmac_setLLITransfer(I2S_DMAC_CH, &lli0, cfg);
 
        if (dmac_start(I2S_DMAC_CH) < 0)
        {
@@ -213,7 +213,7 @@ static void sam3_i2s_txStart(I2s *i2s, void *buf, size_t len, size_t slice_len)
 
        error = false;
        SSC_CR = BV(SSC_TXEN);
-       PIOA_CODR = BV(13);
+       I2S_STROBE_OFF();
 
        while (1)
        {