maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
laurent
2019-09-25 08:28:02 +02:00
parent 0e9c068aad
commit 733d1292c6
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/main-ocp.c
+1 -1
View File
@@ -676,7 +676,7 @@ void rx_rf(RU_t *ru) {
proc->first_rx = false; proc->first_rx = false;
} else { } else {
if (proc->timestamp_rx - old_ts != fp->samples_per_tti) { 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); //ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
//proc->timestamp_rx = ts-ru->ts_offset; //proc->timestamp_rx = ts-ru->ts_offset;
} }
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
+2 -2
View File
@@ -154,7 +154,7 @@ typedef struct {
uint8_t active; uint8_t active;
#endif #endif
/// indicator of UE type (0 = LTE, 1,2 = Cat-M) /// 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 /// HARQ process mask, indicates which processes are currently active
uint16_t harq_mask; uint16_t harq_mask;
/// Indicator of TX activation per subframe. Used during PUCCH detection for ACK/NAK. /// Indicator of TX activation per subframe. Used during PUCCH detection for ACK/NAK.
@@ -456,7 +456,7 @@ typedef struct {
typedef struct { typedef struct {
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// UE type (normal, CEModeA, CEModeB) /// UE type (normal, CEModeA, CEModeB)
UE_type_t ue_type; uint8_t ue_type;
#endif #endif
/// HARQ process mask, indicates which processes are currently active /// HARQ process mask, indicates which processes are currently active
uint16_t harq_mask; uint16_t harq_mask;
openair2/LAYER2/MAC/pre_processor.c
+5 -2
View File
@@ -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]; 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], nb_allocated_rbs[CC_id][UE_id],
UE_id, UE_id,
rntiTable[UE_id], rntiTable[UE_id],
CC_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
+1
View File
@@ -1644,6 +1644,7 @@ void *UE_thread(void *arg) {
pthread_mutex_unlock(&proc->mutex_rxtx); 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]); LOG_D(PHY,"Process Subframe %d thread Idx %d \n", sub_frame, UE->current_thread_id[sub_frame]);