Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: remove ifdef checks for HAL_BOARD_LINUX

Browse Source 
Everything inside libraries/AP_HAL_Linux is for Linux boards, there's
not need to add the ifdefs.
This commit is contained in:
Lucas De Marchi 2016-05-17 22:44:30 -03:00
parent c4306de122
commit 45c6b750f2
37 changed files with 6 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_HAL_Linux/AnalogIn.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AnalogIn.h"
using namespace Linux;
@ -43,5 +42,3 @@ void AnalogIn::init()
AP_HAL::AnalogSource* AnalogIn::channel(int16_t n) {
return new AnalogSource(1.11);
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AnalogIn_ADS1115.h"
AnalogSource_ADS1115::AnalogSource_ADS1115(int16_t pin):
@ -95,5 +93,3 @@ void AnalogIn_ADS1115::_update()
_last_update_timestamp = AP_HAL::micros();
}
#endif

3
libraries/AP_HAL_Linux/AnalogIn_IIO.cpp
View File

@ -1,7 +1,6 @@
/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AnalogIn_IIO.h"
extern const AP_HAL::HAL& hal;
@ -125,5 +124,3 @@ void AnalogIn_IIO::init()
AP_HAL::AnalogSource* AnalogIn_IIO::channel(int16_t pin) {
return new AnalogSource_IIO(pin, 0.0f, IIO_VOLTAGE_SCALING);
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/AnalogIn_Navio2.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AnalogIn_Navio2.h"
#include <cstdio>
@ -124,5 +122,3 @@ void AnalogIn_Navio2::init()
_board_voltage_pin = channel(0);
_servorail_pin = channel(1);
}
#endif

4
libraries/AP_HAL_Linux/AnalogIn_Raspilot.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AnalogIn_Raspilot.h"
#include "px4io_protocol.h"
@ -135,5 +133,3 @@ void AnalogIn_Raspilot::_update()
_last_update_timestamp = AP_HAL::micros();
}
#endif

3
libraries/AP_HAL_Linux/ConsoleDevice.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "ConsoleDevice.h"
#include <stdio.h>
@ -80,5 +79,3 @@ void ConsoleDevice::set_blocking(bool blocking)
void ConsoleDevice::set_speed(uint32_t baudrate)
{
}
#endif

4
libraries/AP_HAL_Linux/GPIO.cpp
View File

@ -1,8 +1,6 @@
#include <AP_HAL/AP_HAL.h>
#include "GPIO.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
using namespace Linux;
static const AP_HAL::HAL& hal = AP_HAL::get_HAL();
@ -32,5 +30,3 @@ void DigitalSource::toggle()
{
write(!read());
}
#endif

4
libraries/AP_HAL_Linux/GPIO.h
View File

@ -2,8 +2,6 @@
#include "AP_HAL_Linux.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
class Linux::DigitalSource : public AP_HAL::DigitalSource {
public:
DigitalSource(uint8_t v);
@ -30,5 +28,3 @@ private:
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
#include "GPIO_Bebop.h"
#endif
#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX

2
libraries/AP_HAL_Linux/GPIO_Sysfs.cpp
View File

@ -2,7 +2,7 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_QFLIGHT
#if CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_QFLIGHT
#include <fcntl.h>
#include <stdio.h>

4
libraries/AP_HAL_Linux/GPIO_Sysfs.h
View File

@ -2,8 +2,6 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AP_HAL_Linux.h"
#include "GPIO.h"
@ -78,5 +76,3 @@ protected:
*/
static bool _export_pin(uint8_t vpin);
};
#endif

6
libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
View File

@ -1,11 +1,9 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <assert.h>
#include "HAL_Linux_Class.h"
#include "AP_HAL_Linux_Private.h"
#include <AP_HAL/AP_HAL.h>
#include <AP_HAL/utility/getopt_cpp.h>
#include <stdio.h>
#include <unistd.h>
@ -351,5 +349,3 @@ const AP_HAL::HAL& AP_HAL::get_HAL() {
static const HAL_Linux hal;
return hal;
}
#endif

