Reformat uci packet moving values into vendor ranges

This is more maintaineble long term since the range
boundaries do not have to be updated for every new
vendor value.

Change-Id: If436c98889f1a8d42baa3bacc804d412cb4a671e

1 files changed, 51 insertions, 44 deletions

diff --git a/src/rust/uwb_uci_packets/uci_packets.pdl b/src/rust/uwb_uci_packets/uci_packets.pdl
index 805c1cb..9be6f24 100644
--- a/src/rust/uwb_uci_packets/uci_packets.pdl
+++ b/src/rust/uwb_uci_packets/uci_packets.pdl
@@ -137,10 +137,12 @@ enum StatusCode : 8 {
     RFU_STATUS_CODE_RANGE_4 = 0x32..0x4F,
 
     // Vendor Specific Status Codes
-    UCI_STATUS_ERROR_CCC_SE_BUSY = 0x50,
-    UCI_STATUS_ERROR_CCC_LIFECYCLE = 0x51,
-    UCI_STATUS_ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 0x52,
-    VENDOR_SPECIFIC_STATUS_CODE_RANGE_1 = 0x53..0xFE,
+    VENDOR_SPECIFIC_STATUS_CODE_RANGE_1 = 0x50..0xFE {
+        UCI_STATUS_ERROR_CCC_SE_BUSY = 0x50,
+        UCI_STATUS_ERROR_CCC_LIFECYCLE = 0x51,
+        UCI_STATUS_ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 0x52,
+    },
+
     // For internal usage, we will use 0xFF as default.
     VENDOR_SPECIFIC_STATUS_CODE_2 = 0xFF,
 }
