add doxygen for MAC and minor updates

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

cmake_targets/build_oai

@@ -95,7 +95,9 @@ Options
 --install-system-files
    Install OpenArInterface required files in Linux system
    (will ask root password)
-Typical Options for a quick startup with a COTS UE and Eurecom RF board: build_oai -I -g -eNB -EPC -x --install-system-files'
+Usage:
+ Eurecom EXMIMO + COTS UE : ./build_oai -I -g --eNB --EPC -x --install-system-files
+ NI/ETTUS B201  + COTS UE : ./build_oai -I -g --eNB --EPC -x --install-system-files -w USRP'
 }
 
 

openair2/LAYER2/MAC/eNB_scheduler_bch.c

@@ -197,6 +197,10 @@ schedule_SI(
       eNB->common_channels[CC_id].bcch_active=1;
       nprbP[CC_id]=3;
       nCCEP[CC_id]=4;
+      eNB->eNB_stats[CC_id].total_num_bcch_pdu+=1;
+      eNB->eNB_stats[CC_id].bcch_buffer=bcch_sdu_length;
+      eNB->eNB_stats[CC_id].total_bcch_buffer+=bcch_sdu_length;
+      eNB->eNB_stats[CC_id].bcch_mcs=mcs;
     } else {
       eNB->common_channels[CC_id].bcch_active=0;
       nprbP[CC_id]=0;

openair2/LAYER2/MAC/proto.h

@@ -153,6 +153,7 @@ int8_t get_DELTA_PREAMBLE(module_id_t module_idP,int CC_id);
 
 /** \brief Function for compute deltaP_rampup from 36.321 (for RA power ramping procedure and Msg3 PUSCH power control policy)
     @param Mod_id Module id of UE
+    @param CC_id carrier component id of UE
     @returns deltaP_rampup
 */
 int8_t get_deltaP_rampup(module_id_t module_idP,uint8_t CC_id);

openair2/LAYER2/openair2_proc.c

@@ -96,6 +96,24 @@ int dump_eNB_l2_stats(char *buffer, int length)
                      eNB->eNB_stats[CC_id].available_prbs,
                      eNB->eNB_stats[CC_id].available_ncces);
       
+      len += sprintf(&buffer[len],"BCCH , NB_TX_MAC = %d, transmitted bytes (TTI %d, total %d) MCS (TTI %d)\n",
+		     eNB->eNB_stats[CC_id].total_num_bcch_pdu,
+		     eNB->eNB_stats[CC_id].bcch_buffer,
+		     eNB->eNB_stats[CC_id].total_bcch_buffer,
+		     eNB->eNB_stats[CC_id].bcch_mcs);
+      
+      len += sprintf(&buffer[len],"CCCH , NB_TX_MAC = %d, transmitted bytes (TTI %d, total %d) MCS (TTI %d)\n",
+		     eNB->eNB_stats[CC_id].total_num_bcch_pdu,
+		     eNB->eNB_stats[CC_id].bcch_buffer,
+		     eNB->eNB_stats[CC_id].total_bcch_buffer,
+		     eNB->eNB_stats[CC_id].bcch_mcs);
+
+      len += sprintf(&buffer[len],"DCCH , NB_TX_MAC = %d, transmitted bytes (TTI %d, total %d) MCS (TTI %d)\n",
+		     eNB->eNB_stats[CC_id].total_num_bcch_pdu,
+		     eNB->eNB_stats[CC_id].bcch_buffer,
+		     eNB->eNB_stats[CC_id].total_bcch_buffer,
+		     eNB->eNB_stats[CC_id].bcch_mcs);
+      
       eNB->eNB_stats[CC_id].dlsch_bitrate=((eNB->eNB_stats[CC_id].dlsch_bytes_tx*8)/((eNB->frame + 1)*10));
       eNB->eNB_stats[CC_id].total_dlsch_pdus_tx+=eNB->eNB_stats[CC_id].dlsch_pdus_tx;
       eNB->eNB_stats[CC_id].total_dlsch_bytes_tx+=eNB->eNB_stats[CC_id].dlsch_bytes_tx;
