diff --git a/src/drivers/drv_gps.h b/src/drivers/drv_gps.h index adb06cdb03..8d7b5c1dfe 100644 --- a/src/drivers/drv_gps.h +++ b/src/drivers/drv_gps.h @@ -37,8 +37,7 @@ * GPS driver interface. */ -#ifndef _DRV_GPS_H -#define _DRV_GPS_H +#pragma once #include #include @@ -52,8 +51,6 @@ #define GPS_DEFAULT_UART_PORT "/dev/ttyS3" #endif -#define GPS0_DEVICE_PATH "/dev/gps0" - typedef enum { GPS_DRIVER_MODE_NONE = 0, GPS_DRIVER_MODE_UBX, @@ -61,16 +58,3 @@ typedef enum { GPS_DRIVER_MODE_ASHTECH } gps_driver_mode_t; - -/* - * ObjDev tag for GPS data. - */ -ORB_DECLARE(gps); - -/* - * ioctl() definitions - */ -#define _GPSIOCBASE (0x2800) //TODO: arbitrary choice... -#define _GPSIOC(_n) (_IOC(_GPSIOCBASE, _n)) - -#endif /* _DRV_GPS_H */ diff --git a/src/platforms/posix/drivers/gpssim/gpssim.cpp b/src/platforms/posix/drivers/gpssim/gpssim.cpp index b4c7af7097..7a86abf356 100644 --- a/src/platforms/posix/drivers/gpssim/gpssim.cpp +++ b/src/platforms/posix/drivers/gpssim/gpssim.cpp @@ -466,7 +466,7 @@ start(const char *uart_path, bool fake_gps, bool enable_sat_info) DevMgr::getHandle(GPSSIM_DEVICE_PATH, h); if (!h.isValid()) { - PX4_ERR("getHandle failed: %s", GPS0_DEVICE_PATH); + PX4_ERR("getHandle failed: %s", GPSSIM_DEVICE_PATH); goto fail; }