Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash_APM2: renamed semaphore to spi3_semaphore to make it more obvious which semaphore is required.

Browse Source
This commit is contained in:
rmackay9 2012-10-18 17:00:05 +09:00
parent 890bed4918
commit 5f2c900797
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/DataFlash/DataFlash_APM2.cpp
View File

@ -97,8 +97,8 @@ unsigned char DataFlash_APM2::SPI_transfer(unsigned char data)
// get spi3 semaphore if required. if failed to get semaphore then
// just quietly fail
if ( _semaphore != NULL) {
if( !_semaphore->get(this) ) {
if ( _spi3_semaphore != NULL) {
if( !_spi3_semaphore->get(this) ) {
return 0;
}
}
@ -113,8 +113,8 @@ unsigned char DataFlash_APM2::SPI_transfer(unsigned char data)
retval = UDR3;
// release spi3 semaphore
if ( _semaphore != NULL) {
_semaphore->release(this);
if ( _spi3_semaphore != NULL) {
_spi3_semaphore->release(this);
}
return retval;

4
libraries/DataFlash/DataFlash_APM2.h
View File

@ -27,9 +27,9 @@ private:
void BlockErase (uint16_t BlockAdr);
void ChipErase(void (*delay_cb)(unsigned long));
AP_Semaphore* _semaphore;
AP_Semaphore* _spi3_semaphore;
public:
DataFlash_APM2(AP_Semaphore* semaphore = NULL) : _semaphore(semaphore) {}
DataFlash_APM2(AP_Semaphore* spi3_semaphore = NULL) : _spi3_semaphore(spi3_semaphore) {}
void Init();
void ReadManufacturerID();