3
libraries/AP_HAL_Linux/I2CDriver.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "I2CDriver.h"
#include "Util.h"
@ -283,5 +282,3 @@ AP_HAL::Semaphore *I2CDriver::get_semaphore()
{
return _fake_dev->get_semaphore();
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/PWM_Sysfs.cpp
View File

@ -15,11 +15,8 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "PWM_Sysfs.h"
#include <errno.h>
@ -283,4 +280,3 @@ PWM_Sysfs_Bebop::PWM_Sysfs_Bebop(uint8_t channel) :
}
}
#endif

2
libraries/AP_HAL_Linux/Perf.cpp
View File

@ -18,7 +18,7 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && !defined(PERF_LTTNG)
#if !defined(PERF_LTTNG)
#include <limits.h>
#include <time.h>

3
libraries/AP_HAL_Linux/Perf_Lttng.cpp
View File

@ -16,7 +16,8 @@
#include <AP_HAL/AP_HAL.h>
#pragma GCC diagnostic ignored "-Wcast-align"
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && defined(PERF_LTTNG)
#if defined(PERF_LTTNG)
#define TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_DEFINE
#include "Perf_Lttng_TracePoints.h"

6
libraries/AP_HAL_Linux/RCInput.cpp
View File

@ -1,6 +1,3 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <stdio.h>
#include <sys/time.h>
#include <stdio.h>
@ -16,6 +13,7 @@
#include "RCInput.h"
#include "sbus.h"
#include <AP_HAL/AP_HAL.h>
#include <AP_HAL/utility/dsm.h>
extern const AP_HAL::HAL& hal;
@ -406,5 +404,3 @@ void RCInput::add_dsm_input(const uint8_t *bytes, size_t nbytes)
}
}
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/RCInput_UART.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCInput_UART.h"
#include <errno.h>
@ -92,5 +90,3 @@ void RCInput_UART::_timer_tick()
_pdata = (uint8_t *)&_data;
_remain = sizeof(_data);
}
#endif

2
libraries/AP_HAL_Linux/RCInput_UDP.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCInput_UDP.h"
#include <stdio.h>
@ -51,4 +50,3 @@ void RCInput_UDP::_timer_tick(void)
_update_periods(_buf.pwms, RCINPUT_UDP_NUM_CHANNELS);
}
}
#endif

3
libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <stdio.h>
#include <sys/time.h>
#include <stdio.h>
@ -50,5 +49,3 @@ void RCInput_ZYNQ::_timer_tick()
_process_rc_pulse(_s0_time, (v & 0x7fffffff)/TICK_PER_US);
}
}
#endif // CONFIG_HAL_BOARD

5
libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp
View File

@ -12,8 +12,6 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCOutput_AioPRU.h"
#include <fcntl.h>
#include <unistd.h>
@ -128,6 +126,3 @@ void RCOutput_AioPRU::read(uint16_t* period_us, uint8_t len)
period_us[i] = pwm->channel[i].time_high / TICK_PER_US;
}
}
#endif

4
libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp
View File

@ -2,8 +2,6 @@
#include <AP_HAL/AP_HAL.h>
#include "GPIO.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCOutput_PCA9685.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -248,5 +246,3 @@ void RCOutput_PCA9685::read(uint16_t* period_us, uint8_t len)
for (int i = 0; i < len; i++)
period_us[i] = read(0 + i);
}
#endif

4
libraries/AP_HAL_Linux/RCOutput_PRU.cpp
View File

@ -1,8 +1,6 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCOutput_PRU.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -88,5 +86,3 @@ void RCOutput_PRU::read(uint16_t* period_us, uint8_t len)
period_us[i] = sharedMem_cmd->hilo_read[chan_pru_map[i]][1]/TICK_PER_US;
}
}
#endif

4
libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
View File

@ -18,8 +18,6 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCOutput_Sysfs.h"
#include <AP_Common/AP_Common.h>
@ -120,5 +118,3 @@ void RCOutput_Sysfs::read(uint16_t *period_us, uint8_t len)
}
}
}
#endif

