From 613088f3e163a3e40a7b46dfc91faec9f5f23056 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sun, 11 Jan 2015 18:24:59 +0000
Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6347
818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/RT/USER/sched_dlsch.c | 7 +++----
targets/RT/USER/sched_rx_pdsch.c | 21 ++++-----------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/targets/RT/USER/sched_dlsch.c b/targets/RT/USER/sched_dlsch.c
index 3f4a2db88f7..a550daacb0b 100644
--- a/targets/RT/USER/sched_dlsch.c
+++ b/targets/RT/USER/sched_dlsch.c
@@ -95,10 +95,10 @@ static void * dlsch_thread(void *param) {
//unsigned long cpuid;
unsigned char dlsch_thread_index = *((unsigned char *)param);
- unsigned int ret;
+ unsigned int ret=0;
uint8_t harq_pid;
- RTIME time_in,time_out;
+
#ifdef RTAI
RT_TASK *task;
char task_name[8];
@@ -159,7 +159,7 @@ static void * dlsch_thread(void *param) {
LOG_I(PHY,"[SCHED][DLSCH] Frame %d: Calling dlsch_decoding with dlsch_thread_index = %d\n",phy_vars_ue->frame_rx,dlsch_thread_index);
- time_in = rt_get_time_ns();
+
if (phy_vars_ue->frame_rx < phy_vars_ue->dlsch_errors[eNB_id]) {
phy_vars_ue->dlsch_errors[eNB_id]=0;
@@ -244,7 +244,6 @@ static void * dlsch_thread(void *param) {
}
*/
- time_out = rt_get_time_ns();
#ifdef DEBUG_PHY
LOG_I(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d: PDSCH/DLSCH decoding iter %d (mcs %d, rv %d, TBS %d)\n",
diff --git a/targets/RT/USER/sched_rx_pdsch.c b/targets/RT/USER/sched_rx_pdsch.c
index 066cf1d5630..710fa258fdf 100644
--- a/targets/RT/USER/sched_rx_pdsch.c
+++ b/targets/RT/USER/sched_rx_pdsch.c
@@ -53,12 +53,6 @@
#include "MAC_INTERFACE/extern.h"
-#ifdef CBMIMO1
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_device.h"
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/extern.h"
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/defs.h"
-#endif // CBMIMO1
-
#include "UTIL/LOG/vcd_signal_dumper.h"
RTIME time0,time1;
@@ -90,22 +84,21 @@ extern pthread_cond_t dlsch_cond[8];
static void * rx_pdsch_thread(void *param) {
//unsigned long cpuid;
- uint8_t rx_pdsch_thread_index = 0;
uint8_t dlsch_thread_index = 0;
- uint8_t pilot1,pilot2,pilot3,harq_pid,subframe;
+ uint8_t pilot2,harq_pid,subframe;
// uint8_t last_slot;
uint8_t dual_stream_UE = 0;
uint8_t i_mod = 0;
- RTIME time_in,time_out;
+
#ifdef RTAI
RT_TASK *task;
#endif
int m,eNB_id = 0;
int eNB_id_i = 1;
- PHY_VARS_UE *UE = PHY_vars_UE_g[0];
+ PHY_VARS_UE *UE = PHY_vars_UE_g[0][0];
#ifdef RTAI
task = rt_task_init_schmod(nam2num("RX_PDSCH_THREAD"), 0, 0, 0, SCHED_FIFO, 0xF);
@@ -128,15 +121,11 @@ static void * rx_pdsch_thread(void *param) {
rt_make_hard_real_time();
#endif
- if (UE->lte_frame_parms.Ncp == 0) { // normal prefix
- pilot1 = 4;
+ if (UE->lte_frame_parms.Ncp == NORMAL) { // normal prefix
pilot2 = 7;
- pilot3 = 11;
}
else { // extended prefix
- pilot1 = 3;
pilot2 = 6;
- pilot3 = 9;
}
@@ -190,7 +179,6 @@ static void * rx_pdsch_thread(void *param) {
LOG_D(PHY,"[SCHED][RX_PDSCH] Frame %d, slot %d: Calling rx_pdsch_decoding with harq_pid %d\n",UE->frame_rx,UE->slot_rx,harq_pid);
- time_in = rt_get_time_ns();
// Check if we are in even or odd slot
if (UE->slot_rx%2) { // odd slots
@@ -256,7 +244,6 @@ static void * rx_pdsch_thread(void *param) {
}
}
- time_out = rt_get_time_ns();
if (pthread_mutex_lock(&rx_pdsch_mutex) != 0) {
msg("[openair][SCHED][RX_PDSCH] error locking mutex.\n");
--
GitLab