[Linuxptp-devel] [PATCH v5 02/11] tlv: Encode and decode power profile TLVs.

[Richard Cochran]

Signed-off-by: Richard Cochran <richardcoch...@gmail.com>
---
 tlv.c | 36 ++++++++++++++++++++++++++++++++++++
 tlv.h | 24 ++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/tlv.c b/tlv.c
index 7a2a4fa..fb807e8 100644
--- a/tlv.c
+++ b/tlv.c
@@ -35,6 +35,7 @@
        (tlv->length < sizeof(struct type) - sizeof(struct TLV))
 
 uint8_t ieee8021_id[3] = { IEEE_802_1_COMMITTEE };
+uint8_t ieeec37_238_id[3] = { IEEE_C37_238_PROFILE };
 uint8_t itu_t_id[3] = { ITU_T_COMMITTEE };
 
 static TAILQ_HEAD(tlv_pool, tlv_extra) tlv_pool =
@@ -680,6 +681,7 @@ static void nsm_resp_pre_send(struct tlv_extra *extra)
 
 static int org_post_recv(struct organization_tlv *org)
 {
+       struct ieee_c37_238_2017_tlv *p;
        struct follow_up_info_tlv *f;
        struct msg_interface_rate_tlv *m;
 
@@ -718,6 +720,24 @@ static int org_post_recv(struct organization_tlv *org)
                }
 
        }
+       if (0 == memcmp(org->id, ieeec37_238_id, sizeof(ieeec37_238_id))) {
+               if (org->subtype[0] || org->subtype[1]) {
+                       return 0;
+               }
+               switch (org->subtype[2]) {
+               case 1:
+               case 2:
+                       /* Layout of 2011 and 2017 messages is compatible. */
+                       if (org->length + sizeof(struct TLV) !=
+                           sizeof(struct ieee_c37_238_2017_tlv))
+                               goto bad_length;
+                       p = (struct ieee_c37_238_2017_tlv *) org;
+                       NTOHS(p->grandmasterID);
+                       NTOHL(p->reserved1);
+                       NTOHL(p->totalTimeInaccuracy);
+                       break;
+               }
+       }
        return 0;
 bad_length:
        return -EBADMSG;
@@ -725,6 +745,7 @@ bad_length:
 
 static void org_pre_send(struct organization_tlv *org)
 {
+       struct ieee_c37_238_2017_tlv *p;
        struct follow_up_info_tlv *f;
        struct msg_interface_rate_tlv *m;
 
@@ -754,6 +775,21 @@ static void org_pre_send(struct organization_tlv *org)
                        break;
                }
        }
+       if (0 == memcmp(org->id, ieeec37_238_id, sizeof(ieeec37_238_id))) {
+               if (org->subtype[0] || org->subtype[1]) {
+                       return;
+               }
+               switch (org->subtype[2]) {
+               case 1:
+               case 2:
+                       /* Layout of 2011 and 2017 messages is compatible. */
+                       p = (struct ieee_c37_238_2017_tlv *) org;
+                       HTONS(p->grandmasterID);
+                       HTONL(p->reserved1);
+                       HTONL(p->totalTimeInaccuracy);
+                       break;
+               }
+       }
 }
 
 static int slave_delay_timing_data_post_revc(struct tlv_extra *extra)
diff --git a/tlv.h b/tlv.h
index ec22e2f..3d838b7 100644
--- a/tlv.h
+++ b/tlv.h
@@ -213,6 +213,8 @@ struct nsm_resp_tlv_foot {
 /* Organizationally Unique Identifiers */
 #define IEEE_802_1_COMMITTEE 0x00, 0x80, 0xC2
 extern uint8_t ieee8021_id[3];
+#define IEEE_C37_238_PROFILE 0x1C, 0x12, 0x9D
+extern uint8_t ieeec37_238_id[3];
 
 struct organization_tlv {
        Enumeration16 type;
@@ -300,6 +302,28 @@ struct follow_up_info_tlv {
        Integer32     scaledLastGmPhaseChange;
 } PACKED;
 
+struct ieee_c37_238_2011_tlv {
+       Enumeration16 type;
+       UInteger16    length;
+       Octet         id[3];
+       Octet         subtype[3];
+       UInteger16    grandmasterID;
+       UInteger32    grandmasterTimeInaccuracy;
+       UInteger32    networkTimeInaccuracy;
+       Octet         pad[2];
+} PACKED;
+
+struct ieee_c37_238_2017_tlv {
+       Enumeration16 type;
+       UInteger16    length;
+       Octet         id[3];
+       Octet         subtype[3];
+       UInteger16    grandmasterID;
+       UInteger32    reserved1;
+       UInteger32    totalTimeInaccuracy;
+       Octet         pad[2];
+} PACKED;
+
 struct msg_interval_req_tlv {
        Enumeration16 type;
        UInteger16    length;
-- 
2.30.2



_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel