Merge branch 'master' of github.com:srsLTE/srsLTE

lib/src/asn1/liblte_rrc.cc

@@ -2006,6 +2006,7 @@ LIBLTE_ERROR_ENUM liblte_rrc_pack_meas_object_eutra_ie(LIBLTE_RRC_MEAS_OBJECT_EU
         liblte_value_2_bits(0, ie_ptr, 1);
 
         // Optional indicators
+        liblte_value_2_bits(meas_obj_eutra->offset_freq_not_default, ie_ptr, 1);
         liblte_value_2_bits(meas_obj_eutra->cells_to_remove_list_present, ie_ptr, 1);
         if(0 != meas_obj_eutra->N_cells_to_add_mod)
         {
@@ -2035,7 +2036,10 @@ LIBLTE_ERROR_ENUM liblte_rrc_pack_meas_object_eutra_ie(LIBLTE_RRC_MEAS_OBJECT_EU
         liblte_rrc_pack_neigh_cell_config_ie(meas_obj_eutra->neigh_cell_cnfg, ie_ptr);
 
         // Offset Freq
+        if(meas_obj_eutra->offset_freq_not_default)
+        {
           liblte_rrc_pack_q_offset_range_ie(meas_obj_eutra->offset_freq, ie_ptr);
+        }
 
         // Cells To Remove List
         if(meas_obj_eutra->cells_to_remove_list_present)
@@ -2329,6 +2333,9 @@ LIBLTE_ERROR_ENUM liblte_rrc_pack_meas_object_to_add_mod_list_ie(LIBLTE_RRC_MEAS
             // Meas Object ID
             liblte_rrc_pack_meas_object_id_ie(list->meas_obj_list[i].meas_obj_id, ie_ptr);
 
+            // Meas Object Choice Extension
+            liblte_value_2_bits(0, ie_ptr, 1); // Choice from before extension marker
+
             // Meas Object Choice
             liblte_value_2_bits(list->meas_obj_list[i].meas_obj_type, ie_ptr, 2);
 

lib/src/phy/ue/ue_cell_search.c

@@ -95,7 +95,7 @@ int srslte_ue_cellsearch_init_multi(srslte_ue_cellsearch_t * q, uint32_t max_fra
 {
   int ret = SRSLTE_ERROR_INVALID_INPUTS;
 
-  if (q != NULL) {
+  if (q != NULL && nof_rx_antennas > 0) {
     ret = SRSLTE_ERROR;
     srslte_cell_t cell;
 

srsenb/src/CMakeLists.txt

@@ -42,3 +42,5 @@ if (NOT ${BUILDENB_CMD} STREQUAL "")
 else(NOT ${BUILDENB_CMD} STREQUAL "")
   message(STATUS "No post-build-ENB command defined")
 endif (NOT ${BUILDENB_CMD} STREQUAL "")
+
+install(TARGETS srsenb DESTINATION ${RUNTIME_DIR})

srsue/src/CMakeLists.txt

@@ -50,3 +50,5 @@ if (NOT ${BUILDUE_CMD} STREQUAL "")
 else(NOT ${BUILDUE_CMD} STREQUAL "")
   message(STATUS "No post-build-UE command defined")
 endif (NOT ${BUILDUE_CMD} STREQUAL "")
+
+install(TARGETS srsue DESTINATION ${RUNTIME_DIR})

srsue/src/phy/phy.cc

@@ -59,6 +59,7 @@ phy::phy() : workers_pool(MAX_WORKERS),
 
 void phy::set_default_args(phy_args_t *args)
 {
+  args->nof_rx_ant          = 1;
   args->ul_pwr_ctrl_en      = false; 
   args->prach_gain          = -1;
   args->cqi_max             = -1; 

srsue/test/mac/mac_test.cc

@@ -458,7 +458,9 @@ int main(int argc, char *argv[])
   }
   
   // Init Radio and PHY
-  radio.init();
+  if (!radio.init()) {
+    exit(1);
+  }
   phy.init(&radio, &mac, NULL, &phy_log);
   if (prog_args.rf_rx_gain > 0 && prog_args.rf_tx_gain > 0) {
     radio.set_rx_gain(prog_args.rf_rx_gain);

srsue/test/phy/ue_itf_test_prach.cc

@@ -199,6 +199,14 @@ srslte_softbuffer_tx_t softbuffer_tx;
 
 uint16_t temp_c_rnti; 
 
+
+class rrc_dummy : public srsue::rrc_interface_phy
+{
+public:
+  void in_sync() {};
+  void out_of_sync() {};
+};
+
 /******** MAC Interface implementation */
 class testmac : public srsue::mac_interface_phy
 {
@@ -327,6 +335,7 @@ private:
 
 testmac               my_mac;
 srslte::radio_multi   radio;
+rrc_dummy             rrc_dummy;
   
 int main(int argc, char *argv[])
 {
@@ -336,7 +345,7 @@ int main(int argc, char *argv[])
 
   // Init Radio and PHY
   radio.init();
-  my_phy.init(&radio, &my_mac, NULL, &log);
+  my_phy.init(&radio, &my_mac, &rrc_dummy, &log);
   if (prog_args.rf_rx_gain > 0 && prog_args.rf_tx_gain > 0) {
     radio.set_rx_gain(prog_args.rf_rx_gain);
     radio.set_tx_gain(prog_args.rf_tx_gain);

srsue/test/phy/ue_itf_test_sib1.cc

@@ -90,6 +90,13 @@ uint32_t total_oks=0;
 uint8_t payload[1024]; 
 srslte_softbuffer_rx_t softbuffer; 
 
+class rrc_dummy : public srsue::rrc_interface_phy
+{
+public:
+  void in_sync() {};
+  void out_of_sync() {};
+};
+
 /******** MAC Interface implementation */
 class testmac : public srsue::mac_interface_phy
 {
@@ -147,7 +154,7 @@ public:
 
 testmac             my_mac;
 srslte::radio_multi radio; 
-
+rrc_dummy           rrc_dummy;
 
 
 
@@ -159,7 +166,7 @@ int main(int argc, char *argv[])
 
   // Init Radio and PHY
   radio.init();
-  my_phy.init(&radio, &my_mac, NULL, &log);
+  my_phy.init(&radio, &my_mac, &rrc_dummy, &log);
   if (prog_args.rf_gain > 0) {
     radio.set_rx_gain(prog_args.rf_gain);     
   } else {