Skip to content
Snippets Groups Projects
Commit 04e36edb authored by Adam Wujek's avatar Adam Wujek 💬
Browse files

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


Keep ClockIdentity related stuff in wrsSnmp.h

Signed-off-by: default avatarAdam Wujek <adam.wujek@cern.ch>
parent 5d73110d
No related merge requests found
#include "wrsSnmp.h" #include "wrsSnmp.h"
#include "snmp_shmem.h"
struct wrs_shm_head *hal_head; struct wrs_shm_head *hal_head;
struct hal_shmem_header *hal_shmem; struct hal_shmem_header *hal_shmem;
......
#ifndef WRS_SNMP_SHMEM_H #ifndef WRS_SNMP_SHMEM_H
#define 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(); void init_shm();
#endif /* WRS_SNMP_SHMEM_H */ #endif /* WRS_SNMP_SHMEM_H */
#include "wrsSnmp.h" #include "wrsSnmp.h"
#include "snmp_shmem.h"
#include "wrsPortStatusTable.h" #include "wrsPortStatusTable.h"
/* Our data: per-port information */ /* Our data: per-port information */
......
#include "wrsSnmp.h" #include "wrsSnmp.h"
#include "snmp_shmem.h"
#include "wrsPtpDataTable.h" #include "wrsPtpDataTable.h"
struct wrsPtpDataTable_s wrsPtpDataTable_array[WRS_MAX_N_SERVO_INSTANCES]; struct wrsPtpDataTable_s wrsPtpDataTable_array[WRS_MAX_N_SERVO_INSTANCES];
......
...@@ -14,18 +14,6 @@ ...@@ -14,18 +14,6 @@
#undef INST #undef INST
#include <ppsi/ieee1588_types.h> /* for ClockIdentity */ #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, * local hack: besides the file pointer, that is there anyways,
* everything else is not actually built if WRS_WITH_SNMP_HACKISH_LOG * everything else is not actually built if WRS_WITH_SNMP_HACKISH_LOG
......
#include "wrsSnmp.h" #include "wrsSnmp.h"
#include "snmp_shmem.h"
#include "wrsTemperature.h" #include "wrsTemperature.h"
static struct pickinfo wrsTemperature_pickinfo[] = { static struct pickinfo wrsTemperature_pickinfo[] = {
......
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