X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fi2s_sam3.c;h=bfd579345b3009ede25c7229c3f890e4c83b54da;hb=563795df4180aaceb7d69306551230c98fbca879;hp=81b38c10ce462897bf7252dc84e619b1f6153ff4;hpb=70dacd77ac3d92f8ccdf3c89d09932469dc41889;p=bertos.git diff --git a/bertos/cpu/cortex-m3/drv/i2s_sam3.c b/bertos/cpu/cortex-m3/drv/i2s_sam3.c index 81b38c10..bfd57934 100644 --- a/bertos/cpu/cortex-m3/drv/i2s_sam3.c +++ b/bertos/cpu/cortex-m3/drv/i2s_sam3.c @@ -58,46 +58,65 @@ #include -#define I2S_DMAC_CH 3 - +#define I2S_DMAC_CH 0 #define I2S_CACHED_CHUNK_SIZE 2 + #define I2S_TX_DMAC_CFG (BV(DMAC_CFG_DST_H2SEL) | \ BV(DMAC_CFG_SOD) | \ ((3 << DMAC_CFG_DST_PER_SHIFT) & DMAC_CFG_DST_PER_MASK) | \ (4 & DMAC_CFG_SRC_PER_MASK)) -#define I2S_TX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_HALF_WORD | \ - DMAC_CTRLA_DST_WIDTH_HALF_WORD) - #define I2S_TX_DMAC_CTRLB (DMAC_CTRLB_FC_MEM2PER_DMA_FC | \ - DMAC_CTRLB_DST_INCR_FIXED | \ - DMAC_CTRLB_SRC_INCR_INCREMENTING) + DMAC_CTRLB_DST_INCR_FIXED | \ + DMAC_CTRLB_SRC_INCR_INCREMENTING) + #define I2S_RX_DMAC_CFG (BV(DMAC_CFG_SRC_H2SEL) | \ BV(DMAC_CFG_SOD) | \ - ((4 << DMAC_CFG_DST_PER_SHIFT) & DMAC_CFG_DST_PER_MASK) | \ + ((3 << DMAC_CFG_DST_PER_SHIFT) & DMAC_CFG_DST_PER_MASK) | \ (4 & DMAC_CFG_SRC_PER_MASK)) -#define I2S_RX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_HALF_WORD | \ - DMAC_CTRLA_DST_WIDTH_HALF_WORD) - #define I2S_RX_DMAC_CTRLB (DMAC_CTRLB_FC_PER2MEM_DMA_FC | \ DMAC_CTRLB_DST_INCR_INCREMENTING | \ DMAC_CTRLB_SRC_INCR_FIXED) +#if CONFIG_WORD_BIT_SIZE == 32 + #define I2S_TX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_WORD | \ + DMAC_CTRLA_DST_WIDTH_WORD) + #define I2S_RX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_WORD | \ + DMAC_CTRLA_DST_WIDTH_WORD) + #define I2S_WORD_BYTE_SIZE 4 +#elif CONFIG_WORD_BIT_SIZE == 16 + + #define I2S_TX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_HALF_WORD | \ + DMAC_CTRLA_DST_WIDTH_HALF_WORD) + #define I2S_RX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_HALF_WORD | \ + DMAC_CTRLA_DST_WIDTH_HALF_WORD) + #define I2S_WORD_BYTE_SIZE 2 + +#elif CONFIG_WORD_BIT_SIZE == 8 + + #define I2S_TX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_BYTE | \ + DMAC_CTRLA_DST_WIDTH_BYTE) + #define I2S_RX_DMAC_CTRLA (DMAC_CTRLA_SRC_WIDTH_BYTE | \ + DMAC_CTRLA_DST_WIDTH_BYTE) + #define I2S_WORD_BYTE_SIZE 1 + +#else + #error Wrong i2s word size. +#endif + #define I2S_STATUS_ERR BV(0) #define I2S_STATUS_SINGLE_TRASF BV(1) #define I2S_STATUS_TX BV(2) -#define I2S_STATUS_RX BV(3) -struct I2sHardware -{ - bool end; -}; +#define I2S_STATUS_END_TX BV(3) +#define I2S_STATUS_RX BV(4) +#define I2S_STATUS_END_RX BV(5) + -struct I2sHardware i2s_hw; static Event data_ready; DmacDesc lli0; @@ -107,10 +126,9 @@ DmacDesc *next; DmacDesc *prev; static uint8_t i2s_status; -static int16_t *sample_buff; +static uint8_t *sample_buff; static size_t next_idx = 0; static size_t chunk_size = 0; -static size_t remaing_size = 0; static size_t transfer_size = 0; static void sam3_i2s_txStop(I2s *i2s) @@ -119,13 +137,11 @@ static void sam3_i2s_txStop(I2s *i2s) SSC_CR = BV(SSC_TXDIS); dmac_stop(I2S_DMAC_CH); - i2s->hw->end = true; - remaing_size = 0; next_idx = 0; transfer_size = 0; + i2s_status |= I2S_STATUS_END_TX; i2s_status &= ~I2S_STATUS_TX; - event_do(&data_ready); } @@ -137,7 +153,6 @@ static void sam3_i2s_txWait(I2s *i2s) static void i2s_dmac_irq(uint32_t status) { - I2S_STROBE_ON(); if (i2s_status & I2S_STATUS_SINGLE_TRASF) { i2s_status &= ~I2S_STATUS_SINGLE_TRASF; @@ -161,7 +176,7 @@ static void i2s_dmac_irq(uint32_t status) curr->src_addr = (uint32_t)&sample_buff[next_idx]; curr->dst_addr = (uint32_t)&SSC_THR; curr->dsc_addr = (uint32_t)next; - curr->ctrla = I2S_TX_DMAC_CTRLA | (chunk_size & 0xffff); + curr->ctrla = I2S_TX_DMAC_CTRLA | ((chunk_size / I2S_WORD_BYTE_SIZE) & 0xffff); curr->ctrlb = I2S_TX_DMAC_CTRLB & ~BV(DMAC_CTRLB_IEN); } else @@ -169,22 +184,13 @@ static void i2s_dmac_irq(uint32_t status) curr->src_addr = (uint32_t)&SSC_RHR; curr->dst_addr = (uint32_t)&sample_buff[next_idx]; curr->dsc_addr = (uint32_t)next; - curr->ctrla = I2S_RX_DMAC_CTRLA | (chunk_size & 0xffff); + curr->ctrla = I2S_RX_DMAC_CTRLA | ((chunk_size / I2S_WORD_BYTE_SIZE) & 0xffff); curr->ctrlb = I2S_RX_DMAC_CTRLB & ~BV(DMAC_CTRLB_IEN); } - remaing_size -= chunk_size; - next_idx += chunk_size; - - if (remaing_size <= 0) - { - remaing_size = transfer_size; - next_idx = 0; - } } } event_do(&data_ready); - I2S_STROBE_OFF(); } @@ -194,14 +200,13 @@ static void sam3_i2s_txStart(I2s *i2s, void *buf, size_t len, size_t slice_len) ASSERT(len >= slice_len); ASSERT(!(len % slice_len)); - i2s->hw->end = false; - i2s_status &= ~I2S_STATUS_SINGLE_TRASF; + i2s_status &= ~(I2S_STATUS_END_TX | I2S_STATUS_SINGLE_TRASF); - sample_buff = (int16_t *)buf; + sample_buff = (uint8_t *)buf; next_idx = 0; - chunk_size = slice_len / 2; - remaing_size = len / 2; - transfer_size = len / 2; + chunk_size = slice_len; + size_t remaing_size = len; + transfer_size = len; memset(&lli0, 0, sizeof(DmacDesc)); @@ -217,20 +222,22 @@ static void sam3_i2s_txStart(I2s *i2s, void *buf, size_t len, size_t slice_len) curr = next; next = prev; - i2s->ctx.tx_callback(i2s, &sample_buff[next_idx], chunk_size * 2); + i2s->ctx.tx_callback(i2s, &sample_buff[next_idx], chunk_size); curr->src_addr = (uint32_t)&sample_buff[next_idx]; curr->dst_addr = (uint32_t)&SSC_THR; curr->dsc_addr = (uint32_t)next; - curr->ctrla = I2S_TX_DMAC_CTRLA | (chunk_size & 0xffff); + curr->ctrla = I2S_TX_DMAC_CTRLA | ((chunk_size / I2S_WORD_BYTE_SIZE) & 0xffff); curr->ctrlb = I2S_TX_DMAC_CTRLB & ~BV(DMAC_CTRLB_IEN); remaing_size -= chunk_size; next_idx += chunk_size; - if (chunk_size > remaing_size) - break; - + if (remaing_size <= 0) + { + remaing_size = transfer_size; + next_idx = 0; + } } dmac_setLLITransfer(I2S_DMAC_CH, prev, I2S_TX_DMAC_CFG); @@ -245,25 +252,34 @@ static void sam3_i2s_txStart(I2s *i2s, void *buf, size_t len, size_t slice_len) i2s_status |= I2S_STATUS_TX; SSC_CR = BV(SSC_TXEN); - I2S_STROBE_OFF(); while (1) { event_wait(&data_ready); + I2S_STROBE_ON(); + remaing_size -= chunk_size; + next_idx += chunk_size; + + if (remaing_size <= 0) + { + remaing_size = transfer_size; + next_idx = 0; + } + if (i2s_status & I2S_STATUS_ERR) { LOG_ERR("Error while streaming.\n"); break; } - if (i2s->hw->end) + if (i2s_status & I2S_STATUS_END_TX) { LOG_INFO("Stop streaming.\n"); break; } - i2s->ctx.tx_callback(i2s, &sample_buff[next_idx], chunk_size * 2); - cpu_relax(); + i2s->ctx.tx_callback(i2s, &sample_buff[next_idx], chunk_size); + I2S_STROBE_OFF(); } } @@ -273,8 +289,7 @@ static void sam3_i2s_rxStop(I2s *i2s) SSC_CR = BV(SSC_RXDIS) | BV(SSC_TXDIS); dmac_stop(I2S_DMAC_CH); - i2s->hw->end = true; - remaing_size = 0; + i2s_status |= I2S_STATUS_END_RX; next_idx = 0; transfer_size = 0; @@ -295,14 +310,13 @@ static void sam3_i2s_rxStart(I2s *i2s, void *buf, size_t len, size_t slice_len) ASSERT(len >= slice_len); ASSERT(!(len % slice_len)); - i2s->hw->end = false; - i2s_status &= ~I2S_STATUS_SINGLE_TRASF; + i2s_status &= ~(I2S_STATUS_END_RX | I2S_STATUS_SINGLE_TRASF); - sample_buff = (int16_t *)buf; + sample_buff = (uint8_t *)buf; next_idx = 0; - chunk_size = slice_len / 2; - remaing_size = len / 2; - transfer_size = len / 2; + chunk_size = slice_len; + size_t remaing_size = len; + transfer_size = len; memset(&lli0, 0, sizeof(DmacDesc)); memset(&lli1, 0, sizeof(DmacDesc)); @@ -317,20 +331,22 @@ static void sam3_i2s_rxStart(I2s *i2s, void *buf, size_t len, size_t slice_len) curr = next; next = prev; - i2s->ctx.rx_callback(i2s, &sample_buff[next_idx], chunk_size * 2); curr->src_addr = (uint32_t)&SSC_RHR; curr->dst_addr = (uint32_t)&sample_buff[next_idx]; curr->dsc_addr = (uint32_t)next; - curr->ctrla = I2S_RX_DMAC_CTRLA | (chunk_size & 0xffff); + curr->ctrla = I2S_RX_DMAC_CTRLA | ((chunk_size / I2S_WORD_BYTE_SIZE) & 0xffff); curr->ctrlb = I2S_RX_DMAC_CTRLB & ~BV(DMAC_CTRLB_IEN); remaing_size -= chunk_size; next_idx += chunk_size; - if (chunk_size > remaing_size) - break; - + if (remaing_size <= 0) + { + remaing_size = transfer_size; + next_idx = 0; + } } + dmac_setLLITransfer(I2S_DMAC_CH, prev, I2S_RX_DMAC_CFG); if (dmac_start(I2S_DMAC_CH) < 0) @@ -342,37 +358,49 @@ static void sam3_i2s_rxStart(I2s *i2s, void *buf, size_t len, size_t slice_len) i2s_status &= ~I2S_STATUS_ERR; i2s_status |= I2S_STATUS_RX; - SSC_CR = BV(SSC_RXEN) | BV(SSC_TXEN); - I2S_STROBE_OFF(); + SSC_CR = BV(SSC_TXEN) | BV(SSC_RXEN); while (1) { event_wait(&data_ready); + I2S_STROBE_ON(); + i2s->ctx.rx_callback(i2s, &sample_buff[next_idx], chunk_size); + + remaing_size -= chunk_size; + next_idx += chunk_size; + + if (remaing_size <= 0) + { + remaing_size = transfer_size; + next_idx = 0; + } + if (i2s_status & I2S_STATUS_ERR) { LOG_ERR("Error while streaming.\n"); break; } - if (i2s->hw->end) + if (i2s_status & I2S_STATUS_END_RX) { LOG_INFO("Stop streaming.\n"); break; } - i2s->ctx.rx_callback(i2s, &sample_buff[next_idx], chunk_size * 2); - cpu_relax(); + I2S_STROBE_OFF(); } } static bool sam3_i2s_isTxFinish(struct I2s *i2s) { - return i2s->hw->end; + (void)i2s; + return (i2s_status & I2S_STATUS_END_TX); } static bool sam3_i2s_isRxFinish(struct I2s *i2s) { - return i2s->hw->end; + (void)i2s; + return (i2s_status & I2S_STATUS_END_RX); } static void sam3_i2s_txBuf(struct I2s *i2s, void *buf, size_t len) @@ -381,7 +409,7 @@ static void sam3_i2s_txBuf(struct I2s *i2s, void *buf, size_t len) i2s_status |= I2S_STATUS_SINGLE_TRASF; dmac_setSources(I2S_DMAC_CH, (uint32_t)buf, (uint32_t)&SSC_THR); - dmac_configureDmac(I2S_DMAC_CH, len, I2S_TX_DMAC_CFG, I2S_TX_DMAC_CTRLA, I2S_TX_DMAC_CTRLB); + dmac_configureDmac(I2S_DMAC_CH, len / I2S_WORD_BYTE_SIZE, I2S_TX_DMAC_CFG, I2S_TX_DMAC_CTRLA, I2S_TX_DMAC_CTRLB); dmac_start(I2S_DMAC_CH); SSC_CR = BV(SSC_TXEN); @@ -394,10 +422,10 @@ static void sam3_i2s_rxBuf(struct I2s *i2s, void *buf, size_t len) i2s_status |= I2S_STATUS_SINGLE_TRASF; dmac_setSources(I2S_DMAC_CH, (uint32_t)&SSC_RHR, (uint32_t)buf); - dmac_configureDmac(I2S_DMAC_CH, len, I2S_RX_DMAC_CFG, I2S_RX_DMAC_CTRLA, I2S_RX_DMAC_CTRLB); + dmac_configureDmac(I2S_DMAC_CH, len / I2S_WORD_BYTE_SIZE, I2S_RX_DMAC_CFG, I2S_RX_DMAC_CTRLA, I2S_RX_DMAC_CTRLB); dmac_start(I2S_DMAC_CH); - SSC_CR = BV(SSC_RXEN); + SSC_CR = BV(SSC_TXEN) | BV(SSC_RXEN); } static int sam3_i2s_write(struct I2s *i2s, uint32_t sample) @@ -451,7 +479,6 @@ void i2s_init(I2s *i2s, int channel) i2s->ctx.rx_stop = sam3_i2s_rxStop; DB(i2s->ctx._type = I2S_SAM3X;) - i2s->hw = &i2s_hw; I2S_STROBE_INIT();