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

DataFlash: don't take a delay_cb

This commit is contained in:
Pat Hickey 2012-12-07 20:24:06 -08:00 committed by Andrew Tridgell
parent 0e5ff36c6c
commit ef1db1a3fc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DataFlash/DataFlash.h
View File

@ -36,7 +36,7 @@ private:
virtual uint8_t BufferRead (uint8_t 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)(unsigned long)) = 0;
virtual void ChipErase() = 0;
// internal high level functions
int16_t find_last_page(void);

2
libraries/DataFlash/DataFlash_APM1.h
View File

@ -21,7 +21,7 @@ private:
uint16_t PageSize();
void PageErase (uint16_t PageAdr);
void BlockErase (uint16_t BlockAdr);
void ChipErase(void (*delay_cb)(unsigned long));
void ChipErase();
AP_HAL::SPIDeviceDriver *_spi;
AP_HAL::Semaphore *_spi_sem;

4
libraries/DataFlash/DataFlash_APM2.h
View File

@ -4,7 +4,7 @@
#ifndef __DATAFLASH_APM2_H__
#define __DATAFLASH_APM2_H__
#include <AP_Semaphore.h>
#include <AP_HAL.h>
#include "DataFlash.h"
class DataFlash_APM2 : public DataFlash_Class
@ -22,7 +22,7 @@ private:
void PageErase (uint16_t PageAdr);
void BlockErase (uint16_t BlockAdr);
void ChipErase(void (*delay_cb)(unsigned long));
void ChipErase();
AP_HAL::SPIDeviceDriver* _spi;
AP_HAL::Semaphore* _spi_sem;