Skip to content

O
OpenXG-RAN
Commit 6e81f269 authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options 

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5494 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent a491fbb1
Show whitespace changes
Inline Side-by-side
Showing with 861 additions and 941 deletions
openair1/PHY/LTE_ESTIMATION/adjust_gain.c
View file @ 6e81f269
...@@ -5,14 +5,8 @@ ...@@ -5,14 +5,8 @@
#include "MAC_INTERFACE/extern.h" #include "MAC_INTERFACE/extern.h"
#ifdef EXMIMO #ifdef EXMIMO
#ifdef DRIVER2013
#include "openair0_lib.h" #include "openair0_lib.h"
extern int card; extern int card;
#else
#include "ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_device.h"
#include "ARCH/CBMIMO1/DEVICE_DRIVER/defs.h"
#include "ARCH/CBMIMO1/DEVICE_DRIVER/extern.h"
#endif
#endif #endif
void void
...@@ -20,11 +14,7 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) { ...@@ -20,11 +14,7 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) {
uint16_t rx_power_fil_dB; uint16_t rx_power_fil_dB;
#ifdef EXMIMO #ifdef EXMIMO
#ifdef DRIVER2013
exmimo_config_t *p_exmimo_config = openair0_exmimo_pci[card].exmimo_config_ptr; exmimo_config_t *p_exmimo_config = openair0_exmimo_pci[card].exmimo_config_ptr;
#endif
#endif
#if defined(EXMIMO) || defined(CBMIMO1)
uint16_t i; uint16_t i;
#endif #endif
...@@ -61,39 +51,21 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) { ...@@ -61,39 +51,21 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) {
} }
#ifdef CBMIMO1
for (i=0;i<number_of_cards;i++) {
//openair_set_rx_rf_mode(i,openair_daq_vars.rx_rf_mode);
openair_set_rx_gain_cal_openair(i,phy_vars_ue->rx_total_gain_dB);
}
#else
#ifdef EXMIMO #ifdef EXMIMO
//switch (phy_vars_ue->rx_gain_mode[0]) {
//case max_gain:
if (phy_vars_ue->rx_total_gain_dB>phy_vars_ue->rx_gain_max[0]) { if (phy_vars_ue->rx_total_gain_dB>phy_vars_ue->rx_gain_max[0]) {
phy_vars_ue->rx_total_gain_dB = phy_vars_ue->rx_gain_max[0]; phy_vars_ue->rx_total_gain_dB = phy_vars_ue->rx_gain_max[0];
#ifdef DRIVER2013
for (i=0;i<phy_vars_ue->lte_frame_parms.nb_antennas_rx;i++) { for (i=0;i<phy_vars_ue->lte_frame_parms.nb_antennas_rx;i++) {
p_exmimo_config->rf.rx_gain[i][0] = 30; p_exmimo_config->rf.rx_gain[i][0] = 30;
} }
#else
exmimo_pci_interface->rf.rx_gain00 = 30;
exmimo_pci_interface->rf.rx_gain10 = 30;
#endif
} }
else if (phy_vars_ue->rx_total_gain_dB<(phy_vars_ue->rx_gain_max[0]-30)) { else if (phy_vars_ue->rx_total_gain_dB<(phy_vars_ue->rx_gain_max[0]-30)) {
// for the moment we stay in max gain mode // for the moment we stay in max gain mode
phy_vars_ue->rx_total_gain_dB = phy_vars_ue->rx_gain_max[0] - 30; phy_vars_ue->rx_total_gain_dB = phy_vars_ue->rx_gain_max[0] - 30;
#ifdef DRIVER2013
for (i=0;i<phy_vars_ue->lte_frame_parms.nb_antennas_rx;i++) { for (i=0;i<phy_vars_ue->lte_frame_parms.nb_antennas_rx;i++) {
p_exmimo_config->rf.rx_gain[i][0] = 0; p_exmimo_config->rf.rx_gain[i][0] = 0;
} }
#else
exmimo_pci_interface->rf.rx_gain00 = 0;
exmimo_pci_interface->rf.rx_gain10 = 0;
#endif
/* /*
phy_vars_ue->rx_gain_mode[0] = byp; phy_vars_ue->rx_gain_mode[0] = byp;
phy_vars_ue->rx_gain_mode[1] = byp; phy_vars_ue->rx_gain_mode[1] = byp;
...@@ -107,14 +79,10 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) { ...@@ -107,14 +79,10 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) {
*/ */
} }
else { else {
#ifdef DRIVER2013
for (i=0;i<phy_vars_ue->lte_frame_parms.nb_antennas_rx;i++) { for (i=0;i<phy_vars_ue->lte_frame_parms.nb_antennas_rx;i++) {
p_exmimo_config->rf.rx_gain[i][0] = 30 - phy_vars_ue->rx_gain_max[0] + phy_vars_ue->rx_total_gain_dB; p_exmimo_config->rf.rx_gain[i][0] = 30 - phy_vars_ue->rx_gain_max[0] + phy_vars_ue->rx_total_gain_dB;
} }
#else
exmimo_pci_interface->rf.rx_gain00 = 30 - phy_vars_ue->rx_gain_max[0] + phy_vars_ue->rx_total_gain_dB;
exmimo_pci_interface->rf.rx_gain10 = 30 - phy_vars_ue->rx_gain_max[1] + phy_vars_ue->rx_total_gain_dB;
#endif
} }
/* /*
break; break;
...@@ -151,7 +119,6 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) { ...@@ -151,7 +119,6 @@ phy_adjust_gain (PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id) {
} }
*/ */
#endif #endif
#endif
#ifdef DEBUG_PHY #ifdef DEBUG_PHY
/* if ((phy_vars_ue->frame%100==0) || (phy_vars_ue->frame < 10)) /* if ((phy_vars_ue->frame%100==0) || (phy_vars_ue->frame < 10))
......
openair1/PHY/LTE_TRANSPORT/print_stats.c
View file @ 6e81f269
...@@ -90,9 +90,6 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t ...@@ -90,9 +90,6 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t
phy_vars_ue->PHY_measurements.n0_power_tot_dBm, phy_vars_ue->PHY_measurements.n0_power_tot_dBm,
phy_vars_ue->PHY_measurements.n0_power_dB[0], phy_vars_ue->PHY_measurements.n0_power_dB[0],
phy_vars_ue->PHY_measurements.n0_power_dB[1]); phy_vars_ue->PHY_measurements.n0_power_dB[1]);
#ifdef CBMIMO1
len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB (rf_mode %d)\n",phy_vars_ue->rx_total_gain_dB, openair_daq_vars.rx_rf_mode);
#else
#ifdef EXMIMO #ifdef EXMIMO
#ifdef DRIVER2013 #ifdef DRIVER2013
len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB (LNA %d, vga %d dB)\n",phy_vars_ue->rx_total_gain_dB, (p_exmimo_config->rf.rf_mode[0]& LNAGAINMASK) >> 14,p_exmimo_config->rf.rx_gain[0][0]); len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB (LNA %d, vga %d dB)\n",phy_vars_ue->rx_total_gain_dB, (p_exmimo_config->rf.rf_mode[0]& LNAGAINMASK) >> 14,p_exmimo_config->rf.rx_gain[0][0]);
...@@ -102,7 +99,7 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t ...@@ -102,7 +99,7 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t
#else #else
len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB\n",phy_vars_ue->rx_total_gain_dB); len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB\n",phy_vars_ue->rx_total_gain_dB);
#endif #endif
#endif
len += sprintf(&buffer[len], "[UE_PROC] Frequency offset %d Hz (%d)\n",phy_vars_ue->lte_ue_common_vars.freq_offset,openair_daq_vars.freq_offset); len += sprintf(&buffer[len], "[UE_PROC] Frequency offset %d Hz (%d)\n",phy_vars_ue->lte_ue_common_vars.freq_offset,openair_daq_vars.freq_offset);
len += sprintf(&buffer[len], "[UE PROC] UE mode = %s (%d)\n",mode_string[phy_vars_ue->UE_mode[0]],phy_vars_ue->UE_mode[0]); len += sprintf(&buffer[len], "[UE PROC] UE mode = %s (%d)\n",mode_string[phy_vars_ue->UE_mode[0]],phy_vars_ue->UE_mode[0]);
len += sprintf(&buffer[len], "[UE PROC] timing_advance = %d\n",phy_vars_ue->timing_advance); len += sprintf(&buffer[len], "[UE PROC] timing_advance = %d\n",phy_vars_ue->timing_advance);
...@@ -246,13 +243,9 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t ...@@ -246,13 +243,9 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t
#ifdef EXMIMO #ifdef EXMIMO
phy_vars_ue->rx_total_gain_dB = ((int)(10*log10(phy_vars_ue->PHY_measurements.rssi)))-input_level_dBm; phy_vars_ue->rx_total_gain_dB = ((int)(10*log10(phy_vars_ue->PHY_measurements.rssi)))-input_level_dBm;
len += sprintf(&buffer[len], "[UE PROC] rf_mode %d, input level (set by user) %d dBm, VGA gain %d dB ==> total gain %3.2f dB, noise figure %3.2f dB\n", len += sprintf(&buffer[len], "[UE PROC] rf_mode %d, input level (set by user) %d dBm, VGA gain %d dB ==> total gain %3.2f dB, noise figure %3.2f dB\n",
phy_vars_ue->rx_gain_mode[0], p_exmimo_config->rf.rf_mode[0],
input_level_dBm, input_level_dBm,
#ifdef DRIVER2013
p_exmimo_config->rf.rx_gain[0][0], p_exmimo_config->rf.rx_gain[0][0],
#else
exmimo_pci_interface->rf.rx_gain00,
#endif
10*log10(phy_vars_ue->PHY_measurements.rssi)-input_level_dBm, 10*log10(phy_vars_ue->PHY_measurements.rssi)-input_level_dBm,
10*log10(phy_vars_ue->PHY_measurements.n0_power_tot)-phy_vars_ue->rx_total_gain_dB+105); 10*log10(phy_vars_ue->PHY_measurements.n0_power_tot)-phy_vars_ue->rx_total_gain_dB+105);
#endif #endif
......
openair1/PHY/defs.h
View file @ 6e81f269
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#ifndef __PHY_DEFS__H__ #ifndef __PHY_DEFS__H__
#define __PHY_DEFS__H__ #define __PHY_DEFS__H__
#ifdef USER_MODE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <malloc.h> #include <malloc.h>
...@@ -86,45 +85,6 @@ ...@@ -86,45 +85,6 @@
#define min(a,b) ((a)<(b) ? (a) : (b)) #define min(a,b) ((a)<(b) ? (a) : (b))
#else // USER_MODE
#include "ARCH/COMMON/defs.h"
#include "ARCH/CBMIMO1/DEVICE_DRIVER/defs.h"
#define msg fifo_printf
//#define msg(x...) rt_printk(KERN_ALERT x)
#define msg_nrt printk(KERN_ALERT x)
#ifdef BIGPHYSAREA
#define bigmalloc(x) (bigphys_malloc(x))
#define bigmalloc16(x) (bigphys_malloc(x))
#define malloc16(x) (bigphys_malloc(x))
#define free16(y,x)
#define bigfree(y,x)
#else // BIGPHYSAREA
#define bigmalloc(x) (dma_alloc_coherent(pdev[0],(x),&dummy_dma_ptr,0))
#define bigmalloc16(x) (dma_alloc_coherent(pdev[0],(x),&dummy_dma_ptr,0))
#define bigfree(y,x) (dma_free_coherent(pdev[0],(x),(void *)(y),dummy_dma_ptr))
#define malloc16(x) (kmalloc(x,GFP_KERNEL))
#define free16(y,x) (kfree(y))
#endif // BIGPHYSAREA
#ifdef CBMIMO1
#define openair_get_mbox() (*(uint32_t *)mbox)
#else //CBMIMO1
#define openair_get_mbox() (*(uint32_t *)PHY_vars->mbox>>1)
#endif //CBMIMO1
#endif // USERMODE
#define bzero(s,n) (memset((s),0,(n))) #define bzero(s,n) (memset((s),0,(n)))
#define cmax(a,b) ((a>b) ? (a) : (b)) #define cmax(a,b) ((a>b) ? (a) : (b))
...@@ -362,10 +322,11 @@ typedef struct PHY_VARS_eNB_s{ ...@@ -362,10 +322,11 @@ typedef struct PHY_VARS_eNB_s{
#define debug_msg if (((mac_xface->frame%100) == 0) || (mac_xface->frame < 50)) msg #define debug_msg if (((mac_xface->frame%100) == 0) || (mac_xface->frame < 50)) msg
//#define debug_msg msg //#define debug_msg msg
/*
typedef enum { typedef enum {
max_gain=0,med_gain,byp_gain max_gain=0,med_gain,byp_gain
} rx_gain_t; } rx_gain_t;
*/
/// Top-level PHY Data Structure for UE /// Top-level PHY Data Structure for UE
typedef struct typedef struct
...@@ -375,8 +336,9 @@ typedef struct ...@@ -375,8 +336,9 @@ typedef struct
uint8_t local_flag; uint8_t local_flag;
uint32_t tx_total_gain_dB; uint32_t tx_total_gain_dB;
uint32_t rx_total_gain_dB; ///this is a function of rx_gain_mode (and the corresponding gain) and the rx_gain of the card uint32_t rx_total_gain_dB; ///this is a function of rx_gain_mode (and the corresponding gain) and the rx_gain of the card
rx_gain_t rx_gain_mode[4];
uint32_t rx_gain_max[4]; uint32_t rx_gain_max[4];
/*
rx_gain_t rx_gain_mode[4];*/
uint32_t rx_gain_med[4]; uint32_t rx_gain_med[4];
uint32_t rx_gain_byp[4]; uint32_t rx_gain_byp[4];
int8_t tx_power_dBm; int8_t tx_power_dBm;
......
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ 6e81f269
...@@ -428,26 +428,26 @@ void phy_procedures_emos_eNB_TX(unsigned char next_slot, PHY_VARS_eNB *phy_vars_ ...@@ -428,26 +428,26 @@ void phy_procedures_emos_eNB_TX(unsigned char next_slot, PHY_VARS_eNB *phy_vars_
void phy_procedures_eNB_S_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uint8_t abstraction_flag,relaying_type_t r_type) { void phy_procedures_eNB_S_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uint8_t abstraction_flag,relaying_type_t r_type) {
unsigned char sect_id=0; // unsigned char sect_id=0;
#ifdef DEBUG_PHY_PROC #ifdef DEBUG_PHY_PROC
LOG_D(PHY,"[eNB %d] Frame %d: Doing phy_procedures_eNB_S_RX(%d)\n", phy_vars_eNB->Mod_id,phy_vars_eNB->proc[subframe].frame_rx, subframe); LOG_D(PHY,"[eNB %d] Frame %d: Doing phy_procedures_eNB_S_RX(%d)\n", phy_vars_eNB->Mod_id,phy_vars_eNB->proc[subframe].frame_rx, subframe);
#endif #endif
for (sect_id=0;sect_id<number_of_cards;sect_id++) { // for (sect_id=0;sect_id<number_of_cards;sect_id++) {
if (abstraction_flag == 0) { if (abstraction_flag == 0) {
lte_eNB_I0_measurements(phy_vars_eNB, lte_eNB_I0_measurements(phy_vars_eNB,
sect_id, 0,
phy_vars_eNB->first_run_I0_measurements); phy_vars_eNB->first_run_I0_measurements);
} }
#ifdef PHY_ABSTRACTION #ifdef PHY_ABSTRACTION
else { else {
lte_eNB_I0_measurements_emul(phy_vars_eNB, lte_eNB_I0_measurements_emul(phy_vars_eNB,
sect_id); 0);
} }
#endif #endif
}
if (I0_clear == 1) if (I0_clear == 1)
I0_clear = 0; I0_clear = 0;
...@@ -1013,7 +1013,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1013,7 +1013,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
uint8_t *pbch_pdu=&phy_vars_eNB->pbch_pdu[0]; uint8_t *pbch_pdu=&phy_vars_eNB->pbch_pdu[0];
// unsigned int nb_dci_ue_spec = 0, nb_dci_common = 0; // unsigned int nb_dci_ue_spec = 0, nb_dci_common = 0;
uint16_t input_buffer_length, re_allocated=0; uint16_t input_buffer_length, re_allocated=0;
uint32_t sect_id = 0,i,aa; uint32_t i,aa;
uint8_t harq_pid; uint8_t harq_pid;
DCI_PDU *DCI_pdu; DCI_PDU *DCI_pdu;
uint8_t *DLSCH_pdu=NULL; uint8_t *DLSCH_pdu=NULL;
...@@ -1054,12 +1054,12 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1054,12 +1054,12 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
mac_xface->eNB_dlsch_ulsch_scheduler(phy_vars_eNB->Mod_id,0,phy_vars_eNB->proc[sched_subframe].frame_tx,subframe);//,1); mac_xface->eNB_dlsch_ulsch_scheduler(phy_vars_eNB->Mod_id,0,phy_vars_eNB->proc[sched_subframe].frame_tx,subframe);//,1);
#endif #endif
for (sect_id = 0 ; sect_id < number_of_cards; sect_id++) { // for (sect_id = 0 ; sect_id < number_of_cards; sect_id++) {
if (abstraction_flag==0) { if (abstraction_flag==0) {
for (aa=0; aa<phy_vars_eNB->lte_frame_parms.nb_antennas_tx_eNB;aa++) { for (aa=0; aa<phy_vars_eNB->lte_frame_parms.nb_antennas_tx_eNB;aa++) {
memset(&phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id][aa][subframe*phy_vars_eNB->lte_frame_parms.ofdm_symbol_size*(phy_vars_eNB->lte_frame_parms.symbols_per_tti)], memset(&phy_vars_eNB->lte_eNB_common_vars.txdataF[0][aa][subframe*phy_vars_eNB->lte_frame_parms.ofdm_symbol_size*(phy_vars_eNB->lte_frame_parms.symbols_per_tti)],
0,phy_vars_eNB->lte_frame_parms.ofdm_symbol_size*(phy_vars_eNB->lte_frame_parms.symbols_per_tti)*sizeof(mod_sym_t)); 0,phy_vars_eNB->lte_frame_parms.ofdm_symbol_size*(phy_vars_eNB->lte_frame_parms.symbols_per_tti)*sizeof(mod_sym_t));
} }
} }
...@@ -1068,7 +1068,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1068,7 +1068,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (abstraction_flag==0){ if (abstraction_flag==0){
// This is DL-Cell spec pilots in Control region // This is DL-Cell spec pilots in Control region
generate_pilots_slot(phy_vars_eNB, generate_pilots_slot(phy_vars_eNB,
phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
subframe<<1,1); subframe<<1,1);
} }
...@@ -1142,11 +1142,11 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1142,11 +1142,11 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (abstraction_flag==0){ if (abstraction_flag==0){
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX,1); vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX,1);
generate_pilots_slot(phy_vars_eNB, generate_pilots_slot(phy_vars_eNB,
phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
subframe<<1,0); subframe<<1,0);
generate_pilots_slot(phy_vars_eNB, generate_pilots_slot(phy_vars_eNB,
phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
(subframe<<1)+1,0); (subframe<<1)+1,0);
...@@ -1155,12 +1155,12 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1155,12 +1155,12 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
// First half of PSS/SSS (FDD) // First half of PSS/SSS (FDD)
if (subframe == 0) { if (subframe == 0) {
if (phy_vars_eNB->lte_frame_parms.frame_type == FDD) { if (phy_vars_eNB->lte_frame_parms.frame_type == FDD) {
generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
(phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5, (phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5,
0); 0);
generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
(phy_vars_eNB->lte_frame_parms.Ncp==0) ? 5 : 4, (phy_vars_eNB->lte_frame_parms.Ncp==0) ? 5 : 4,
...@@ -1225,7 +1225,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1225,7 +1225,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (abstraction_flag==0) { if (abstraction_flag==0) {
if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) { if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) {
generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
(phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5, (phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5,
...@@ -1252,7 +1252,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1252,7 +1252,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (abstraction_flag==0) { if (abstraction_flag==0) {
generate_pbch(&phy_vars_eNB->lte_eNB_pbch, generate_pbch(&phy_vars_eNB->lte_eNB_pbch,
phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
pbch_pdu, pbch_pdu,
...@@ -1274,7 +1274,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1274,7 +1274,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) { if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) {
// printf("Generating PSS (frame %d, subframe %d)\n",phy_vars_eNB->proc[sched_subframe].frame_tx,next_slot>>1); // printf("Generating PSS (frame %d, subframe %d)\n",phy_vars_eNB->proc[sched_subframe].frame_tx,next_slot>>1);
generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
2, 2,
...@@ -1289,12 +1289,12 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1289,12 +1289,12 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (abstraction_flag==0) { if (abstraction_flag==0) {
if (phy_vars_eNB->lte_frame_parms.frame_type == FDD) { if (phy_vars_eNB->lte_frame_parms.frame_type == FDD) {
generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
(phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5, (phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5,
10); 10);
generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
(phy_vars_eNB->lte_frame_parms.Ncp==0) ? 5 : 4, (phy_vars_eNB->lte_frame_parms.Ncp==0) ? 5 : 4,
...@@ -1308,7 +1308,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1308,7 +1308,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (abstraction_flag==0) { if (abstraction_flag==0) {
if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) { if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) {
generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_sss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
(phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5, (phy_vars_eNB->lte_frame_parms.Ncp==0) ? 6 : 5,
...@@ -1323,7 +1323,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1323,7 +1323,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) { if (phy_vars_eNB->lte_frame_parms.frame_type == TDD) {
// printf("Generating PSS (frame %d, subframe %d)\n",phy_vars_eNB->proc[sched_subframe].frame_tx,next_slot>>1); // printf("Generating PSS (frame %d, subframe %d)\n",phy_vars_eNB->proc[sched_subframe].frame_tx,next_slot>>1);
generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], generate_pss(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
2, 2,
...@@ -1334,7 +1334,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1334,7 +1334,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
sect_id=0; // sect_id=0;
#if defined(SMBV) && !defined(EXMIMO) #if defined(SMBV) && !defined(EXMIMO)
// PBCH takes one allocation // PBCH takes one allocation
...@@ -1683,14 +1683,14 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1683,14 +1683,14 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
LOG_D(PHY,"[eNB %d] Frame %d, subframe %d: Calling generate_dci_top (pdcch) (common %d,ue_spec %d)\n",phy_vars_eNB->Mod_id,phy_vars_eNB->proc[sched_subframe].frame_tx, subframe,DCI_pdu->Num_common_dci,DCI_pdu->Num_ue_spec_dci); LOG_D(PHY,"[eNB %d] Frame %d, subframe %d: Calling generate_dci_top (pdcch) (common %d,ue_spec %d)\n",phy_vars_eNB->Mod_id,phy_vars_eNB->proc[sched_subframe].frame_tx, subframe,DCI_pdu->Num_common_dci,DCI_pdu->Num_ue_spec_dci);
#endif #endif
for (sect_id=0;sect_id<number_of_cards;sect_id++) // for (sect_id=0;sect_id<number_of_cards;sect_id++)
num_pdcch_symbols = generate_dci_top(DCI_pdu->Num_ue_spec_dci, num_pdcch_symbols = generate_dci_top(DCI_pdu->Num_ue_spec_dci,
DCI_pdu->Num_common_dci, DCI_pdu->Num_common_dci,
DCI_pdu->dci_alloc, DCI_pdu->dci_alloc,
0, 0,
AMP, AMP,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
subframe); subframe);
#ifdef DEBUG_PHY_PROC #ifdef DEBUG_PHY_PROC
...@@ -1775,8 +1775,8 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1775,8 +1775,8 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
stop_meas(&phy_vars_eNB->dlsch_scrambling_stats); stop_meas(&phy_vars_eNB->dlsch_scrambling_stats);
start_meas(&phy_vars_eNB->dlsch_modulation_stats); start_meas(&phy_vars_eNB->dlsch_modulation_stats);
for (sect_id=0;sect_id<number_of_cards;sect_id++) // for (sect_id=0;sect_id<number_of_cards;sect_id++)
re_allocated = dlsch_modulation(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], re_allocated = dlsch_modulation(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
subframe, subframe,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
...@@ -1891,8 +1891,8 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -1891,8 +1891,8 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
num_pdcch_symbols,phy_vars_eNB->proc[sched_subframe].frame_tx,subframe), num_pdcch_symbols,phy_vars_eNB->proc[sched_subframe].frame_tx,subframe),
0, 0,
subframe<<1); subframe<<1);
for (sect_id=0;sect_id<number_of_cards;sect_id++) // for (sect_id=0;sect_id<number_of_cards;sect_id++)
re_allocated = dlsch_modulation(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], re_allocated = dlsch_modulation(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
subframe, subframe,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
...@@ -2017,7 +2017,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -2017,7 +2017,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
subframe<<1); subframe<<1);
stop_meas(&phy_vars_eNB->dlsch_scrambling_stats); stop_meas(&phy_vars_eNB->dlsch_scrambling_stats);
start_meas(&phy_vars_eNB->dlsch_modulation_stats); start_meas(&phy_vars_eNB->dlsch_modulation_stats);
for (sect_id=0;sect_id<number_of_cards;sect_id++) { //for (sect_id=0;sect_id<number_of_cards;sect_id++) {
/* if ((phy_vars_eNB->transmission_mode[(uint8_t)UE_id] == 5) && /* if ((phy_vars_eNB->transmission_mode[(uint8_t)UE_id] == 5) &&
(phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]->dl_power_off == 0)) (phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]->dl_power_off == 0))
...@@ -2027,13 +2027,13 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -2027,13 +2027,13 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
// if (UE_id == 1) // if (UE_id == 1)
// LOG_I(PHY,"[MYEMOS] MCS_i %d\n", phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]->harq_processes[harq_pid]->mcs); // LOG_I(PHY,"[MYEMOS] MCS_i %d\n", phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]->harq_processes[harq_pid]->mcs);
re_allocated = dlsch_modulation(phy_vars_eNB->lte_eNB_common_vars.txdataF[sect_id], re_allocated = dlsch_modulation(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
AMP, AMP,
subframe, subframe,
&phy_vars_eNB->lte_frame_parms, &phy_vars_eNB->lte_frame_parms,
num_pdcch_symbols, num_pdcch_symbols,
phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]); phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]);
}
stop_meas(&phy_vars_eNB->dlsch_modulation_stats); stop_meas(&phy_vars_eNB->dlsch_modulation_stats);
} }
#ifdef PHY_ABSTRACTION #ifdef PHY_ABSTRACTION
...@@ -2070,16 +2070,16 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -2070,16 +2070,16 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
#ifdef DEBUG_PHY_PROC #ifdef DEBUG_PHY_PROC
// LOG_D(PHY,"[eNB %d] Frame %d, subframe %d: Calling generate_phich_top\n",phy_vars_eNB->Mod_id,phy_vars_eNB->proc[sched_subframe].frame_tx, subframe); // LOG_D(PHY,"[eNB %d] Frame %d, subframe %d: Calling generate_phich_top\n",phy_vars_eNB->Mod_id,phy_vars_eNB->proc[sched_subframe].frame_tx, subframe);
#endif #endif
for (sect_id=0;sect_id<number_of_cards;sect_id++) { // for (sect_id=0;sect_id<number_of_cards;sect_id++) {
generate_phich_top(phy_vars_eNB, generate_phich_top(phy_vars_eNB,
subframe, subframe,
AMP, AMP,
sect_id, 0,
abstraction_flag); abstraction_flag);
} }
}
}
#ifdef EMOS #ifdef EMOS
phy_procedures_emos_eNB_TX(next_slot, phy_vars_eNB); phy_procedures_emos_eNB_TX(next_slot, phy_vars_eNB);
#endif #endif
...@@ -2599,7 +2599,7 @@ void ulsch_decoding_procedures(unsigned char subframe, unsigned int i, PHY_VARS_ ...@@ -2599,7 +2599,7 @@ void ulsch_decoding_procedures(unsigned char subframe, unsigned int i, PHY_VARS_
void phy_procedures_eNB_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uint8_t abstraction_flag,relaying_type_t r_type) { void phy_procedures_eNB_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uint8_t abstraction_flag,relaying_type_t r_type) {
//RX processing //RX processing
uint32_t l, ret,i,j; uint32_t l, ret=0,i,j;
uint32_t sect_id=0; uint32_t sect_id=0;
uint32_t harq_pid, round; uint32_t harq_pid, round;
uint8_t SR_payload,*pucch_payload=NULL,pucch_payload0[2]={0,0},pucch_payload1[2]={0,0}; uint8_t SR_payload,*pucch_payload=NULL,pucch_payload0[2]={0,0},pucch_payload1[2]={0,0};
...@@ -2641,23 +2641,21 @@ void phy_procedures_eNB_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin ...@@ -2641,23 +2641,21 @@ void phy_procedures_eNB_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
start_meas(&phy_vars_eNB->ofdm_demod_stats); start_meas(&phy_vars_eNB->ofdm_demod_stats);
for (l=0;l<phy_vars_eNB->lte_frame_parms.symbols_per_tti/2;l++) { for (l=0;l<phy_vars_eNB->lte_frame_parms.symbols_per_tti/2;l++) {
for (sect_id=0;sect_id<number_of_cards;sect_id++) { // for (sect_id=0;sect_id<number_of_cards;sect_id++) {
slot_fep_ul(&phy_vars_eNB->lte_frame_parms, slot_fep_ul(&phy_vars_eNB->lte_frame_parms,
&phy_vars_eNB->lte_eNB_common_vars, &phy_vars_eNB->lte_eNB_common_vars,
l, l,
subframe<<1, subframe<<1,
sect_id, 0,
0 0
); );
slot_fep_ul(&phy_vars_eNB->lte_frame_parms, slot_fep_ul(&phy_vars_eNB->lte_frame_parms,
&phy_vars_eNB->lte_eNB_common_vars, &phy_vars_eNB->lte_eNB_common_vars,
l, l,
(subframe<<1)+1, (subframe<<1)+1,
sect_id, 0,
0 0
); );
}
} }
stop_meas(&phy_vars_eNB->ofdm_demod_stats); stop_meas(&phy_vars_eNB->ofdm_demod_stats);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment