userspace: updates to support servo state in ppsi's shmem

Changes include: - lift of ppsi commit - temporarly define WRS_PPSI_SHMEM_VERSION in wrs_dump_shmem.c since dumper requires structure updates Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace: updates to support servo state in ppsi's shmem
Changes include: - lift of ppsi commit - temporarly define WRS_PPSI_SHMEM_VERSION in wrs_dump_shmem.c since dumper requires structure updates Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
a977b274 · Adam Wujek · 2bd4bc4b · b05ba577 · a977b274
Commit a977b274 authored Feb 05, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ppsi userspace/ppsi +1 -1

wrs_dump_shmem.c userspace/tools/wrs_dump_shmem.c +4 -0

No files found.
--- a/ppsi @ b05ba577
+++ b/ppsi @ b05ba577
-Subproject commit 2181324ae355f72299abc63b5fa8c9e1fcc742b1
+Subproject commit b05ba5771509acb64bc3404304341be48dc25419
--- a/userspace/tools/wrs_dump_shmem.c
+++ b/userspace/tools/wrs_dump_shmem.c
@@ -24,6 +24,10 @@
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

+#ifdef WRS_PPSI_SHMEM_VERSION
+#undef WRS_PPSI_SHMEM_VERSION
+#define WRS_PPSI_SHMEM_VERSION 1 /* temporary */
+#endif

 char *name_id_to_name[WRS_SHM_N_NAMES] = {
 	[wrs_shm_ptp] = "ptpd/ppsi",