userspace/wrsw_hal: add hal_mode to shmem

hal_mode can be: --TIME_GM (Grand-Master) --TIME_FM (Free-Running Master) --TIME_BC (Boundary Clock) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/wrsw_hal: add hal_mode to shmem
hal_mode can be: --TIME_GM (Grand-Master) --TIME_FM (Free-Running Master) --TIME_BC (Boundary Clock) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
b2fea31d · Adam Wujek · 24fe7c67 · b2fea31d · d0192a54 · b2fea31d
Commit b2fea31d authored Jul 10, 2015 by Adam Wujek 💬
Showing with 6 additions and 3 deletions

hal_shmem.h userspace/libwr/include/libwr/hal_shmem.h +3 -2

ppsi userspace/ppsi +1 -1

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

hal_ports.c userspace/wrsw_hal/hal_ports.c +1 -0

No files found.
--- a/userspace/libwr/include/libwr/hal_shmem.h
+++ b/userspace/libwr/include/libwr/hal_shmem.h
@@ -110,10 +110,11 @@ struct hal_temp_sensors {
 };

 /* This is the overall structure stored in shared memory */
-#define HAL_SHMEM_VERSION 7 /* Version 7 because of moving of reading
-			     * temperature treshold values to snmpd */
+#define HAL_SHMEM_VERSION 8 /* Version 8 because of adding HAL mode */
+
 struct hal_shmem_header {
 	int nports;
+	int hal_mode;
 	struct hal_port_state *ports;
 	struct hal_temp_sensors temp;
 };

--- a/ppsi @ d0192a54
+++ b/ppsi @ d0192a54
-Subproject commit ac3206500476b95ec31b0013d2b5488dd83c76cd
+Subproject commit d0192a54c1948c268ab54122288f508aaae86a3b
--- a/userspace/tools/wrs_dump_shmem.c
+++ b/userspace/tools/wrs_dump_shmem.c
@@ -238,6 +238,7 @@ void dump_many_fields(void *addr, struct dump_info *info, int ninfo)
 #define DUMP_STRUCT struct hal_shmem_header
 struct dump_info hal_shmem_info [] = {
 	DUMP_FIELD(int, nports),
+	DUMP_FIELD(int, hal_mode),
 	DUMP_FIELD(sensor_temp, temp.fpga),
 	DUMP_FIELD(sensor_temp, temp.pll),
 	DUMP_FIELD(sensor_temp, temp.psl),

--- a/userspace/wrsw_hal/hal_ports.c
+++ b/userspace/wrsw_hal/hal_ports.c
@@ -230,6 +230,7 @@ int hal_port_init_all()
 	/* We are done, mark things as valid */
 	hal_shmem->nports = hal_port_nports;
 	hal_shmem_hdr->version = HAL_SHMEM_VERSION;
+	hal_shmem->hal_mode = hal_get_timing_mode();
 	/* Release processes waiting for HAL's to fill shm with correct data
 	   When shm is opened successfully data in shm is still not populated!
 	   Read data with wrs_shm_seqbegin and wrs_shm_seqend!