Corrected calls to "pdcp_rrc_data_req()" when "ENABLE_USE_MME" is defined.

Added some missing break in RAL messages handling.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4732 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/RRC/LITE/rrc_UE.c

@@ -2573,31 +2573,35 @@ void *rrc_ue_task(void *args_p) {
           length = do_ULInformationTransfer(&buffer, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.length, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.data);
 
           /* Transfer data to PDCP */
-          pdcp_rrc_data_req (instance, 0 /* TODO put frame number ! */, 0, DCCH, rrc_mui++, 0, length, buffer, 1);
+          pdcp_rrc_data_req (0, instance, 0 /* TODO put frame number ! */, 0, DCCH, rrc_mui++, 0, length, buffer, 1);
           break;
       }
 # endif
 
       case RRC_RAL_SCAN_REQ:
-          {
-              // TO DO ASK PHY TO DO A SCAN
-              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
-          }
+      {
+          // TO DO ASK PHY TO DO A SCAN
+          LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          break;
+      }
 
       case RRC_RAL_CONFIGURE_THRESHOLD_REQ:
-          {
-              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
-          }
+      {
+          LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          break;
+      }
 
       case RRC_RAL_CONNECTION_ESTABLISHMENT_REQ:
-          {
-              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
-          }
+      {
+          LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          break;
+      }
 
       case RRC_RAL_CONNECTION_RELEASE_REQ:
-          {
-              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
-          }
+      {
+          LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          break;
+      }
 
       default:
         LOG_E(RRC, "[UE %d] Received unexpected message %s\n", Mod_id, msg_name);

openair2/RRC/LITE/rrc_eNB_S1AP.c

@@ -458,7 +458,7 @@ int rrc_eNB_process_S1AP_DOWNLINK_NAS(MessageDef *msg_p, const char *msg_name, i
                                        S1AP_DOWNLINK_NAS (msg_p).nas_pdu.buffer);
 
     /* Transfer data to PDCP */
-    pdcp_rrc_data_req (instance, 0 /* TODO put frame number ! */, 1, (ue_index * NB_RB_MAX) + DCCH, *rrc_eNB_mui++, 0,
+    pdcp_rrc_data_req (instance, ue_index, 0 /* TODO put frame number ! */, 1, DCCH, *rrc_eNB_mui++, 0,
                        length, buffer, 1);
 
     return (0);