Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00
Code Issues Wiki Activity

Make names more clear

Browse source
This commit is contained in:
jflyper 2017-07-11 15:12:13 +09:00
parent a864b869ae
commit f9f4b4263c
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/drivers/bus_spi.c
View file

@ -206,14 +206,14 @@ bool spiIsBusBusy(SPI_TypeDef *instance)
} }
bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len) bool spiTransfer(SPI_TypeDef *instance, uint8_t *rxData, const uint8_t *txData, int len)
{ {
uint16_t spiTimeout = 1000; uint16_t spiTimeout = 1000;
uint8_t b; uint8_t b;
instance->DR; instance->DR;
while (len--) { while (len--) {
b = out ? *(out++) : 0xFF; b = txData ? *(txData++) : 0xFF;
while (SPI_I2S_GetFlagStatus(instance, SPI_I2S_FLAG_TXE) == RESET) { while (SPI_I2S_GetFlagStatus(instance, SPI_I2S_FLAG_TXE) == RESET) {
if ((spiTimeout--) == 0) if ((spiTimeout--) == 0)
return spiTimeoutUserCallback(instance); return spiTimeoutUserCallback(instance);
@ -233,8 +233,8 @@ bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len
#else #else
b = SPI_I2S_ReceiveData(instance); b = SPI_I2S_ReceiveData(instance);
#endif #endif
if (in) if (rxData)
*(in++) = b; *(rxData++) = b;
} }
return true; return true;

4
src/main/drivers/bus_spi.h
View file

@ -85,10 +85,10 @@ typedef enum SPIDevice {
void spiPreInitCs(ioTag_t iotag); void spiPreInitCs(ioTag_t iotag);
bool spiInit(SPIDevice device); bool spiInit(SPIDevice device);
void spiSetDivisor(SPI_TypeDef *instance, uint16_t divisor); void spiSetDivisor(SPI_TypeDef *instance, uint16_t divisor);
uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t in); uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data);
bool spiIsBusBusy(SPI_TypeDef *instance); bool spiIsBusBusy(SPI_TypeDef *instance);
bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len); bool spiTransfer(SPI_TypeDef *instance, rxData *in, const uint8_t *txData, int len);
uint16_t spiGetErrorCounter(SPI_TypeDef *instance); uint16_t spiGetErrorCounter(SPI_TypeDef *instance);
void spiResetErrorCounter(SPI_TypeDef *instance); void spiResetErrorCounter(SPI_TypeDef *instance);

14
src/main/drivers/bus_spi_hal.c
View file

@ -261,22 +261,22 @@ bool spiIsBusBusy(SPI_TypeDef *instance)
return false; return false;
} }
bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len) bool spiTransfer(SPI_TypeDef *instance, uint8_t *rxData, const uint8_t *txData, int len)
{ {
SPIDevice device = spiDeviceByInstance(instance); SPIDevice device = spiDeviceByInstance(instance);
HAL_StatusTypeDef status; HAL_StatusTypeDef status;
if (!in) // Tx only if (!in) // Tx only
{ {
status = HAL_SPI_Transmit(&spiDevice[device].hspi, (uint8_t *)out, len, SPI_DEFAULT_TIMEOUT); status = HAL_SPI_Transmit(&spiDevice[device].hspi, (uint8_t *)txData, len, SPI_DEFAULT_TIMEOUT);
} }
else if (!out) // Rx only else if (!out) // Rx only
{ {
status = HAL_SPI_Receive(&spiDevice[device].hspi, in, len, SPI_DEFAULT_TIMEOUT); status = HAL_SPI_Receive(&spiDevice[device].hspi, rxData, len, SPI_DEFAULT_TIMEOUT);
} }
else // Tx and Rx else // Tx and Rx
{ {
status = HAL_SPI_TransmitReceive(&spiDevice[device].hspi, out, in, len, SPI_DEFAULT_TIMEOUT); status = HAL_SPI_TransmitReceive(&spiDevice[device].hspi, txData, rxData, len, SPI_DEFAULT_TIMEOUT);
} }
if ( status != HAL_OK) if ( status != HAL_OK)
@ -295,10 +295,10 @@ static bool spiBusReadBuffer(const busDevice_t *bus, uint8_t *out, int len)
} }
// return uint8_t value or -1 when failure // return uint8_t value or -1 when failure
uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t in) uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data)
{ {
spiTransfer(instance, &in, &in, 1); spiTransfer(instance, &data, &data, 1);
return in; return data;
} }
// return uint8_t value or -1 when failure // return uint8_t value or -1 when failure