small fixes

executables/main-ocp.c

@@ -676,7 +676,7 @@ void rx_rf(RU_t *ru) {
     proc->first_rx = false;
   } else {
     if (proc->timestamp_rx - old_ts != fp->samples_per_tti) {
-      LOG_E(HW,"impossible shift in RFSIM, rx: %ld, previous rx distance: %ld\n", proc->timestamp_rx, proc->timestamp_rx - old_ts);
+      LOG_E(HW,"impossible shift in rx stream, rx: %ld, previous rx distance: %ld, should be %d\n", proc->timestamp_rx, proc->timestamp_rx - old_ts, fp->samples_per_tti);
       //ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
       //proc->timestamp_rx = ts-ru->ts_offset;
     }

openair1/PHY/LTE_TRANSPORT/transport_eNB.h

@@ -154,7 +154,7 @@ typedef struct {
   uint8_t active;
 #endif
   /// indicator of UE type (0 = LTE, 1,2 = Cat-M)
-  UE_type_t ue_type;
+  int ue_type;
   /// HARQ process mask, indicates which processes are currently active
   uint16_t harq_mask;
   /// Indicator of TX activation per subframe.  Used during PUCCH detection for ACK/NAK.
@@ -456,7 +456,7 @@ typedef struct {
 typedef struct {
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
   /// UE type (normal, CEModeA, CEModeB)
-  UE_type_t ue_type;
+  uint8_t ue_type;
 #endif
   /// HARQ process mask, indicates which processes are currently active
   uint16_t harq_mask;

openair2/LAYER2/MAC/pre_processor.c

@@ -1799,12 +1799,15 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
       }
 
       total_allocated_rbs[CC_id] += nb_allocated_rbs[CC_id][UE_id];
-      LOG_D(MAC, "In ulsch_preprocessor: assigning %d RBs for UE %d/%x CCid %d, harq_pid %d\n",
+      LOG_D(MAC, "In ulsch_preprocessor: assigning %d RBs for UE %d/%x CCid %d, harq_pid %d, nb_rb_ul %d, %d ,%d\n",
             nb_allocated_rbs[CC_id][UE_id],
             UE_id,
             rntiTable[UE_id],
             CC_id,
-            harq_pid);
+            harq_pid,
+	    UE_list->UE_template[CC_id][UE_id].nb_rb_ul[harq_pid],
+	    UE_list->UE_template[CC_id][UE_id].pre_allocated_nb_rb_ul[slice_idx],
+	    average_rbs_per_user[CC_id]);
     }
   }
 

targets/RT/USER/lte-ue.c

@@ -1644,6 +1644,7 @@ void *UE_thread(void *arg) {
 
             pthread_mutex_unlock(&proc->mutex_rxtx);
           }
+	  usleep(3000);
         }
 
         LOG_D(PHY,"Process Subframe %d thread Idx %d \n", sub_frame, UE->current_thread_id[sub_frame]);