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

DataFlash: fix for HAL_SITL rename

This commit is contained in:
Andrew Tridgell 2015-05-04 16:17:39 +10:00
parent cf4602afc1
commit 69f9d25cd0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DataFlash/DataFlash_File.cpp
View File

@ -651,7 +651,7 @@ void DataFlash_File::_io_timer(void)
write. write.
*/ */
BUF_ADVANCEHEAD(_writebuf, nwritten); BUF_ADVANCEHEAD(_writebuf, nwritten);
#if CONFIG_HAL_BOARD != HAL_BOARD_AVR_SITL && CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_NONE #if CONFIG_HAL_BOARD != HAL_BOARD_SITL && CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_NONE
::fsync(_write_fd); ::fsync(_write_fd);
#endif #endif
} }

2
libraries/DataFlash/DataFlash_SITL.cpp
View File

@ -5,7 +5,7 @@
#include <AP_HAL.h> #include <AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>

4
libraries/DataFlash/DataFlash_SITL.h
View File

@ -4,7 +4,7 @@
#ifndef __DATAFLASH_SITL_H__ #ifndef __DATAFLASH_SITL_H__
#define __DATAFLASH_SITL_H__ #define __DATAFLASH_SITL_H__
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <AP_HAL.h> #include <AP_HAL.h>
#include "DataFlash.h" #include "DataFlash.h"
@ -47,5 +47,5 @@ public:
bool CardInserted(); bool CardInserted();
}; };
#endif // CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
#endif // __DATAFLASH_SITL_H__ #endif // __DATAFLASH_SITL_H__

2
libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
View File

@ -7,7 +7,7 @@
// Libraries // Libraries
#include <AP_HAL.h> #include <AP_HAL.h>
#include <AP_HAL_AVR.h> #include <AP_HAL_AVR.h>
#include <AP_HAL_AVR_SITL.h> #include <AP_HAL_SITL.h>
#include <AP_HAL_Empty.h> #include <AP_HAL_Empty.h>
#include <AP_HAL_PX4.h> #include <AP_HAL_PX4.h>