lib/snmp: add object wrpcVersionSwVersion

Add object with wrpc's version. For example: WR-WRPC-MIB::wrWrpcMIB.3.1.0 = STRING: "wrpc-v3.0-161-g4d63c77-dirty" Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

lib/snmp: add object wrpcVersionSwVersion
Add object with wrpc's version. For example: WR-WRPC-MIB::wrWrpcMIB.3.1.0 = STRING: "wrpc-v3.0-161-g4d63c77-dirty" Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
1d3a29bb · Adam Wujek · e2d40413 · 1d3a29bb · 1d3a29bb
Commit 1d3a29bb authored Mar 08, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

WR-WRPC-MIB.txt lib/WR-WRPC-MIB.txt +9 -0

snmp.c lib/snmp.c +3 -0

No files found.
--- a/lib/WR-WRPC-MIB.txt
+++ b/lib/WR-WRPC-MIB.txt
@@ -39,6 +39,7 @@ cern OBJECT IDENTIFIER ::= { enterprises 96 }
 -- we'll prefix everything in this mib with wrs (White Rabbit Switch)
 wrpcPtp      OBJECT IDENTIFIER ::= { wrWrpcMIB 1 }
 wrpcNic      OBJECT IDENTIFIER ::= { wrWrpcMIB 2 }
+wrpcVersion  OBJECT IDENTIFIER ::= { wrWrpcMIB 3 }

 wrpcPtpRTTHR OBJECT-TYPE
    SYNTAX      Integer32
@@ -80,4 +81,12 @@ wrpcNicRX   OBJECT-TYPE
        ""
    ::= { wrpcNic 2 }

+wrpcVersionSwVersion   OBJECT-TYPE
+    SYNTAX      DisplayString (SIZE (0..32))
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+        ""
+    ::= { wrpcVersion 1 }
+
 END
--- a/lib/snmp.c
+++ b/lib/snmp.c
@@ -17,6 +17,7 @@
 #include "pps_gen.h"
 #include "hw/memlayout.h"
 #include "hw/etherbone-config.h"
+#include "revision.h"

 #ifndef htons
 #define htons(x) x
@@ -180,6 +181,7 @@ static uint8_t oid_wrpcPtpDeltaMs[] =     {0x2B,6,1,4,1,96,101,1,2,0};
 static uint8_t oid_wrpcPtpCurSetpoint[] = {0x2B,6,1,4,1,96,101,1,3,0};
 static uint8_t oid_wrpcNicTX[] =          {0x2B,6,1,4,1,96,101,2,1,0};
 static uint8_t oid_wrpcNicRX[] =          {0x2B,6,1,4,1,96,101,2,2,0};
+static uint8_t oid_wrpcVersionSwVersion[] = {0x2B,6,1,4,1,96,101,3,1,0};


 #define OID_FIELD_STRUCT(_oid, _fname, _asn, _type, _pointer, _field) { \
@@ -227,6 +229,7 @@ static struct snmp_oid oid_array[] = {
 	OID_FIELD_STRUCT(oid_wrpcPtpCurSetpoint, fill_struct_pp_asn, ASN_INTEGER,  struct wr_servo_state, &wr_s_state, cur_setpoint),
 	OID_FIELD_STRUCT(oid_wrpcNicTX,          fill_struct_p_asn, ASN_COUNTER,  struct wr_minic, &minic, tx_count),
 	OID_FIELD_STRUCT(oid_wrpcNicRX,          fill_struct_p_asn, ASN_COUNTER,  struct wr_minic, &minic, rx_count),
+	OID_FIELD_VAR(oid_wrpcVersionSwVersion,    fill_struct_pp_asn, ASN_OCTET_STR, &build_revision),
 	
 	{ 0, }
 };