Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DataFlash: revert delay callbacks to use "unsigned long"

This commit is contained in:
rmackay9 2012-08-18 20:28:31 +09:00
parent 20cb2e56a0
commit 2b24e422de
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DataFlash/DataFlash.cpp
View File

@ -187,7 +187,7 @@ uint16_t DataFlash_Class::GetFilePage()
return df_FilePage;
}
void DataFlash_Class::EraseAll(void (*delay_cb)(uint32_t))
void DataFlash_Class::EraseAll(void (*delay_cb)(unsigned long))
{
for(uint16_t j = 1; j <= (df_NumPages+1)/8; j++) {
BlockErase(j);

4
libraries/DataFlash/DataFlash.h
View File

@ -36,7 +36,7 @@ class DataFlash_Class
virtual unsigned char BufferRead (unsigned char BufferNum, uint16_t IntPageAdr) = 0;
virtual void PageErase(uint16_t PageAdr) = 0;
virtual void BlockErase(uint16_t BlockAdr) = 0;
virtual void ChipErase(void (*delay_cb)(uint32_t)) = 0;
virtual void ChipErase(void (*delay_cb)(unsigned long)) = 0;
// internal high level functions
int16_t find_last_page(void);
@ -58,7 +58,7 @@ class DataFlash_Class
int16_t GetWritePage(void);
// erase handling
void EraseAll(void (*delay_cb)(uint32_t));
void EraseAll(void (*delay_cb)(unsigned long));
bool NeedErase(void);
// Write methods

2
libraries/DataFlash/DataFlash_APM1.cpp
View File

@ -317,7 +317,7 @@ void DataFlash_APM1::BlockErase (uint16_t BlockAdr)
void DataFlash_APM1::ChipErase(void (*delay_cb)(uint32_t))
void DataFlash_APM1::ChipErase(void (*delay_cb)(unsigned long))
{
dataflash_CS_active(); // activate dataflash command decoder

2
libraries/DataFlash/DataFlash_APM1.h
View File

@ -20,7 +20,7 @@ class DataFlash_APM1 : public DataFlash_Class
uint16_t PageSize();
void PageErase (uint16_t PageAdr);
void BlockErase (uint16_t BlockAdr);
void ChipErase(void (*delay_cb)(uint32_t));
void ChipErase(void (*delay_cb)(unsigned long));
public:

2
libraries/DataFlash/DataFlash_APM2.cpp
View File

@ -394,7 +394,7 @@ void DataFlash_APM2::BlockErase(uint16_t BlockAdr)
}
void DataFlash_APM2::ChipErase(void (*delay_cb)(uint32_t))
void DataFlash_APM2::ChipErase(void (*delay_cb)(unsigned long))
{
//serialDebug("Chip Erase\n");

2
libraries/DataFlash/DataFlash_APM2.h
View File

@ -24,7 +24,7 @@ class DataFlash_APM2 : public DataFlash_Class
void CS_active();
void PageErase (uint16_t PageAdr);
void BlockErase (uint16_t BlockAdr);
void ChipErase(void (*delay_cb)(uint32_t));
void ChipErase(void (*delay_cb)(unsigned long));
public:
DataFlash_APM2(); // Constructor