Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 05:45:31 +03:00
Code Issues Wiki Activity

Made serial const correct

Browse source
This commit is contained in:
Martin Budden 2016-10-03 23:00:16 +01:00
parent 7316a589f3
commit 661aa7469d
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/drivers/serial.c
View file

@ -56,12 +56,12 @@ void serialWriteBuf(serialPort_t *instance, uint8_t *data, int count)
} }
} }
uint32_t serialRxBytesWaiting(serialPort_t *instance) uint32_t serialRxBytesWaiting(const serialPort_t *instance)
{ {
return instance->vTable->serialTotalRxWaiting(instance); return instance->vTable->serialTotalRxWaiting(instance);
} }
uint32_t serialTxBytesFree(serialPort_t *instance) uint32_t serialTxBytesFree(const serialPort_t *instance)
{ {
return instance->vTable->serialTotalTxFree(instance); return instance->vTable->serialTotalTxFree(instance);
} }
@ -76,7 +76,7 @@ void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate)
instance->vTable->serialSetBaudRate(instance, baudRate); instance->vTable->serialSetBaudRate(instance, baudRate);
} }
bool isSerialTransmitBufferEmpty(serialPort_t *instance) bool isSerialTransmitBufferEmpty(const serialPort_t *instance)
{ {
return instance->vTable->isSerialTransmitBufferEmpty(instance); return instance->vTable->isSerialTransmitBufferEmpty(instance);
} }

12
src/main/drivers/serial.h
View file

@ -62,15 +62,15 @@ typedef struct serialPort_s {
struct serialPortVTable { struct serialPortVTable {
void (*serialWrite)(serialPort_t *instance, uint8_t ch); void (*serialWrite)(serialPort_t *instance, uint8_t ch);
uint32_t (*serialTotalRxWaiting)(serialPort_t *instance); uint32_t (*serialTotalRxWaiting)(const serialPort_t *instance);
uint32_t (*serialTotalTxFree)(serialPort_t *instance); uint32_t (*serialTotalTxFree)(const serialPort_t *instance);
uint8_t (*serialRead)(serialPort_t *instance); uint8_t (*serialRead)(serialPort_t *instance);
// Specified baud rate may not be allowed by an implementation, use serialGetBaudRate to determine actual baud rate in use. // Specified baud rate may not be allowed by an implementation, use serialGetBaudRate to determine actual baud rate in use.
void (*serialSetBaudRate)(serialPort_t *instance, uint32_t baudRate); void (*serialSetBaudRate)(serialPort_t *instance, uint32_t baudRate);
bool (*isSerialTransmitBufferEmpty)(serialPort_t *instance); bool (*isSerialTransmitBufferEmpty)(const serialPort_t *instance);
void (*setMode)(serialPort_t *instance, portMode_t mode); void (*setMode)(serialPort_t *instance, portMode_t mode);
@ -81,13 +81,13 @@ struct serialPortVTable {
}; };
void serialWrite(serialPort_t *instance, uint8_t ch); void serialWrite(serialPort_t *instance, uint8_t ch);
uint32_t serialRxBytesWaiting(serialPort_t *instance); uint32_t serialRxBytesWaiting(const serialPort_t *instance);
uint32_t serialTxBytesFree(serialPort_t *instance); uint32_t serialTxBytesFree(const serialPort_t *instance);
void serialWriteBuf(serialPort_t *instance, uint8_t *data, int count); void serialWriteBuf(serialPort_t *instance, uint8_t *data, int count);
uint8_t serialRead(serialPort_t *instance); uint8_t serialRead(serialPort_t *instance);
void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate); void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate);
void serialSetMode(serialPort_t *instance, portMode_t mode); void serialSetMode(serialPort_t *instance, portMode_t mode);
bool isSerialTransmitBufferEmpty(serialPort_t *instance); bool isSerialTransmitBufferEmpty(const serialPort_t *instance);
void serialPrint(serialPort_t *instance, const char *str); void serialPrint(serialPort_t *instance, const char *str);
uint32_t serialGetBaudRate(serialPort_t *instance); uint32_t serialGetBaudRate(serialPort_t *instance);

6
src/main/drivers/serial_softserial.c
View file

