Changes for ARC1.1. Change config file to max MCS 25. Fixed pdu size errors.

fapi/oai-integration/fapi_vnf_p7.c

@@ -957,7 +957,7 @@ uint8_t aerial_unpack_nr_rach_indication(uint8_t **ppReadPackedMsg,
   return unpack_nr_rach_indication(ppReadPackedMsg, end, msg, config);
 }
 
-static uint8_t aerial_pack_tx_data_request(void *pMessageBuf,
+static int32_t aerial_pack_tx_data_request(void *pMessageBuf,
                                            void *pPackedBuf,
                                            void *pDataBuf,
                                            uint32_t packedBufLen,
@@ -1009,7 +1009,7 @@ static uint8_t aerial_pack_tx_data_request(void *pMessageBuf,
     // recalculate PDU_Length for Aerial (leave only the size occupied in the payload buffer afterward)
     // assuming there is only 1 TLV present
     value->PDU_length = value->TLVs[0].length;
-    if (!(push16(value->PDU_length, ppWriteBody, end) && push16(0, ppWriteBody, end)
+    if (!(push32(value->PDU_length, ppWriteBody, end)
           && // cuBB expects TX_DATA.request PDUSize to be 32 bit
           push16(value->PDU_index, ppWriteBody, end) && push32(value->num_TLV, ppWriteBody, end))) {
       return 0;
@@ -1258,18 +1258,23 @@ int fapi_nr_pack_and_send_p7_message(vnf_p7_t *vnf_p7, nfapi_p7_message_header_t
       == NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST) {
     uint8_t FAPI_data_buffer[1024 * 64];
     uint32_t data_len = 0;
-    int len_FAPI = aerial_pack_tx_data_request(header,
+    int32_t len_FAPI = aerial_pack_tx_data_request(header,
                                                FAPI_buffer,
                                                FAPI_data_buffer,
                                                sizeof(FAPI_buffer),
                                                sizeof(FAPI_data_buffer),
                                                &vnf_p7->_public.codec_config,
                                                &data_len);
-    return aerial_send_P7_msg_with_data(FAPI_buffer, len_FAPI, FAPI_data_buffer, data_len, header);
+    if (len_FAPI <=0) {
+      LOG_E(NFAPI_VNF,"Problem packing TX_DATA_request\n");
+      return len_FAPI;
+    }
+    else
+      return aerial_send_P7_msg_with_data(FAPI_buffer, len_FAPI, FAPI_data_buffer, data_len, header);
   } else {
     // Create and send FAPI P7 message
     int len_FAPI = fapi_nr_p7_message_pack(header, FAPI_buffer, sizeof(FAPI_buffer), &vnf_p7->_public.codec_config);
     return aerial_send_P7_msg(FAPI_buffer, len_FAPI, header);
   }
 }
-#endif
\ No newline at end of file
+#endif

maketags

 #!/bin/sh
 echo "building ctags for openair1 and openair2 ..."
-ctags -e -R  --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair1/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets cmake_targets common nfapi executables radio
+ctags -e -R  --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair1/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets cmake_targets common fapi nfapi executables radio
 

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h

@@ -1467,11 +1467,9 @@ typedef enum {
 
 //table 3-58
 #define NFAPI_NR_MAX_TX_REQUEST_TLV 2
-typedef struct {
-  uint16_t PDU_length; // SCF 222.10.02 The total length (in bytes) of the PDU description and  PDU data, without the padding bytes.
-                       // (2 bytes PDU_Length + 2 bytes PDU_Index + 4 bytes num_TLV + TLV size ( 2 bytes tag + 2 bytes length +
-                       // value size without padding))
-                       // TBS + 12
+typedef struct
+{
+  uint32_t PDU_length;
   uint16_t PDU_index;
   uint32_t num_TLV;
   nfapi_nr_tx_data_request_tlv_t TLVs[NFAPI_NR_MAX_TX_REQUEST_TLV];

nfapi/open-nFAPI/nfapi/src/nfapi_p7.c

@@ -2017,7 +2017,7 @@ static uint8_t pack_hi_dci0_request(void *msg, uint8_t **ppWritePackedMsg, uint8
 static uint8_t pack_tx_data_pdu_list_value(void *tlv, uint8_t **ppWritePackedMsg, uint8_t *end)
 {
   nfapi_nr_pdu_t *value = (nfapi_nr_pdu_t *)tlv;
-  if (!(push16(value->PDU_length, ppWritePackedMsg, end) && push16(value->PDU_index, ppWritePackedMsg, end)
+  if (!(push32(value->PDU_length, ppWritePackedMsg, end) && push16(value->PDU_index, ppWritePackedMsg, end)
         && push32(value->num_TLV, ppWritePackedMsg, end)))
     return 0;
 
@@ -5901,7 +5901,7 @@ static uint8_t unpack_hi_dci0_request(uint8_t **ppReadPackedMsg, uint8_t *end, v
 static uint8_t unpack_tx_data_pdu_list_value(uint8_t **ppReadPackedMsg, uint8_t *end, void *msg) {
   nfapi_nr_pdu_t *pNfapiMsg = (nfapi_nr_pdu_t *)msg;
 
-  if(!(pull16(ppReadPackedMsg, &pNfapiMsg->PDU_length, end) &&
+  if(!(pull32(ppReadPackedMsg, &pNfapiMsg->PDU_length, end) &&
        pull16(ppReadPackedMsg, &pNfapiMsg->PDU_index, end) &&
        pull32(ppReadPackedMsg, &pNfapiMsg->num_TLV, end)
   ))
@@ -6004,10 +6004,10 @@ static uint8_t unpack_tx_request(uint8_t **ppReadPackedMsg, uint8_t *end, void *
           nfapi_tx_request_pdu_t *pdu = &(pNfapiMsg->tx_request_body.tx_pdu_list[i]);
 
           if (pdu) {
-            uint16_t length = 0;
+            uint32_t length = 0;
             uint16_t index = 0;
 
-            if(!(pull16(ppReadPackedMsg, &length, end) &&
+            if(!(pull32(ppReadPackedMsg, &length, end) &&
                  pull16(ppReadPackedMsg, &index, end)))
               return 0;