userspace/snmpd: move shmem related includes from wrsSnmp.h to shmem_snmp.h

Keep ClockIdentity related stuff in wrsSnmp.h Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/snmpd: move shmem related includes from wrsSnmp.h to shmem_snmp.h
Keep ClockIdentity related stuff in wrsSnmp.h Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
04e36edb · Adam Wujek · 5d73110d · 04e36edb · 04e36edb · 04e36edb
Commit 04e36edb authored Mar 26, 2015 by Adam Wujek 💬
6 changed files
--- a/userspace/snmpd/snmp_shmem.c
+++ b/userspace/snmpd/snmp_shmem.c
 #include "wrsSnmp.h"
-
+#include "snmp_shmem.h"

 struct wrs_shm_head *hal_head;
 struct hal_shmem_header *hal_shmem;

--- a/userspace/snmpd/snmp_shmem.h
+++ b/userspace/snmpd/snmp_shmem.h
 #ifndef WRS_SNMP_SHMEM_H
 #define WRS_SNMP_SHMEM_H

+#include <libwr/shmem.h>
+#include <libwr/hal_shmem.h>
+#include <ppsi/ppsi.h>
+#include <libwr/hal_shmem.h>
+
+/* HAL */
+extern struct wrs_shm_head *hal_head;
+extern struct hal_shmem_header *hal_shmem;
+extern struct hal_port_state *hal_ports;
+extern int hal_nports_local;
+
+/* PPSI */
+extern struct wrs_shm_head *ppsi_head;
+extern struct wr_servo_state_t *ppsi_servo;
+
 void init_shm();

 #endif /* WRS_SNMP_SHMEM_H */
--- a/userspace/snmpd/wrsPortStatusTable.c
+++ b/userspace/snmpd/wrsPortStatusTable.c
 #include "wrsSnmp.h"
+#include "snmp_shmem.h"
 #include "wrsPortStatusTable.h"

 /* Our data: per-port information */

--- a/userspace/snmpd/wrsPtpDataTable.c
+++ b/userspace/snmpd/wrsPtpDataTable.c
 #include "wrsSnmp.h"
+#include "snmp_shmem.h"
 #include "wrsPtpDataTable.h"

 struct wrsPtpDataTable_s wrsPtpDataTable_array[WRS_MAX_N_SERVO_INSTANCES];

--- a/userspace/snmpd/wrsSnmp.h
+++ b/userspace/snmpd/wrsSnmp.h
@@ -14,18 +14,6 @@
 #undef INST
 #include <ppsi/ieee1588_types.h> /* for ClockIdentity */

-#include <libwr/shmem.h>
-#include <libwr/hal_shmem.h>
-#include <ppsi/ppsi.h>
-#include <libwr/hal_shmem.h>
-
-extern struct wrs_shm_head *hal_head;
-extern struct hal_shmem_header *hal_shmem;
-extern struct hal_port_state *hal_ports;
-extern int hal_nports_local;
-extern struct wrs_shm_head *ppsi_head;
-extern struct wr_servo_state_t *ppsi_servo;
-
 /*
 * local hack: besides the file pointer, that is there anyways,
 * everything else  is not actually built if WRS_WITH_SNMP_HACKISH_LOG

--- a/userspace/snmpd/wrsTemperature.c
+++ b/userspace/snmpd/wrsTemperature.c
 #include "wrsSnmp.h"
+#include "snmp_shmem.h"
 #include "wrsTemperature.h"

 static struct pickinfo wrsTemperature_pickinfo[] = {