Fine-tuning "libs" API
This commit is contained in:
parent
ffec0e2b57
commit
e8cff640ac
18 changed files with 244 additions and 204 deletions
|
|
@ -1,12 +1,12 @@
|
|||
/*
|
||||
* uart_handler.c
|
||||
* usart_handler.c
|
||||
*
|
||||
* Created on: Sep 16, 2019
|
||||
* Author: abody
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include "globals.h"
|
||||
#include <platform/usart_ll.h>
|
||||
#include "diag.h"
|
||||
#include "usart_handler.h"
|
||||
#include "dma_helper.h"
|
||||
|
|
@ -23,13 +23,20 @@
|
|||
# define DIAG_INTERRUPT_OUT()
|
||||
#endif
|
||||
|
||||
#define STARTMARKER 0x95
|
||||
|
||||
static inline uint32_t RoundUpTo4(uint32_t inp)
|
||||
{
|
||||
return (inp + 3) & 0xfffc;
|
||||
}
|
||||
|
||||
void InitUartStatus(
|
||||
UARTSTATUS *st, USART_TypeDef *uart, DMA_TypeDef *dma,
|
||||
USARTSTATUS *st, USART_TypeDef *usart, DMA_TypeDef *dma,
|
||||
uint32_t stream_rx, uint32_t stream_tx,
|
||||
struct crcstatus_t *crcStatus, uint8_t rxCrcSlot, uint8_t txCrcSlot)
|
||||
CRCSTATUS *crcStatus, uint8_t rxCrcSlot, uint8_t txCrcSlot,
|
||||
PACKETRECEIVEDCALLBACK packetReceivedCallback, void * packetReceivedCallbackParam)
|
||||
{
|
||||
st->uart = uart;
|
||||
st->usart = usart;
|
||||
InitDmaInfo(&st->rxDmaInfo, dma, stream_rx);
|
||||
InitDmaInfo(&st->txDmaInfo, dma, stream_tx);
|
||||
st->txBuffer.busy = 0;
|
||||
|
|
@ -41,6 +48,11 @@ void InitUartStatus(
|
|||
st->rxBuffers[1].error = 0;
|
||||
st->rxBuffers[0].requestedLength = 0;
|
||||
st->rxBuffers[1].requestedLength = 0;
|
||||
st->txBuffer.usartStatus = st;
|
||||
st->rxBuffers[0].usartStatus = st;
|
||||
st->rxBuffers[1].usartStatus = st;
|
||||
st->packetReceivedCallback = packetReceivedCallback;
|
||||
st->packetReceivedCallbacParam = packetReceivedCallbackParam;
|
||||
st->rxSerial = -1;
|
||||
st->txSerial = 0;
|
||||
st->activeRxBuf = 0;
|
||||
|
|
@ -53,10 +65,17 @@ void InitUartStatus(
|
|||
LL_DMA_EnableIT_TE(dma, stream_rx);
|
||||
LL_DMA_EnableIT_TC(dma, stream_tx);
|
||||
LL_DMA_EnableIT_TE(dma, stream_tx);
|
||||
LL_USART_EnableIT_IDLE(uart);
|
||||
LL_USART_EnableIT_IDLE(usart);
|
||||
}
|
||||
|
||||
static inline void BuildHeader(UARTBUFFER *buffer, uint8_t serial, uint8_t length)
|
||||
|
||||
uint8_t* GetTxBuffer(USARTSTATUS *status)
|
||||
{
|
||||
return status->txBuffer.packet.payload;
|
||||
}
|
||||
|
||||
|
||||
static inline void BuildHeader(struct usart_buffer *buffer, uint8_t serial, uint8_t length)
|
||||
{
|
||||
uint8_t hash = STARTMARKER;
|
||||
buffer->packet.header.startByte = STARTMARKER;
|
||||
|
|
@ -67,51 +86,61 @@ static inline void BuildHeader(UARTBUFFER *buffer, uint8_t serial, uint8_t lengt
|
|||
buffer->packet.header.hash = hash;
|
||||
}
|
||||
|
||||
static inline uint8_t CheckHeader(UARTPACKET *packet) {
|
||||
static inline uint8_t CheckHeader(USARTPACKET *packet) {
|
||||
return packet->header.startByte == STARTMARKER && (packet->header.startByte ^ packet->header.serial ^ packet->header.payloadLength) == packet->header.hash;
|
||||
}
|
||||
|
||||
|
||||
uint8_t PostPacket(UARTSTATUS *status, uint8_t const *payload, uint16_t length, struct crcstatus_t *crcStatus)
|
||||
uint8_t PostPacket(USARTSTATUS *status, uint8_t const *payload, uint16_t length, CRCSTATUS *crcStatus)
|
||||
{
|
||||
if(length > 256)
|
||||
return 1;
|
||||
|
||||
BuildHeader(&status->txBuffer, status->txSerial++, length);
|
||||
uint16_t payloadLength = (length+3) & 0xfffc; // round up to 4
|
||||
if(payload)
|
||||
MemcpyDma(status->txBuffer.packet.payload, payload, length);
|
||||
status->txBuffer.requestedLength = sizeof(UARTPACKETHEADER) + payloadLength + sizeof(uint32_t); // +4 for the hash
|
||||
uint16_t payloadLength = RoundUpTo4(length);
|
||||
if(payload) {
|
||||
#ifdef USART_USE_MEMCPY_DMA
|
||||
if((uint32_t)payload & 3)
|
||||
memcpy(status->txBuffer.packet.payload, payload, length);
|
||||
else
|
||||
MemcpyDma(status->txBuffer.packet.payload, payload, length);
|
||||
#else
|
||||
memcpy(status->txBuffer.packet.payload, payload, length);
|
||||
#endif
|
||||
}
|
||||
status->txBuffer.requestedLength = sizeof(USARTPACKETHEADER) + payloadLength + sizeof(uint32_t); // +4 for the hash
|
||||
status->txBuffer.busy = 1;
|
||||
status->txBuffer.error = 0;
|
||||
EnqueueCrcTask(crcStatus, status->txCrcSlot, status->txBuffer.packet.payload, length,
|
||||
NULL, (uint32_t*)(status->txBuffer.packet.payload + payloadLength));
|
||||
while(IsSlotQueued(crcStatus, status->txCrcSlot));
|
||||
SetupTransmit(status->uart, status->txDmaInfo.dma, status->txDmaInfo.stream, &status->txBuffer.packet, status->txBuffer.requestedLength);
|
||||
SetupTransmit(status->usart, status->txDmaInfo.dma, status->txDmaInfo.stream, &status->txBuffer.packet, status->txBuffer.requestedLength);
|
||||
|
||||
StatsIncSent(&status->stats);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void SetupReceive(UARTSTATUS *status)
|
||||
|
||||
void SetupReceive(USARTSTATUS *status)
|
||||
{
|
||||
uint8_t packetIndex = status->activeRxBuf;
|
||||
|
||||
LL_DMA_ConfigAddresses(status->rxDmaInfo.dma, status->rxDmaInfo.stream, LL_USART_DMA_GetRegAddr(status->uart), (uint32_t)&status->rxBuffers[packetIndex],
|
||||
LL_DMA_GetDataTransferDirection(status->rxDmaInfo.dma, status->rxDmaInfo.stream));
|
||||
LL_DMA_ConfigAddresses(status->rxDmaInfo.dma, status->rxDmaInfo.stream, LL_USART_DMA_GetRegAddr(status->usart), (uint32_t)&status->rxBuffers[packetIndex],
|
||||
LL_DMA_DIRECTION_PERIPH_TO_MEMORY);
|
||||
status->rxBuffers[packetIndex].requestedLength = sizeof(status->rxBuffers[packetIndex].packet);
|
||||
LL_DMA_SetDataLength(status->rxDmaInfo.dma, status->rxDmaInfo.stream, status->rxBuffers[packetIndex].requestedLength); // payload already have extra room for hash
|
||||
LL_USART_EnableDMAReq_RX(status->uart);
|
||||
LL_USART_ClearFlag_ORE(status->uart);
|
||||
LL_USART_EnableDMAReq_RX(status->usart);
|
||||
LL_USART_ClearFlag_ORE(status->usart);
|
||||
LL_DMA_EnableStream(status->rxDmaInfo.dma, status->rxDmaInfo.stream);
|
||||
}
|
||||
|
||||
void ConsumePacket(UARTSTATUS *status, uint8_t packetIndex, struct crcstatus_t *crcStatus)
|
||||
|
||||
void ConsumePacket(USARTSTATUS *status, uint8_t packetIndex, CRCSTATUS *crcStatus)
|
||||
{
|
||||
UARTBUFFER *buffer = &status->rxBuffers[packetIndex];
|
||||
struct usart_buffer *buffer = &status->rxBuffers[packetIndex];
|
||||
if(buffer->busy) {
|
||||
if(buffer->error)
|
||||
StatsIncPayloadError(&status->stats, buffer->errorInfo, *(uint32_t*) (buffer->packet.payload + ((buffer->packet.header.payloadLength + 1 + 3) & 0xfffc)));
|
||||
StatsIncPayloadError(&status->stats, buffer->errorInfo, *(uint32_t*) (buffer->packet.payload + RoundUpTo4(buffer->packet.header.payloadLength + 1)));
|
||||
else {
|
||||
uint8_t diff = buffer->packet.header.serial - status->rxSerial;
|
||||
if(diff > 1)
|
||||
|
|
@ -123,28 +152,31 @@ void ConsumePacket(UARTSTATUS *status, uint8_t packetIndex, struct crcstatus_t *
|
|||
buffer->busy = buffer->error = 0;
|
||||
}
|
||||
|
||||
void SetupTransmit(USART_TypeDef *uart, DMA_TypeDef* dma, uint32_t stream, void *buffer, uint32_t length)
|
||||
|
||||
void SetupTransmit(USART_TypeDef *usart, DMA_TypeDef* dma, uint32_t stream, void *buffer, uint32_t length)
|
||||
{
|
||||
LL_DMA_ConfigAddresses(dma, stream, (uint32_t)buffer, LL_USART_DMA_GetRegAddr(uart), LL_DMA_DIRECTION_MEMORY_TO_PERIPH);
|
||||
LL_DMA_ConfigAddresses(dma, stream, (uint32_t)buffer, LL_USART_DMA_GetRegAddr(usart), LL_DMA_DIRECTION_MEMORY_TO_PERIPH);
|
||||
LL_DMA_SetDataLength(dma, stream, length);
|
||||
LL_USART_EnableDMAReq_TX(uart);
|
||||
LL_USART_EnableDMAReq_TX(usart);
|
||||
LL_DMA_EnableStream(dma, stream);
|
||||
}
|
||||
|
||||
void RxCrcComputedCallback(void *callbackParm, uint32_t calculatedCrc, uint8_t success)
|
||||
{
|
||||
UARTBUFFER *ub = (UARTBUFFER*) callbackParm;
|
||||
struct usart_buffer *ub = (struct usart_buffer*) callbackParm;
|
||||
if(!success)
|
||||
ub->error = 1;
|
||||
else if(*(uint32_t*) (ub->packet.payload + ((ub->packet.header.payloadLength + 1 + 3) & 0xfffc)) == calculatedCrc)
|
||||
else if(*(uint32_t*) (ub->packet.payload + RoundUpTo4(ub->packet.header.payloadLength + 1)))
|
||||
ub->busy = 1;
|
||||
else {
|
||||
ub->error = ub->busy = 1;
|
||||
ub->errorInfo = calculatedCrc;
|
||||
}
|
||||
if(ub->usartStatus->packetReceivedCallback)
|
||||
ub->usartStatus->packetReceivedCallback(ub->usartStatus->packetReceivedCallbacParam, ub);
|
||||
}
|
||||
|
||||
void HandleUsartRxDmaIrq(UARTSTATUS *status)
|
||||
void HandleUsartRxDmaIrq(USARTSTATUS *status)
|
||||
{
|
||||
DIAG_INTERRUPT_IN();
|
||||
StatsIncRcvd(&status->stats);
|
||||
|
|
@ -173,12 +205,12 @@ void HandleUsartRxDmaIrq(UARTSTATUS *status)
|
|||
DIAG_INTERRUPT_OUT();
|
||||
}
|
||||
|
||||
void HandleUsartTxDmaIrq(UARTSTATUS *status)
|
||||
void HandleUsartTxDmaIrq(USARTSTATUS *status)
|
||||
{
|
||||
DIAG_INTERRUPT_IN();
|
||||
if(*status->txDmaInfo.isReg & status->txDmaInfo.tcMask) { // DMA transfer complete
|
||||
*status->txDmaInfo.ifcReg = status->txDmaInfo.tcMask;
|
||||
LL_USART_EnableIT_TC(status->uart);
|
||||
LL_USART_EnableIT_TC(status->usart);
|
||||
LL_DMA_DisableStream(status->txDmaInfo.dma, status->txDmaInfo.stream);
|
||||
}
|
||||
else if(*status->txDmaInfo.isReg & status->txDmaInfo.teMask) {
|
||||
|
|
@ -195,15 +227,15 @@ void HandleUsartTxDmaIrq(UARTSTATUS *status)
|
|||
DIAG_INTERRUPT_OUT();
|
||||
}
|
||||
|
||||
void HandleUsartIrq(UARTSTATUS *status)
|
||||
void HandleUsartIrq(USARTSTATUS *status)
|
||||
{
|
||||
DIAG_INTERRUPT_IN();
|
||||
if(LL_USART_IsActiveFlag_IDLE(status->uart) && LL_USART_IsEnabledIT_IDLE(status->uart)) { // receiver idle
|
||||
LL_USART_ClearFlag_IDLE(status->uart);
|
||||
if(LL_USART_IsActiveFlag_IDLE(status->usart) && LL_USART_IsEnabledIT_IDLE(status->usart)) { // receiver idle
|
||||
LL_USART_ClearFlag_IDLE(status->usart);
|
||||
uint16_t rcvdLen = status->rxBuffers[status->activeRxBuf].requestedLength - LL_DMA_GetDataLength(status->rxDmaInfo.dma, status->rxDmaInfo.stream);
|
||||
if(rcvdLen >= sizeof(UARTPACKETHEADER)) {
|
||||
if(rcvdLen >= sizeof(USARTPACKETHEADER)) {
|
||||
if(CheckHeader(&status->rxBuffers[status->activeRxBuf].packet)) {
|
||||
if(rcvdLen >= sizeof(UARTPACKETHEADER) + ((status->rxBuffers[status->activeRxBuf].packet.header.payloadLength + 1 + 3) &0xfffc) + sizeof(uint32_t))
|
||||
if(rcvdLen >= sizeof(USARTPACKETHEADER) + RoundUpTo4(status->rxBuffers[status->activeRxBuf].packet.header.payloadLength + 1) + sizeof(uint32_t))
|
||||
LL_DMA_DisableStream(status->rxDmaInfo.dma, status->rxDmaInfo.stream);
|
||||
else
|
||||
StatsIncPremature_payload(&status->stats);
|
||||
|
|
@ -214,10 +246,10 @@ void HandleUsartIrq(UARTSTATUS *status)
|
|||
} else
|
||||
StatsIncPremature_hdr(&status->stats);
|
||||
}
|
||||
else if(LL_USART_IsActiveFlag_TC(status->uart) && LL_USART_IsEnabledIT_TC(status->uart)) { // transmission complete
|
||||
LL_USART_DisableIT_TC(status->uart);
|
||||
LL_USART_DisableDirectionTx(status->uart); // enforcing an idle frame
|
||||
LL_USART_EnableDirectionTx(status->uart);
|
||||
else if(LL_USART_IsActiveFlag_TC(status->usart) && LL_USART_IsEnabledIT_TC(status->usart)) { // transmission complete
|
||||
LL_USART_DisableIT_TC(status->usart);
|
||||
LL_USART_DisableDirectionTx(status->usart); // enforcing an idle frame
|
||||
LL_USART_EnableDirectionTx(status->usart);
|
||||
status->txBuffer.busy = 0;
|
||||
}
|
||||
DIAG_INTERRUPT_OUT();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue