Changed macro macro_enb to CGI cell id.

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

openair-cn/S1AP/s1ap_eNB_nas_procedures.c

@@ -155,7 +155,7 @@ int s1ap_eNB_handle_nas_first_req(
   initial_ue_message_p->rrC_Establishment_Cause = s1ap_nas_first_req_p->establishment_cause;
 
   if (s1ap_nas_first_req_p->ue_identity.presenceMask & UE_IDENTITIES_s_tmsi) {
-    S1AP_DEBUG("S_TMSI_PRESENT");
+    S1AP_DEBUG("S_TMSI_PRESENT\n");
     initial_ue_message_p->presenceMask |= S1AP_INITIALUEMESSAGEIES_S_TMSI_PRESENT;
 
     MME_CODE_TO_OCTET_STRING(s1ap_nas_first_req_p->ue_identity.s_tmsi.mme_code,
@@ -165,7 +165,7 @@ int s1ap_eNB_handle_nas_first_req(
   }
 
   if (s1ap_nas_first_req_p->ue_identity.presenceMask & UE_IDENTITIES_gummei) {
-    S1AP_DEBUG("GUMMEI_ID_PRESENT");
+    S1AP_DEBUG("GUMMEI_ID_PRESENT\n");
     initial_ue_message_p->presenceMask |= S1AP_INITIALUEMESSAGEIES_GUMMEI_ID_PRESENT;
 
     MCC_MNC_TO_PLMNID(
@@ -191,7 +191,9 @@ int s1ap_eNB_handle_nas_first_req(
    * The cell identity is defined on 28 bits but as we use macro enb id,
    * we have to pad.
    */
+#warning "TODO get cell id from RRC"
   MACRO_ENB_ID_TO_CELL_IDENTITY(instance_p->eNB_id,
+		  0, // Cell ID
           &initial_ue_message_p->eutran_cgi.cell_ID);
   MCC_MNC_TO_TBCD(instance_p->mcc,
                   instance_p->mnc,
@@ -389,7 +391,9 @@ int s1ap_eNB_nas_uplink(instance_t instance, s1ap_uplink_nas_t *s1ap_uplink_nas_
     s1ap_eNB_instance_p->mnc_digit_length,
     &uplink_NAS_transport_p->eutran_cgi.pLMNidentity);
 
+#warning "TODO get cell id from RRC"
   MACRO_ENB_ID_TO_CELL_IDENTITY(s1ap_eNB_instance_p->eNB_id,
+          0,
           &uplink_NAS_transport_p->eutran_cgi.cell_ID);
 
   /* MCC/MNC should be repeated in TAI and EUTRAN CGI */

openair-cn/UTILS/conversions.h

@@ -259,6 +259,13 @@ do {                                                                    \
           + pLMN.MNCdigit2 * 10 + pLMN.MNCdigit1;                       \
 } while(0)
 
+/* TS 36.413 v10.9.0 section 9.2.1.37:
+ * Macro eNB ID:
+ * Equal to the 20 leftmost bits of the Cell
+ * Identity IE contained in the E-UTRAN CGI
+ * IE (see subclause 9.2.1.38) of each cell
+ * served by the eNB.
+ */
 #define MACRO_ENB_ID_TO_BIT_STRING(mACRO, bITsTRING)    \
 do {                                                    \
     (bITsTRING)->buf = calloc(3, sizeof(uint8_t));      \
@@ -268,14 +275,20 @@ do {                                                    \
     (bITsTRING)->size = 3;                              \
     (bITsTRING)->bits_unused = 4;                       \
 } while(0)
-
-#define MACRO_ENB_ID_TO_CELL_IDENTITY(mACRO, bITsTRING) \
+/*
+/* TS 36.413 v10.9.0 section 9.2.1.38:
+ * E-UTRAN CGI/Cell Identity
+ * The leftmost bits of the Cell
+ * Identity correspond to the eNB
+ * ID (defined in subclause 9.2.1.37).
+ */
+#define MACRO_ENB_ID_TO_CELL_IDENTITY(mACRO, cELL_iD, bITsTRING) \
 do {                                                    \
     (bITsTRING)->buf = calloc(4, sizeof(uint8_t));      \
-    (bITsTRING)->buf[0] = 0;                            \
-    (bITsTRING)->buf[1] = ((mACRO) >> 12);              \
-    (bITsTRING)->buf[2] = (mACRO) >> 4;                 \
-    (bITsTRING)->buf[3] = ((mACRO) & 0x0f) << 4;        \
+    (bITsTRING)->buf[0] = ((mACRO) >> 12);              \
+    (bITsTRING)->buf[1] = (mACRO) >> 4;                 \
+    (bITsTRING)->buf[2] = (((mACRO) & 0x0f) << 4) | ((cELL_iD) >> 4);        \
+    (bITsTRING)->buf[3] = ((cELL_iD) & 0x0f) << 4;        \
     (bITsTRING)->size = 4;                              \
     (bITsTRING)->bits_unused = 4;                       \
 } while(0)