Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change GPDMA channel clli member to uint32_t, casting to/from gpdma_lli_t and dealing with the multiple fields was driving me crazy.

Browse Source
This commit is contained in:
Jared Boone
2013-12-08 18:16:58 -08:00
parent 6185b67008
commit 5b59f9cb0a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/common/sgpio_dma.c
View File

@ -49,7 +49,7 @@ void sgpio_dma_configure_lli(
lli[i].csrcaddr = direction_transmit ? memory_address : peripheral_address; lli[i].csrcaddr = direction_transmit ? memory_address : peripheral_address;
lli[i].cdestaddr = direction_transmit ? peripheral_address : memory_address; lli[i].cdestaddr = direction_transmit ? peripheral_address : memory_address;
lli[i].clli = (gpdma_lli_t*)((uint32_t)&lli[(i + 1) % lli_count] | lli_fetch_master); lli[i].clli = (lli[i].clli & ~GPDMA_CLLI_LM_MASK) | GPDMA_CLLI_LM(lli_fetch_master);
lli[i].ccontrol = lli[i].ccontrol =
GPDMA_CCONTROL_TRANSFERSIZE(transfer_words) | GPDMA_CCONTROL_TRANSFERSIZE(transfer_words) |
GPDMA_CCONTROL_SBSIZE(0) | GPDMA_CCONTROL_SBSIZE(0) |
@ -130,7 +130,7 @@ size_t sgpio_dma_current_transfer_index(
const gpdma_lli_t* const lli, const gpdma_lli_t* const lli,
const size_t lli_count const size_t lli_count
) { ) {
const gpdma_lli_t* const next_lli = (gpdma_lli_t*)GPDMA_CLLI(dma_channel_sgpio); const uint32_t next_lli = GPDMA_CLLI(dma_channel_sgpio);
for(size_t i=0; i<lli_count; i++) { for(size_t i=0; i<lli_count; i++) {
if( lli[i].clli == next_lli ) { if( lli[i].clli == next_lli ) {
return i; return i;

2
firmware/libopencm3

Submodule firmware/libopencm3 updated: 28e93221ca...645f50eddc