@ -401,7 +401,7 @@ void onSerialRxPinChange(timerCCHandlerRec_t *cbRec, captureCompare_t capture)
} }
} }
uint32_t softSerialRxBytesWaiting(serialPort_t *instance) uint32_t softSerialRxBytesWaiting(const serialPort_t *instance)
{ {
if ((instance->mode & MODE_RX) == 0) { if ((instance->mode & MODE_RX) == 0) {
return 0; return 0;
@ -412,7 +412,7 @@ uint32_t softSerialRxBytesWaiting(serialPort_t *instance)
return (s->port.rxBufferHead - s->port.rxBufferTail) & (s->port.rxBufferSize - 1); return (s->port.rxBufferHead - s->port.rxBufferTail) & (s->port.rxBufferSize - 1);
} }
uint32_t softSerialTxBytesFree(serialPort_t *instance) uint32_t softSerialTxBytesFree(const serialPort_t *instance)
{ {
if ((instance->mode & MODE_TX) == 0) { if ((instance->mode & MODE_TX) == 0) {
return 0; return 0;
@ -463,7 +463,7 @@ void softSerialSetMode(serialPort_t *instance, portMode_t mode)
instance->mode = mode; instance->mode = mode;
} }
bool isSoftSerialTransmitBufferEmpty(serialPort_t *instance) bool isSoftSerialTransmitBufferEmpty(const serialPort_t *instance)
{ {
return instance->txBufferHead == instance->txBufferTail; return instance->txBufferHead == instance->txBufferTail;
} }

6
src/main/drivers/serial_softserial.h
View file

@ -28,9 +28,9 @@ serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallb
// serialPort API // serialPort API
void softSerialWriteByte(serialPort_t *instance, uint8_t ch); void softSerialWriteByte(serialPort_t *instance, uint8_t ch);
uint32_t softSerialRxBytesWaiting(serialPort_t *instance); uint32_t softSerialRxBytesWaiting(const serialPort_t *instance);
uint32_t softSerialTxBytesFree(serialPort_t *instance); uint32_t softSerialTxBytesFree(const serialPort_t *instance);
uint8_t softSerialReadByte(serialPort_t *instance); uint8_t softSerialReadByte(serialPort_t *instance);
void softSerialSetBaudRate(serialPort_t *s, uint32_t baudRate); void softSerialSetBaudRate(serialPort_t *s, uint32_t baudRate);
bool isSoftSerialTransmitBufferEmpty(serialPort_t *s); bool isSoftSerialTransmitBufferEmpty(const serialPort_t *s);

12
src/main/drivers/serial_uart.c
View file

@ -291,9 +291,9 @@ void uartStartTxDMA(uartPort_t *s)
#endif #endif
} }
uint32_t uartTotalRxBytesWaiting(serialPort_t *instance) uint32_t uartTotalRxBytesWaiting(const serialPort_t *instance)
{ {
uartPort_t *s = (uartPort_t*)instance; const uartPort_t *s = (const uartPort_t*)instance;
#ifdef STM32F4 #ifdef STM32F4
if (s->rxDMAStream) { if (s->rxDMAStream) {
uint32_t rxDMAHead = s->rxDMAStream->NDTR; uint32_t rxDMAHead = s->rxDMAStream->NDTR;
@ -315,9 +315,9 @@ uint32_t uartTotalRxBytesWaiting(serialPort_t *instance)
} }
} }
uint32_t uartTotalTxBytesFree(serialPort_t *instance) uint32_t uartTotalTxBytesFree(const serialPort_t *instance)
{ {
uartPort_t *s = (uartPort_t*)instance; const uartPort_t *s = (const uartPort_t*)instance;
uint32_t bytesUsed; uint32_t bytesUsed;
@ -358,9 +358,9 @@ uint32_t uartTotalTxBytesFree(serialPort_t *instance)
return (s->port.txBufferSize - 1) - bytesUsed; return (s->port.txBufferSize - 1) - bytesUsed;
} }
bool isUartTransmitBufferEmpty(serialPort_t *instance) bool isUartTransmitBufferEmpty(const serialPort_t *instance)
{ {
uartPort_t *s = (uartPort_t *)instance; const uartPort_t *s = (const uartPort_t *)instance;
#ifdef STM32F4 #ifdef STM32F4
if (s->txDMAStream) if (s->txDMAStream)
#else #else

6
src/main/drivers/serial_uart.h
View file

@ -65,8 +65,8 @@ serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback,
// serialPort API // serialPort API
void uartWrite(serialPort_t *instance, uint8_t ch); void uartWrite(serialPort_t *instance, uint8_t ch);
uint32_t uartTotalRxBytesWaiting(serialPort_t *instance); uint32_t uartTotalRxBytesWaiting(const serialPort_t *instance);
uint32_t uartTotalTxBytesFree(serialPort_t *instance); uint32_t uartTotalTxBytesFree(const serialPort_t *instance);
uint8_t uartRead(serialPort_t *instance); uint8_t uartRead(serialPort_t *instance);
void uartSetBaudRate(serialPort_t *s, uint32_t baudRate); void uartSetBaudRate(serialPort_t *s, uint32_t baudRate);
bool isUartTransmitBufferEmpty(serialPort_t *s); bool isUartTransmitBufferEmpty(const serialPort_t *s);