arch-wrs: move WRS_PPSI_SHMEM_VERSION to proto-ext-whiterabbit/wr-api.h

file arch-wrs/include/ppsi-wrs.h is local to ppsi and including from wrs causes conflicts. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

arch-wrs: move WRS_PPSI_SHMEM_VERSION to proto-ext-whiterabbit/wr-api.h
file arch-wrs/include/ppsi-wrs.h is local to ppsi and including from wrs causes conflicts. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
b05ba577 · Adam Wujek · 31c9a3c9 · b05ba577 · b05ba577
Commit b05ba577 authored Feb 11, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ppsi-wrs.h arch-wrs/include/ppsi-wrs.h +0 -2

wr-api.h proto-ext-whiterabbit/wr-api.h +3 -0

No files found.
--- a/arch-wrs/include/ppsi-wrs.h
+++ b/arch-wrs/include/ppsi-wrs.h
@@ -10,8 +10,6 @@
 #  define BUILT_WITH_WHITERABBIT 0
 #endif

-#define WRS_PPSI_SHMEM_VERSION 3 /* added fields to pp_globals and
-				    wr_servo_state_t */

 /*
 * These are the functions provided by the various wrs files

--- a/proto-ext-whiterabbit/wr-api.h
+++ b/proto-ext-whiterabbit/wr-api.h
@@ -12,6 +12,9 @@
 #include <ppsi/lib.h>
 #include "wr-constants.h"

+#define WRS_PPSI_SHMEM_VERSION 3 /* added fields to pp_globals and
+				    wr_servo_state_t */
+
 /*
 * This structure is used as extension-specific data in the DSPort
 * (see wrspec.v2-06-07-2011, page 17)