@@ -255,26 +257,28 @@ enum AppConfigTlvType : 8 {
     SUBSESSION_KEY = 0x46,
     RFU_APP_CFG_TLV_TYPE_RANGE_2 = 0x47..0x9F,
 
-    // CCC specific
-    CCC_HOP_MODE_KEY = 0xA0,
-    CCC_UWB_TIME0 = 0xA1,
-    CCC_RANGING_PROTOCOL_VER = 0xA3,
-    CCC_UWB_CONFIG_ID = 0xA4,
-    CCC_PULSESHAPE_COMBO = 0xA5,
-    CCC_URSK_TTL = 0xA6,
-    CCC_LAST_INDEX_USED  = 0xA8,
-    VENDOR_SPECIFIC_APP_CFG_TLV_TYPE_RANGE_1 = 0xA9..0xDF,
+    VENDOR_SPECIFIC_APP_CFG_TLV_TYPE_RANGE_1 = 0xA0..0xDF {
+        // CCC specific
+        CCC_HOP_MODE_KEY = 0xA0,
+        CCC_UWB_TIME0 = 0xA1,
+        CCC_RANGING_PROTOCOL_VER = 0xA3,
+        CCC_UWB_CONFIG_ID = 0xA4,
+        CCC_PULSESHAPE_COMBO = 0xA5,
+        CCC_URSK_TTL = 0xA6,
+        CCC_LAST_INDEX_USED  = 0xA8,
+    },
+
+    // Reserved for extension IDs.
     RFU_APP_CFG_TLV_TYPE_RANGE_3 = 0xE0..0xE2,
 
-    // Interleaving ratio if AOA_RESULT_REQ is set to 0xF0.
-    NB_OF_RANGE_MEASUREMENTS = 0xE3,
-    NB_OF_AZIMUTH_MEASUREMENTS = 0xE4,
-    NB_OF_ELEVATION_MEASUREMENTS = 0xE5,
-    VENDOR_SPECIFIC_APP_CFG_TLV_TYPE_RANGE_2 = 0xE6..0xE7,
-
-    ENABLE_DIAGNOSTICS = 0xE8,
-    DIAGRAMS_FRAME_REPORTS_FIELDS = 0xE9,
-    VENDOR_SPECIFIC_APP_CFG_TLV_TYPE_RANGE_3 = 0xEA..0xFF,
+    VENDOR_SPECIFIC_APP_CFG_TLV_TYPE_RANGE_2 = 0xE3..0xFF {
+        // Interleaving ratio if AOA_RESULT_REQ is set to 0xF0.
+        NB_OF_RANGE_MEASUREMENTS = 0xE3,
+        NB_OF_AZIMUTH_MEASUREMENTS = 0xE4,
+        NB_OF_ELEVATION_MEASUREMENTS = 0xE5,
+        ENABLE_DIAGNOSTICS = 0xE8,
+        DIAGRAMS_FRAME_REPORTS_FIELDS = 0xE9,
+    },
 }
 
 enum FrameReportTlvType : 8 {
@@ -306,30 +310,32 @@ enum CapTlvType : 8 {
     SUPPORTED_MAX_DATA_PACKET_PAYLOAD_SIZE = 0x13,
     RFU_CAP_TLV_TYPE_RANGE_1 = 0x14..0x9F,
 
-    // CCC specific
-    CCC_SUPPORTED_CHAPS_PER_SLOT = 0xA0,
-    CCC_SUPPORTED_SYNC_CODES = 0xA1,
-    CCC_SUPPORTED_HOPPING_CONFIG_MODES_AND_SEQUENCES = 0xA2,
-    CCC_SUPPORTED_CHANNELS = 0xA3,
-    CCC_SUPPORTED_VERSIONS = 0xA4,
-    CCC_SUPPORTED_UWB_CONFIGS = 0xA5,
-    CCC_SUPPORTED_PULSE_SHAPE_COMBOS = 0xA6,
-    CCC_SUPPORTED_RAN_MULTIPLIER = 0xA7,
-    CCC_SUPPORTED_MAX_RANGING_SESSION_NUMBER = 0xA8,
-    VENDOR_SPECIFIC_CAP_TLV_TYPE_RANGE_1 = 0xA9..0xBF,
+    VENDOR_SPECIFIC_CAP_TLV_TYPE_RANGE_1 = 0xA0..0xBF {
+        // CCC specific
+        CCC_SUPPORTED_CHAPS_PER_SLOT = 0xA0,
+        CCC_SUPPORTED_SYNC_CODES = 0xA1,
+        CCC_SUPPORTED_HOPPING_CONFIG_MODES_AND_SEQUENCES = 0xA2,
+        CCC_SUPPORTED_CHANNELS = 0xA3,
+        CCC_SUPPORTED_VERSIONS = 0xA4,
+        CCC_SUPPORTED_UWB_CONFIGS = 0xA5,
+        CCC_SUPPORTED_PULSE_SHAPE_COMBOS = 0xA6,
+        CCC_SUPPORTED_RAN_MULTIPLIER = 0xA7,
+        CCC_SUPPORTED_MAX_RANGING_SESSION_NUMBER = 0xA8,
+    },
 
     SUPPORTED_POWER_STATS = 0xC0,
     VENDOR_SPECIFIC_CAP_TLV_TYPE_RANGE_2 = 0xC1..0xDF,
     RFU_CAP_TLV_TYPE_RANGE_2 = 0xE0..0xE2,
 
-    SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 0xE3,
-    SUPPORTED_MIN_RANGING_INTERVAL_MS = 0xE4,
-    SUPPORTED_RANGE_DATA_NTF_CONFIG = 0xE5,
-    SUPPORTED_RSSI_REPORTING = 0xE6,
-    SUPPORTED_DIAGNOSTICS = 0xE7,
-    SUPPORTED_MIN_SLOT_DURATION_RSTU = 0xE8,
-    SUPPORTED_MAX_RANGING_SESSION_NUMBER = 0xE9,
-    VENDOR_SPECIFIC_CAP_TLV_TYPE_RANGE_3 = 0xEA..0xFF,
+    VENDOR_SPECIFIC_CAP_TLV_TYPE_RANGE_3 = 0xE3..0xFF {
+        SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 0xE3,
+        SUPPORTED_MIN_RANGING_INTERVAL_MS = 0xE4,
+        SUPPORTED_RANGE_DATA_NTF_CONFIG = 0xE5,
+        SUPPORTED_RSSI_REPORTING = 0xE6,
+        SUPPORTED_DIAGNOSTICS = 0xE7,
+        SUPPORTED_MIN_SLOT_DURATION_RSTU = 0xE8,
+        SUPPORTED_MAX_RANGING_SESSION_NUMBER = 0xE9,
+    },
 }
 
 
@@ -400,9 +406,10 @@ enum ReasonCode : 8 {
     ERROR_REF_UWB_SESSION_INVALID_OFFSET_TIME = 0x3E,
     ERROR_REF_UWB_SESSION_LOST = 0x3F,
     RFU_REASON_CODE_RANGE_2 = 0x40..0x7F,
-    ERROR_INVALID_CHANNEL_WITH_AOA = 0x80,
-    ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 0x81,
-    VENDOR_SPECIFIC_REASON_CODE_RANGE_1 = 0x82..0xFE,
+    VENDOR_SPECIFIC_REASON_CODE_RANGE_1 = 0x80..0xFE {
+        ERROR_INVALID_CHANNEL_WITH_AOA = 0x80,
+        ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 0x81,
+    },
     // For internal usage, we will use 0xFF as default.
     VENDOR_SPECIFIC_REASON_CODE_2 = 0xFF,
 }