ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DMA fix

pull/1340/head
Srod Karim 2015-07-23 14:45:56 +02:00 committed by Aksel Skauge Mellbye
parent f1e1977506
commit c328fb068e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/clocking.h
View File

@ -51,3 +51,10 @@
#endif #endif
#endif #endif
#if ( defined(CMU_CTRL_HFLE) && (REFERENCE_FREQUENCY > 24000000) )
#define LEUART__HF_REF_FREQ (REFERENCE_FREQUENCY / 4)
#else
#define LEUART_HF_REF_FREQ (REFERENCE_FREQUENCY / 2)
#endif
#define LEUART_LF_REF_FREQ LFXO_FREQUENCY

17
libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/serial_api.c
View File

@ -129,10 +129,8 @@ static void uart_init(serial_t *obj)
init.databits = leuartDatabits8; init.databits = leuartDatabits8;
init.parity = leuartNoParity; init.parity = leuartNoParity;
init.stopbits = leuartStopbits1; init.stopbits = leuartStopbits1;
init.refFreq = LEUART_LF_REF_FREQ;
/* Determine the reference clock, because the correct clock is not set up at init time */
init.refFreq = 0;
LEUART_Reset(obj->serial.periph.leuart);
LEUART_Init(obj->serial.periph.leuart, &init); LEUART_Init(obj->serial.periph.leuart, &init);
} else { } else {
USART_InitAsync_TypeDef init = USART_INITASYNC_DEFAULT; USART_InitAsync_TypeDef init = USART_INITASYNC_DEFAULT;
@ -483,12 +481,13 @@ void serial_baud(serial_t *obj, int baudrate)
CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_CORELEDIV2); CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_CORELEDIV2);
CMU_ClockEnable(cmuClock_LFB, true); CMU_ClockEnable(cmuClock_LFB, true);
CMU_ClockSelectSet(serial_get_clock(obj), cmuSelect_CORELEDIV2); CMU_ClockSelectSet(serial_get_clock(obj), cmuSelect_CORELEDIV2);
LEUART_BaudrateSet(obj->serial.periph.leuart, LEUART_HF_REF_FREQ, (uint32_t)baudrate);
}else{ }else{
CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_LFXO); CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_LFXO);
CMU_ClockEnable(cmuClock_LFB, true); CMU_ClockEnable(cmuClock_LFB, true);
CMU_ClockSelectSet(serial_get_clock(obj), cmuSelect_LFXO); CMU_ClockSelectSet(serial_get_clock(obj), cmuSelect_LFXO);
LEUART_BaudrateSet(obj->serial.periph.leuart, LEUART_LF_REF_FREQ, (uint32_t)baudrate);
} }
LEUART_BaudrateSet(obj->serial.periph.leuart, 0, (uint32_t)baudrate);
} else { } else {
USART_BaudrateAsyncSet(obj->serial.periph.uart, REFERENCE_FREQUENCY, (uint32_t)baudrate, usartOVS16); USART_BaudrateAsyncSet(obj->serial.periph.uart, REFERENCE_FREQUENCY, (uint32_t)baudrate, usartOVS16);
} }
@ -1061,22 +1060,16 @@ static void serial_dmaActivate(serial_t *obj, void* cb, void* buffer, int length
channelConfig.hprot = 0; channelConfig.hprot = 0;
DMA_CfgDescr(obj->serial.dmaOptionsTX.dmaChannel, true, &channelConfig); DMA_CfgDescr(obj->serial.dmaOptionsTX.dmaChannel, true, &channelConfig);
if(LEUART_REF_VALID(obj->serial.periph.leuart)) { if(LEUART_REF_VALID(obj->serial.periph.leuart)) {
// Activate TX // Activate TX
obj->serial.periph.leuart->CMD = LEUART_CMD_TXEN; obj->serial.periph.leuart->CMD = LEUART_CMD_TXEN;
while(obj->serial.periph.leuart->SYNCBUSY & LEUART_SYNCBUSY_CMD);
// Clear TX buffer
obj->serial.periph.leuart->CMD = LEUART_CMD_CLEARTX;
// Kick off TX DMA // Kick off TX DMA
DMA_ActivateBasic(obj->serial.dmaOptionsTX.dmaChannel, true, false, (void*) &(obj->serial.periph.leuart->TXDATA), buffer, length - 1); DMA_ActivateBasic(obj->serial.dmaOptionsTX.dmaChannel, true, false, (void*) &(obj->serial.periph.leuart->TXDATA), buffer, length - 1);
} else { } else {
// Activate TX // Activate TX
obj->serial.periph.uart->CMD = USART_CMD_TXEN; obj->serial.periph.uart->CMD = USART_CMD_TXEN | USART_CMD_CLEARTX;
// Clear TX buffer
obj->serial.periph.uart->CMD = USART_CMD_CLEARTX;
// Kick off TX DMA // Kick off TX DMA
DMA_ActivateBasic(obj->serial.dmaOptionsTX.dmaChannel, true, false, (void*) &(obj->serial.periph.uart->TXDATA), buffer, length - 1); DMA_ActivateBasic(obj->serial.dmaOptionsTX.dmaChannel, true, false, (void*) &(obj->serial.periph.uart->TXDATA), buffer, length - 1);