Skip to content

P
PPSi
Commit b05ba577 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

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's avatarAdam Wujek <adam.wujek@cern.ch>
parent 31c9a3c9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
arch-wrs/include/ppsi-wrs.h
View file @ b05ba577
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
# define BUILT_WITH_WHITERABBIT 0 # define BUILT_WITH_WHITERABBIT 0
#endif #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 * These are the functions provided by the various wrs files
......
proto-ext-whiterabbit/wr-api.h
View file @ b05ba577
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include <ppsi/lib.h> #include <ppsi/lib.h>
#include "wr-constants.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 * This structure is used as extension-specific data in the DSPort
* (see wrspec.v2-06-07-2011, page 17) * (see wrspec.v2-06-07-2011, page 17)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment