Skip to content

W
White Rabbit Switch - Software
Commit 8baa63de authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/snmpd: remove wrsPpsi.c 

Remove definitions from MIB.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent c964266a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 769 deletions
userspace/snmpd/Makefile
View file @ 8baa63de
......@@ -29,7 +29,6 @@ SOURCES = \
snmp_shmem.c \
wrsScalar.c \
wrsPstats.c \
wrsPpsi.c \
wrsVersion.c \
wrsDate.c \
shmem.c \
......
userspace/snmpd/WR-SWITCH-MIB.txt
View file @ 8baa63de
......@@ -33,7 +33,7 @@ cern OBJECT IDENTIFIER ::= { enterprises 96 }
-- we'll prefix everything in this mib with wrs (White Rabbit Switch)
wrsScalar OBJECT IDENTIFIER ::= { wrSwitchMIB 1 }
wrsPstatsTable OBJECT IDENTIFIER ::= { wrSwitchMIB 2 } -- going to be obsolete
wrsPpsi OBJECT IDENTIFIER ::= { wrSwitchMIB 3 } -- going to be obsolete
--wrsPpsi OBJECT IDENTIFIER ::= { wrSwitchMIB 3 } == obsolete
wrsVersion OBJECT IDENTIFIER ::= { wrSwitchMIB 4 } -- going to be obsolete
wrsDate OBJECT IDENTIFIER ::= { wrSwitchMIB 5 } -- going to be obsolete
wrsExpertStatus OBJECT IDENTIFIER ::= { wrSwitchMIB 6 }
......@@ -249,170 +249,6 @@ pstatsWR17 OBJECT-TYPE
"The value of this counter for interface wr17."
::= {pstatsEntry 19 }
--following objects will be moved
wrsPpsiGlobalsX OBJECT IDENTIFIER ::= { wrsPpsi 3 }
wrsPortsTableX OBJECT IDENTIFIER ::= { wrsPpsi 4 }
-- The Wr/PTP/Ppsi information is two items: an array of scalars
-- and a table. In the table, the "channel" name is the row. But
-- the index is integer, following what ppsi does internally
-- globals (.3)
ptpGrandmasterIDX OBJECT-TYPE
SYNTAX OCTET STRING (SIZE(8))
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The ClockID of the current grandmaster"
::= { wrsPpsiGlobalsX 1 }
ptpOwnIDX OBJECT-TYPE
SYNTAX OCTET STRING (SIZE(8))
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The ClockID of this WR device"
::= { wrsPpsiGlobalsX 2 }
ptpModeX OBJECT-TYPE
SYNTAX INTEGER {
unknown(0), -- same as WRC_MODE macros
grandmaster(1),
master(2),
slave(3)
}
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The mode of this clock"
::= { wrsPpsiGlobalsX 3 }
ptpServoStateX OBJECT-TYPE
SYNTAX DisplayString (SIZE (0..32))
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The servo state if slave"
::= { wrsPpsiGlobalsX 4 }
ptpServoStateNX OBJECT-TYPE
SYNTAX INTEGER {
Uninitialized(0),
SYNC-NSEC(1), -- no idea how to keep "_" instead of "-"
SYNC-SEC(2),
SYNC-PHASE(3),
TRACK-PHASE(4),
WAIT-SYNC-IDLE(5),
WAIT-OFFSET-STABLE(6)
}
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Numeric representation of servo state"
::= { wrsPpsiGlobalsX 5 }
ptpPhaseTrackingX OBJECT-TYPE
SYNTAX INTEGER {
NA(0),
not-tracking(1),
tracking(2)
}
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Whether phase tracking is enabled in the servo"
::= { wrsPpsiGlobalsX 6 }
ptpSyncSourceX OBJECT-TYPE
SYNTAX DisplayString (SIZE (0..32))
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The port name that is currently the synchronization source"
::= { wrsPpsiGlobalsX 7 }
ptpClockOffsetPsX OBJECT-TYPE
SYNTAX Counter64 -- should be integer64 (signed)
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Current clock offset from master, in picoseconds"
::= { wrsPpsiGlobalsX 8 }
ptpClockOffsetPsHRX OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Human Readable current clock offset from master, in picoseconds with saturation to integer"
::= { wrsPpsiGlobalsX 9 }
ptpSkewX OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The estimated change of master-to-slave delay, in picoseconds"
::= { wrsPpsiGlobalsX 10 }
ptpRTTX OBJECT-TYPE
SYNTAX Counter64 -- does unsigned64 exits?
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The round-trip-time, from master, in picoseconds"
::= { wrsPpsiGlobalsX 11 }
ptpLinkLengthX OBJECT-TYPE
SYNTAX Unsigned32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Estimated fiber length, from master-to-slave delay, in meters"
::= { wrsPpsiGlobalsX 12 }
ptpServoUpdatesX OBJECT-TYPE
SYNTAX Unsigned32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"How many time did the servo run"
::= { wrsPpsiGlobalsX 13 }
ptpDeltaTxMX OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Tx latency on Master side"
::= { wrsPpsiGlobalsX 14 }
ptpDeltaRxMX OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Rx latency on Master side"
::= { wrsPpsiGlobalsX 15 }
ptpDeltaTxSX OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Tx latency on Slave side"
::= { wrsPpsiGlobalsX 16 }
ptpDeltaRxSX OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Rx latency on Slave side"
::= { wrsPpsiGlobalsX 17 }
-- Versions (4) are all just strings, several of them
wrsVersionSw OBJECT-TYPE
......
userspace/snmpd/init.c
View file @ 8baa63de
......@@ -20,7 +20,6 @@ void init_wrsSnmp(void)
init_shm();
init_wrsScalar();
init_wrsPstats();
init_wrsPpsi();
init_wrsVersion();
init_wrsDate();
init_wrsPtpDataTable();
......
userspace/snmpd/wrsPpsi.c deleted 100644 → 0
View file @ c964266a
This diff is collapsed.
userspace/snmpd/wrsSnmp.h
View file @ 8baa63de
......@@ -103,7 +103,6 @@ extern void init_wrsScalar(void);
/* Real stuff follows */
extern void init_wrsPstats(void);
extern void init_wrsPpsi(void);
extern void init_wrsVersion(void);
extern void init_wrsDate(void);
......
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