aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_HAL_AVR: SPI: adapt to the new signature of transaction()

Browse Source 
A default behaviour was added here.
This commit is contained in:
Gustavo Jose de Sousa 2015-08-19 12:39:16 -03:00 committed by Andrew Tridgell
parent 4af2a9a9cc
commit 93f5abb274
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp
View File

@ -109,7 +109,7 @@ void AVRSPI0DeviceDriver::transfer(const uint8_t *tx, uint16_t len) {
}
}
void AVRSPI0DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
bool AVRSPI0DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
uint16_t len) {
_cs_assert();
if (rx == NULL) {
@ -128,6 +128,7 @@ void AVRSPI0DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
}
}
_cs_release();
return true;
}
void AVRSPI0DeviceDriver::cs_assert() {

3
libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp
View File

@ -97,7 +97,7 @@ void AVRSPI2DeviceDriver::_transfer17(const uint8_t *tx, uint8_t *rx)
TRANSFER1(16);
}
void AVRSPI2DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
bool AVRSPI2DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
uint16_t len) {
_cs_assert();
if (rx == NULL) {
@ -116,6 +116,7 @@ void AVRSPI2DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
}
}
_cs_release();
return true;
}
void AVRSPI2DeviceDriver::cs_assert() {

3
libraries/AP_HAL_AVR/SPIDevice_SPI3.cpp
View File

@ -91,7 +91,7 @@ void AVRSPI3DeviceDriver::_transfer(const uint8_t *data, uint16_t len) {
}
}
void AVRSPI3DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
bool AVRSPI3DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
uint16_t len) {
_cs_assert();
if (rx == NULL) {
@ -102,6 +102,7 @@ void AVRSPI3DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
}
}
_cs_release();
return true;
}
void AVRSPI3DeviceDriver::cs_assert() {

6
libraries/AP_HAL_AVR/SPIDevices.h
View File

@ -23,7 +23,7 @@ public:
void init();
AP_HAL::Semaphore* get_semaphore();
void transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
bool transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
void cs_assert();
void cs_release();
@ -64,7 +64,7 @@ public:
void init();
AP_HAL::Semaphore* get_semaphore();
void transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
bool transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
void cs_assert();
void cs_release();
@ -100,7 +100,7 @@ public:
void init();
AP_HAL::Semaphore* get_semaphore();
void transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
bool transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
void cs_assert();
void cs_release();