@@ -154,7 +172,7 @@ int dump_eNB_l2_stats(char *buffer, int length)
                        UE_list->eNB_UE_stats[CC_id][UE_id].total_num_pdus_rx,
                        UE_list->eNB_UE_stats[CC_id][UE_id].num_errors_rx);
         len+= sprintf(&buffer[len],"Received PHR PH = %d (db)\n", UE_list->UE_template[CC_id][UE_id].phr_info);
-        len+= sprintf(&buffer[len],"Received BSR [0][1][2][3] = %d %d %d %d\n",
+        len+= sprintf(&buffer[len],"Received BSR LCGID[0][1][2][3] = %u %u %u %u\n",
                       UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID0],
                       UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID1],
                       UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID2],

openair2/PHY_INTERFACE/defs.h

@@ -38,11 +38,9 @@
 #ifndef __MAC_PHY_PRIMITIVES_H__
 #    define __MAC_PHY_PRIMITIVES_H__
 
-
 #include "LAYER2/MAC/defs.h"
 
 
-
 #define MAX_NUMBER_OF_MAC_INSTANCES 16
 
 #define NULL_PDU 255
@@ -300,16 +298,21 @@ typedef struct {
   /// Function for UE/PHY to compute PHR
   int8_t (*get_PHR)(module_id_t Mod_id, uint8_t CC_id,uint8_t eNB_index);
 
+  /// Function for UE to process the timing advance command
   void (*process_timing_advance)(module_id_t Mod_id,uint8_t CC_id, int16_t timing_advance);
   
+  /// Function for MAC to get the UE stats from the PHY   
   LTE_eNB_UE_stats* (*get_eNB_UE_stats)(module_id_t Mod_id, uint8_t CC_id, rnti_t rnti);
 
+  /// get the frame parameters from the PHY
   LTE_DL_FRAME_PARMS* (*get_lte_frame_parms)(module_id_t Mod_id, uint8_t CC_id);
   
+  /// get the Multiuser mimo mode
   MU_MIMO_mode* (*get_mu_mimo_mode) (module_id_t Mod_id, uint8_t CC_id, rnti_t rnti);
 
+  /// get the delta TF for Uplink Power Control Calculation
   int16_t (*get_hundred_times_delta_TF) (module_id_t module_idP, uint8_t CC_id, rnti_t rnti, uint8_t harq_pid);
-
+  /// get target uplink received power 
   int16_t (*get_target_ul_rx_power) (module_id_t module_idP, uint8_t CC_id);
 
   unsigned char is_cluster_head;

targets/DOCS/Doxyfile

@@ -2057,7 +2057,8 @@ PREDEFINED             = OPENAIR_LTE=1 \
                          public_rlc_am_windows(x)=x \
                          public_rlc_um(x)=x \
                          protected_rlc_um(x)=x \
-                         private_rlc_um(x)=x
+                         private_rlc_um(x)=x \ 
+			 __attribute__(x)= 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

targets/SIMU/USER/oaisim_functions.c

@@ -1298,7 +1298,6 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
             (otg_pkt->otg_pkt).is_ue = 0;
             (otg_pkt->otg_pkt).mode = PDCP_TRANSMISSION_MODE_DATA;
             //Adding the packet to the OTG-PDCP buffer
-#warning "Strange code: To be verifed"
             pkt_list_add_tail_eurecom(otg_pkt, &(otg_pdcp_buffer[enb_module_idP]));
             LOG_I(EMU,"[eNB %d] ADD pkt to OTG buffer with size %d for dst %d on rb_id %d for app id %d \n",
                   (otg_pkt->otg_pkt).module_id, otg_pkt->otg_pkt.sdu_buffer_size, (otg_pkt->otg_pkt).dst_id,(otg_pkt->otg_pkt).rb_id, app_id);
@@ -1380,7 +1379,7 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
   }
 
 #else
-
+#if 0 //  defined(EXMIMO) || defined(OAI_USRP)
   if (otg_enabled==1) {
     ctime = frame * 100;
 
@@ -1407,6 +1406,7 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
     }
   }
 
+#endif
 #endif
 }