Define the Fira Ver2.0 Capability Tag IDs am: 9eb6fe4f42

Original change: https://android-review.googlesource.com/c/platform/external/uwb/+/2788635

Change-Id: Icc93a27f9ac5a4a2827ae3c59c7b5db6b8dcbecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 35 insertions, 23 deletions

diff --git a/src/rust/uwb_core/src/uci/uci_manager.rs b/src/rust/uwb_core/src/uci/uci_manager.rs
index 6609c0e..4ec189f 100644
--- a/src/rust/uwb_core/src/uci/uci_manager.rs
+++ b/src/rust/uwb_core/src/uci/uci_manager.rs
@@ -1727,8 +1727,11 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_core_get_caps_info_ok() {
-        let tlv = CapTlv { t: CapTlvType::SupportedFiraPhyVersionRange, v: vec![0x12, 0x34, 0x56] };
+    async fn test_core_get_caps_info_fira_v1_0_ok() {
+        let tlv = CapTlv {
+            t: CapTlvType::SupportedV1FiraPhyVersionRangeV2MaxMessageSize,
+            v: vec![0x12, 0x34, 0x56],
+        };
         let tlv_clone = tlv.clone();
 
         let (uci_manager, mut mock_hal) = setup_uci_manager_with_open_hal(
diff --git a/src/rust/uwb_uci_packets/uci_packets.pdl b/src/rust/uwb_uci_packets/uci_packets.pdl
index 1f3969c..ceb3287 100644
--- a/src/rust/uwb_uci_packets/uci_packets.pdl
+++ b/src/rust/uwb_uci_packets/uci_packets.pdl
@@ -290,27 +290,36 @@ enum FrameReportTlvType : 8 {
 }
 
 enum CapTlvType : 8 {
-    SUPPORTED_FIRA_PHY_VERSION_RANGE = 0x0,
-    SUPPORTED_FIRA_MAC_VERSION_RANGE = 0x1,
-    SUPPORTED_DEVICE_ROLES = 0x2,
-    SUPPORTED_RANGING_METHOD = 0x3,
-    SUPPORTED_STS_CONFIG = 0x4,
-    SUPPORTED_MULTI_NODE_MODES = 0x5,
-    SUPPORTED_RANGING_TIME_STRUCT = 0x6,
-    SUPPORTED_SCHEDULED_MODE = 0x7,
-    SUPPORTED_HOPPING_MODE = 0x8,
-    SUPPORTED_BLOCK_STRIDING = 0x9,
-    SUPPORTED_UWB_INITIATION_TIME = 0x0A,
-    SUPPORTED_CHANNELS = 0x0B,
-    SUPPORTED_RFRAME_CONFIG = 0x0C,
-    SUPPORTED_CC_CONSTRAINT_LENGTH = 0x0D,
-    SUPPORTED_BPRF_PARAMETER_SETS = 0x0E,
-    SUPPORTED_HPRF_PARAMETER_SETS = 0x0F,
-    SUPPORTED_AOA = 0x10,
-    SUPPORTED_EXTENDED_MAC_ADDRESS = 0x11,
-    SUPPORTED_MAX_MESSAGE_SIZE = 0x12,
-    SUPPORTED_MAX_DATA_PACKET_PAYLOAD_SIZE = 0x13,
-    RFU_CAP_TLV_TYPE_RANGE_1 = 0x14..0x9F,
+    // Defining the parameters for both Fira v1.0 and v2.0 in one enum, as PDL
+    // does not allow to define two separate enum fields with the same value.
+    SUPPORTED_V1_FIRA_PHY_VERSION_RANGE_V2_MAX_MESSAGE_SIZE = 0x0,
+    SUPPORTED_V1_FIRA_MAC_VERSION_RANGE_V2_MAX_DATA_PAYLOAD_SIZE = 0x1,
+    SUPPORTED_V1_DEVICE_ROLES_V2_FIRA_PHY_VERSION_RANGE = 0x2,
+    SUPPORTED_V1_RANGING_METHOD_V2_FIRA_MAC_VERSION_RANGE = 0x3,
+    SUPPORTED_V1_STS_CONFIG_V2_DEVICE_TYPE = 0x4,
+    SUPPORTED_V1_MULTI_NODE_MODES_V2_DEVICE_ROLES = 0x5,
+    SUPPORTED_V1_RANGING_TIME_STRUCT_V2_RANGING_METHOD = 0x6,
+    SUPPORTED_V1_SCHEDULED_MODE_V2_STS_CONFIG = 0x7,
+    SUPPORTED_V1_HOPPING_MODE_V2_MULTI_NODE_MODE = 0x8,
+    SUPPORTED_V1_BLOCK_STRIDING_V2_RANGING_TIME_STRUCT = 0x9,
+    SUPPORTED_V1_UWB_INITIATION_TIME_V2_SCHEDULE_MODE = 0x0A,
+    SUPPORTED_V1_CHANNELS_V2_HOPPING_MODE = 0x0B,
+    SUPPORTED_V1_RFRAME_CONFIG_V2_BLOCK_STRIDING = 0x0C,
+    SUPPORTED_V1_CC_CONSTRAINT_LENGTH_V2_UWB_INITIATION_TIME = 0x0D,
+    SUPPORTED_V1_BPRF_PARAMETER_SETS_V2_CHANNELS = 0x0E,
+    SUPPORTED_V1_HPRF_PARAMETER_SETS_V2_RFRAME_CONFIG = 0x0F,
+    SUPPORTED_V1_AOA_V2_CC_CONSTRAINT_LENGTH = 0x10,
+    SUPPORTED_V1_EXTENDED_MAC_ADDRESS_V2_BPRF_PARAMETER_SETS = 0x11,
+    SUPPORTED_V1_MAX_MESSAGE_SIZE_V2_HPRF_PARAMETER_SETS = 0x12,
+    SUPPORTED_V1_MAX_DATA_PACKET_PAYLOAD_SIZE_V2_AOA_SUPPORT = 0x13,
+    SUPPORTED_V2_EXTENDED_MAC_ADDRESS = 0x14,
+    SUPPORTED_V2_ASSIGNED = 0x15,
+    SUPPORTED_V2_SESSION_KEY_LENGTH = 0x16,
+    SUPPORTED_V2_DT_ANCHOR_MAX_ACTIVE_RR = 0x17,
+    SUPPORTED_V2_DT_TAG_MAX_ACTIVE_RR = 0x18,
+    SUPPORTED_V2_DT_TAG_BLOCK_SHIPPING = 0x19,
+    SUPPORTED_V2_PSDU_LENGTH_SUPPORT = 0x1A,
+    RFU_CAP_TLV_TYPE_RANGE_1 = 0x1B..0x9F,
 
     VENDOR_SPECIFIC_CAP_TLV_TYPE_RANGE_1 = 0xA0..0xBF {
         // CCC specific