modify for noS1 and add conf

openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

@@ -1009,7 +1009,9 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
     if (resource_set_found == TRUE) {
       if (pucch_resource_indicator < MAX_PUCCH_RESOURCE_INDICATOR) {
         /* check if resource indexing by pucch_resource_indicator of this set is compatible */
-        if ((ready_pucch_resource_id == TRUE) || (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator][0] != MAX_NB_OF_PUCCH_RESOURCES)) {
+        if ((ready_pucch_resource_id == TRUE) 
+        || (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator] != NULL)
+        || (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator][0] != MAX_NB_OF_PUCCH_RESOURCES)) {
 
           if (ready_pucch_resource_id == TRUE) {
             current_resource_id = *resource_id;

openair3/NAS/NR_UE/nr_nas_msg_sim.c

@@ -514,9 +514,9 @@ void generateSecurityModeComplete(as_nas_info_t *initialNasMsg)
   stream_cipher.blength    = (initialNasMsg->length - 6) << 3;
 
   // only for Type of integrity protection algorithm: 128-5G-IA2 (2)
-  nas_stream_encrypt_eia2(
-    &stream_cipher,
-    mac);
+  // nas_stream_encrypt_eia2(
+  //   &stream_cipher,
+  //   mac);
 
   printf("mac %x %x %x %x \n", mac[0], mac[1], mac[2], mac[3]);
   for(int i = 0; i < 4; i++){
@@ -592,9 +592,9 @@ void generateRegistrationComplete(as_nas_info_t *initialNasMsg, SORTransparentCo
   stream_cipher.blength    = (initialNasMsg->length - 6) << 3;
 
   // only for Type of integrity protection algorithm: 128-5G-IA2 (2)
-  nas_stream_encrypt_eia2(
-    &stream_cipher,
-    mac);
+  // nas_stream_encrypt_eia2(
+  //   &stream_cipher,
+  //   mac);
 
   printf("mac %x %x %x %x \n", mac[0], mac[1], mac[2], mac[3]);
   for(int i = 0; i < 4; i++){
@@ -677,9 +677,9 @@ void generatePduSessionEstablishRequest(as_nas_info_t *initialNasMsg){
   stream_cipher.blength    = (initialNasMsg->length - 6) << 3;
 
   // only for Type of integrity protection algorithm: 128-5G-IA2 (2)
-  nas_stream_encrypt_eia2(
-    &stream_cipher,
-    mac);
+  // nas_stream_encrypt_eia2(
+  //   &stream_cipher,
+  //   mac);
 
   printf("mac %x %x %x %x \n", mac[0], mac[1], mac[2], mac[3]);
   for(int i = 0; i < 4; i++){