DriverFramework/cmake_hexagon: use defines with DF

This changes the following defines: __QURT -> __DF_QURT __RPI -> __DF_RPI __EDISON -> __DF_EDISON __BEBOP -> __DF_BEBOP __LINUX -> __DF_LINUX
PX4 · Oct 18, 2016 · f8a1631 · f8a1631
1 parent e4398c7
commit f8a1631
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/cmake/cmake_hexagon b/cmake/cmake_hexagon
diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake
@@ -4,8 +4,8 @@ set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-
 
 add_definitions(
   -D__PX4_POSIX_BEBOP
-  -D__LINUX
-  -D__BEBOP
+  -D__DF_LINUX
+  -D__DF_BEBOP
 	)
 
 set(CMAKE_PROGRAM_PATH

diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake
@@ -56,7 +56,7 @@ foreach(tool echo grep rm mkdir nm cp touch make unzip)
 endforeach()
 
 add_definitions(
-	-D __RPI
+	-D __DF_RPI
 	)
 
 # where is the target environment

diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake
@@ -71,7 +71,7 @@ foreach(tool echo grep rm mkdir nm cp touch make unzip)
 endforeach()
 
 add_definitions(
-	-D __RPI
+	-D __DF_RPI
 	)
 
 set(LINKER_FLAGS "-Wl,-gc-sections")

diff --git a/src/lib/DriverFramework b/src/lib/DriverFramework
diff --git a/src/platforms/posix/px4_layer/drv_hrt.c b/src/platforms/posix/px4_layer/drv_hrt.c
@@ -118,7 +118,7 @@ int px4_clock_settime(clockid_t clk_id, struct timespec *tp)
 	return 0;
 }
 
-#elif defined(__QURT)
+#elif defined(__PX4_QURT)
 
 #include "dspal_time.h"