Commit 21c39f78 authored by Adam Wujek's avatar Adam Wujek 💬

userspace/snmpd: add Group suffix to files with groups

No technical change. Make names more clear and consistent.
Renamed:
--wrsTemperature to wrsTemperatureGroup
--wrsOSStatus to wrsOSStatusGroup
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent fe70c334
......@@ -33,8 +33,8 @@ SOURCES = \
shmem.c \
wrsPtpDataTable.c \
wrsCurrentTimeGroup.c \
wrsTemperature.c \
wrsOSStatus.c \
wrsTemperatureGroup.c \
wrsOSStatusGroup.c \
wrsVersionGroup.c \
wrsPortStatusTable.c \
wrsGeneralStatusGroup.c
......
......@@ -12,8 +12,8 @@
#include "wrsPstatsTable.h"
#include "wrsPtpDataTable.h"
#include "wrsCurrentTimeGroup.h"
#include "wrsTemperature.h"
#include "wrsOSStatus.h"
#include "wrsTemperatureGroup.h"
#include "wrsOSStatusGroup.h"
#include "wrsVersionGroup.h"
#include "wrsPortStatusTable.h"
#include "wrsGeneralStatusGroup.h"
......@@ -28,8 +28,8 @@ void init_wrsSnmp(void)
init_wrsPstatsTable();
init_wrsPtpDataTable();
init_wrsCurrentTimeGroup();
init_wrsTemperature();
init_wrsOSStatus();
init_wrsTemperatureGroup();
init_wrsOSStatusGroup();
init_wrsVersionGroup();
init_wrsPortStatusTable();
init_wrsGeneralStatusGroup();
......
......@@ -107,7 +107,7 @@ time_t wrsCurrentTime_data_fill(void)
#define GT_PICKINFO wrsCurrentTime_pickinfo
#define GT_DATA_FILL_FUNC wrsCurrentTime_data_fill
#define GT_DATA_STRUCT wrsCurrentTime_s
#define GT_GROUP_NAME "wrsCurrentTime"
#define GT_GROUP_NAME "wrsCurrentTimeGroup"
#define GT_INIT_FUNC init_wrsCurrentTimeGroup
#include "wrsGroupTemplate.h"
#include "wrsSnmp.h"
#include "shmem_snmp.h"
#include "snmp_shmem.h"
#include "wrsCurrentTimeGroup.h"
#include "wrsOSStatus.h"
#include "wrsOSStatusGroup.h"
#include "wrsPortStatusTable.h"
#include "wrsPstatsTable.h"
#include "wrsPtpDataTable.h"
#include "wrsStartCntGroup.h"
#include "wrsTemperature.h"
#include "wrsTemperatureGroup.h"
#include "wrsVersionGroup.h"
#include "wrsGeneralStatusGroup.h"
......
#include "wrsSnmp.h"
#include "wrsTemperature.h"
#include "wrsOSStatus.h"
#include "wrsTemperatureGroup.h"
#include "wrsOSStatusGroup.h"
static struct pickinfo wrsOSStatus_pickinfo[] = {
FIELD(wrsOSStatus_s, ASN_INTEGER, wrsBootSuccessful),
......@@ -52,7 +52,7 @@ time_t wrsOSStatus_data_fill(void)
#define GT_PICKINFO wrsOSStatus_pickinfo
#define GT_DATA_FILL_FUNC wrsOSStatus_data_fill
#define GT_DATA_STRUCT wrsOSStatus_s
#define GT_GROUP_NAME "wrsOSStatus"
#define GT_INIT_FUNC init_wrsOSStatus
#define GT_GROUP_NAME "wrsOSStatusGroup"
#define GT_INIT_FUNC init_wrsOSStatusGroup
#include "wrsGroupTemplate.h"
#ifndef WRS_WRS_OSSTATUS_H
#define WRS_WRS_OSSTATUS_H
#ifndef WRS_OSSTATUS_GROUP_H
#define WRS_OSSTATUS_GROUP_H
#define WRSOSSTATUS_OID WRS_OID, 254, 1, 1
......@@ -14,6 +14,6 @@ struct wrsOSStatus_s {
extern struct wrsOSStatus_s wrsOSStatus_s;
time_t wrsOSStatus_data_fill(void);
void init_wrsOSStatus(void);
void init_wrsOSStatusGroup(void);
#endif /* WRS_WRS_OSSTATUS_H */
#endif /* WRS_OSSTATUS_GROUP_H */
#include "wrsSnmp.h"
#include "shmem_snmp.h"
#include "snmp_shmem.h"
#include "wrsStartCntGroup.h"
static struct pickinfo wrsStartCnt_pickinfo[] = {
......@@ -38,7 +38,7 @@ time_t wrsStartCnt_data_fill(void){
#define GT_PICKINFO wrsStartCnt_pickinfo
#define GT_DATA_FILL_FUNC wrsStartCnt_data_fill
#define GT_DATA_STRUCT wrsStartCnt_s
#define GT_GROUP_NAME "wrsStartCnt"
#define GT_GROUP_NAME "wrsStartCntGroup"
#define GT_INIT_FUNC init_wrsStartCntGroup
#include "wrsGroupTemplate.h"
#include "wrsSnmp.h"
#include "snmp_shmem.h"
#include "wrsTemperature.h"
#include "wrsTemperatureGroup.h"
static struct pickinfo wrsTemperature_pickinfo[] = {
FIELD(wrsTemperature_s, ASN_INTEGER, temp_fpga),
......@@ -61,7 +61,7 @@ time_t wrsTemperature_data_fill(void)
#define GT_PICKINFO wrsTemperature_pickinfo
#define GT_DATA_FILL_FUNC wrsTemperature_data_fill
#define GT_DATA_STRUCT wrsTemperature_s
#define GT_GROUP_NAME "wrsTemperature"
#define GT_INIT_FUNC init_wrsTemperature
#define GT_GROUP_NAME "wrsTemperatureGroup"
#define GT_INIT_FUNC init_wrsTemperatureGroup
#include "wrsGroupTemplate.h"
#ifndef WRS_WRS_TEMPERATURE_H
#define WRS_WRS_TEMPERATURE_H
#ifndef WRS_TEMPERATURE_GROUP_H
#define WRS_TEMPERATURE_GROUP_H
#define WRSTEMPERATURE_CACHE_TIMEOUT 5
#define WRSTEMPERATURE_OID WRS_OID, 6, 1, 3
......@@ -18,5 +18,5 @@ struct wrsTemperature_s {
extern struct wrsTemperature_s wrsTemperature_s;
time_t wrsTemperature_data_fill(void);
void init_wrsTemperature(void);
#endif /* WRS_WRS_TEMPERATURE_H */
void init_wrsTemperatureGroup(void);
#endif /* WRS_TEMPERATURE_GROUP_H */
......@@ -92,7 +92,7 @@ time_t wrsVersion_data_fill(void)
#define GT_PICKINFO wrsVersion_pickinfo
#define GT_DATA_FILL_FUNC wrsVersion_data_fill
#define GT_DATA_STRUCT wrsVersion_s
#define GT_GROUP_NAME "wrsVersion"
#define GT_GROUP_NAME "wrsVersionGroup"
#define GT_INIT_FUNC init_wrsVersionGroup
#include "wrsGroupTemplate.h"
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