4
libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp
View File

@ -1,8 +1,6 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RCOutput_ZYNQ.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -85,5 +83,3 @@ void RCOutput_ZYNQ::read(uint16_t* period_us, uint8_t len)
period_us[i] = sharedMem_cmd->periodhi[i].hi/TICK_PER_US;
}
}
#endif

4
libraries/AP_HAL_Linux/RPIOUARTDriver.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "RPIOUARTDriver.h"
#include <stdlib.h>
@ -289,5 +287,3 @@ void RPIOUARTDriver::_timer_tick(void)
_last_update_timestamp = AP_HAL::micros();
}
#endif

3
libraries/AP_HAL_Linux/SPIDriver.cpp
View File

@ -1,7 +1,6 @@
#include <AP_Common/AP_Common.h>
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "SPIDriver.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -290,5 +289,3 @@ AP_HAL::SPIDeviceDriver *SPIDeviceManager::device(enum AP_HAL::SPIDeviceType dev
}
return NULL;
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/SPIUARTDriver.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <stdlib.h>
#include <cstdio>
#include "SPIUARTDriver.h"
@ -238,5 +236,3 @@ void SPIUARTDriver::_timer_tick(void)
_last_update_timestamp = AP_HAL::micros();
}
#endif

4
libraries/AP_HAL_Linux/Semaphores.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "Semaphores.h"
extern const AP_HAL::HAL& hal;
@ -35,5 +33,3 @@ bool Semaphore::take_nonblocking()
{
return pthread_mutex_trylock(&_lock) == 0;
}
#endif // CONFIG_HAL_BOARD

2
libraries/AP_HAL_Linux/Semaphores.h
View File

@ -2,7 +2,6 @@
#include <AP_HAL/AP_HAL_Boards.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "AP_HAL_Linux.h"
#include <pthread.h>
@ -17,4 +16,3 @@ public:
private:
pthread_mutex_t _lock;
};
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/Storage.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
@ -189,5 +187,3 @@ void Storage::_timer_tick(void)
}
}
}
#endif // CONFIG_HAL_BOARD

3
libraries/AP_HAL_Linux/Storage_FRAM.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
@ -258,5 +257,3 @@ int8_t Storage_FRAM::transaction(uint8_t* tx, uint8_t* rx, uint16_t len){
_spi_sem->give();
return 0;
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/TCPServerDevice.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
@ -120,5 +118,3 @@ void TCPServerDevice::set_blocking(bool blocking)
void TCPServerDevice::set_speed(uint32_t speed)
{
}
#endif

5
libraries/AP_HAL_Linux/ToneAlarm.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "ToneAlarm.h"
#include <stdio.h>
@ -255,6 +253,3 @@ bool ToneAlarm::init_tune(){
wholenote = (60 * 1000L / bpm) * 4; // this is the time for whole note (in milliseconds)
return true;
}
#endif

4
libraries/AP_HAL_Linux/UARTDevice.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <termios.h>
#include <stdio.h>
#include <errno.h>
@ -119,5 +117,3 @@ void UARTDevice::set_speed(uint32_t baudrate)
cfsetspeed(&t, baudrate);
tcsetattr(_fd, TCSANOW, &t);
}
#endif

4
libraries/AP_HAL_Linux/UARTDriver.cpp
View File

@ -2,8 +2,6 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include "UARTDriver.h"
#include <stdio.h>
@ -628,5 +626,3 @@ void UARTDriver::_timer_tick(void)
_in_timer = false;
}
#endif // CONFIG_HAL_BOARD

4
libraries/AP_HAL_Linux/UDPDevice.cpp
View File

@ -1,7 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <stdio.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@ -67,5 +65,3 @@ void UDPDevice::set_speed(uint32_t speed)
{
}
#endif

3
libraries/AP_HAL_Linux/Util.cpp
View File

@ -1,6 +1,5 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#include <stdio.h>
#include <stdarg.h>
#include <sys/stat.h>
@ -206,5 +205,3 @@ close_end:
end:
return ret;
}
#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX