From 1bcf1d41e95630b5475d351461478b0de50efbe6 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Wed, 1 Apr 2015 14:28:13 +0000
Subject: [PATCH] revert my modifs that are redundant with the #undef USRP in
lib_usrp.cpp
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6978 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/OPENAIRHSS/conf/hss.conf.in | 13 ++++----
openair1/PHY/LTE_TRANSPORT/initial_sync.c | 2 +-
openair1/PHY/LTE_TRANSPORT/print_stats.c | 4 +--
openair1/PHY/MODULATION/slot_fep.c | 8 ++---
openair1/SCHED/phy_procedures_lte_eNb.c | 2 +-
openair1/SCHED/phy_procedures_lte_ue.c | 36 +++++++++++------------
targets/RT/USER/lte-softmodem.c | 4 +--
targets/RT/USER/lte-ue.c | 14 ++++-----
8 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/openair-cn/OPENAIRHSS/conf/hss.conf.in b/openair-cn/OPENAIRHSS/conf/hss.conf.in
index 4c5e4c7d93c..fd4a1ef3c7c 100644
--- a/openair-cn/OPENAIRHSS/conf/hss.conf.in
+++ b/openair-cn/OPENAIRHSS/conf/hss.conf.in
@@ -1,11 +1,8 @@
## MySQL mandatory options
-MYSQL_server = "@MYSQL_server@";
-MYSQL_user = "@MYSQL_user@";
-MYSQL_pass = "@MYSQL_pass@";
-MYSQL_db = "@MYSQL_db@";
-
-## HSS options
-OPERATOR_key = "@OPERATOR_key@";
+MYSQL_server = "127.0.0.1";
+MYSQL_user = "hssadmin";
+MYSQL_pass = "admin";
+MYSQL_db = "oai_db";
## Freediameter options
-FD_conf = "@FREEDIAMETER_PATH@/../etc/freeDiameter/hss_fd.conf";
+FD_conf = "@AM_CONF_DIR@/hss_fd.conf";
diff --git a/openair1/PHY/LTE_TRANSPORT/initial_sync.c b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
index c79b1cb7301..6d6c6e9d9e8 100644
--- a/openair1/PHY/LTE_TRANSPORT/initial_sync.c
+++ b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
@@ -274,7 +274,7 @@ int initial_sync(PHY_VARS_UE *phy_vars_ue, runmode_t mode) {
//phy_adjust_gain(phy_vars_ue,0);
gain_control_all(phy_vars_ue->PHY_measurements.rx_power_avg_dB[0],0);
#else
-#if !(defined(USRP) || defined(OAI_USRP))
+#ifndef USRP
phy_adjust_gain(phy_vars_ue,0);
#endif
#endif
diff --git a/openair1/PHY/LTE_TRANSPORT/print_stats.c b/openair1/PHY/LTE_TRANSPORT/print_stats.c
index cc662b658af..b30c790c21d 100644
--- a/openair1/PHY/LTE_TRANSPORT/print_stats.c
+++ b/openair1/PHY/LTE_TRANSPORT/print_stats.c
@@ -49,7 +49,7 @@
#endif
extern int mac_get_rrc_status(uint8_t Mod_id,uint8_t eNB_flag,uint8_t index);
-#if defined(USRP) || defined(EXMIMO) || defined(OAI_USRP)
+#if defined(USRP) || defined(EXMIMO)
#include "common_lib.h"
extern openair0_config_t openair0_cfg[];
#endif
@@ -84,7 +84,7 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t
#ifdef EXMIMO
len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB (LNA %d, vga %d dB)\n",phy_vars_ue->rx_total_gain_dB, openair0_cfg[0].rxg_mode[0],(int)openair0_cfg[0].rx_gain[0]);
#endif
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB\n",phy_vars_ue->rx_total_gain_dB);
#endif
diff --git a/openair1/PHY/MODULATION/slot_fep.c b/openair1/PHY/MODULATION/slot_fep.c
index ff679a38475..5c59df487e7 100644
--- a/openair1/PHY/MODULATION/slot_fep.c
+++ b/openair1/PHY/MODULATION/slot_fep.c
@@ -130,7 +130,7 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
memcpy((void *)tmp_dft_in,
(void *)&ue_common_vars->rxdata[aa][(rx_offset-nb_prefix_samples0) % frame_length_samples],
frame_parms->ofdm_symbol_size*sizeof(int));
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
rescale((int16_t *)tmp_dft_in,
frame_parms->ofdm_symbol_size);
#endif
@@ -139,7 +139,7 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
}
else {// use dft input from RX buffer directly
start_meas(&phy_vars_ue->rx_dft_stats);
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
rescale((int16_t *)&ue_common_vars->rxdata[aa][(rx_offset-nb_prefix_samples0) % frame_length_samples],
frame_parms->ofdm_symbol_size+nb_prefix_samples0);
#endif
@@ -168,7 +168,7 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
memcpy((void *)tmp_dft_in,
(void *)&ue_common_vars->rxdata[aa][(rx_offset) % frame_length_samples],
frame_parms->ofdm_symbol_size*sizeof(int));
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
rescale((int16_t *)tmp_dft_in,
frame_parms->ofdm_symbol_size);
#endif
@@ -176,7 +176,7 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
(int16_t *)&ue_common_vars->rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
}
else {// use dft input from RX buffer directly
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
rescale((int16_t *)&ue_common_vars->rxdata[aa][(rx_offset-nb_prefix_samples) % frame_length_samples],
frame_parms->ofdm_symbol_size+nb_prefix_samples);
#endif
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index b6d9ac11ce4..792be8dd2a3 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -2403,7 +2403,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
#endif
#ifndef EXMIMO
-#if !(defined(USRP) || defined(OAI_USRP))
+#ifndef USRP
if (abstraction_flag==0) {
start_meas(&phy_vars_eNB->ofdm_mod_stats);
do_OFDM_mod(phy_vars_eNB->lte_eNB_common_vars.txdataF[0],
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index 468945a8c9a..8ededde4304 100755
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -122,7 +122,7 @@ extern int rx_sig_fifo;
#endif
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
extern uint32_t downlink_frequency[MAX_NUM_CCs][4];
#endif
@@ -192,7 +192,7 @@ void dump_dlsch_SI(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t subframe) {
exit(-1);
}
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
unsigned int prach_gain_table[31] = {100,112,126,141,158,178,200,224,251,282,316,359,398,447,501,562,631,708,794,891,1000,1122,1258,1412,1585,1778,1995,2239,2512,2818,3162};
unsigned int get_tx_amp(int power_dBm, int power_max_dBm) {
@@ -608,7 +608,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
uint8_t ack_status=0;
int8_t Po_PUCCH;
int32_t ulsch_start=0;
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
int overflow=0;
int k,l;
#endif
@@ -906,7 +906,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
LOG_D(PHY,"[UE %d][PUSCH %d] Frame %d subframe %d, generating PUSCH, Po_PUSCH: %d dBm, amp %d\n",
Mod_id,harq_pid,frame_tx,subframe_tx,phy_vars_ue->tx_power_dBm,
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
get_tx_amp(phy_vars_ue->tx_power_dBm,phy_vars_ue->tx_power_max_dBm)
#else
AMP
@@ -914,7 +914,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
);
start_meas(&phy_vars_ue->ulsch_modulation_stats);
ulsch_modulation(phy_vars_ue->lte_ue_common_vars.txdataF,
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
get_tx_amp(phy_vars_ue->tx_power_dBm,phy_vars_ue->tx_power_max_dBm),
#else
AMP,
@@ -924,7 +924,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
&phy_vars_ue->lte_frame_parms,
phy_vars_ue->ulsch_ue[eNB_id]);
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
for (aa=0; aa<1/*frame_parms->nb_antennas_tx*/; aa++)
generate_drs_pusch(phy_vars_ue,eNB_id,get_tx_amp(phy_vars_ue->tx_power_dBm,phy_vars_ue->tx_power_max_dBm),subframe_tx,first_rb,nb_rb,aa);
#else
@@ -1012,7 +1012,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
frame_tx, subframe_tx,
phy_vars_ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex,
Po_PUCCH,
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
get_tx_amp(Po_PUCCH,phy_vars_ue->tx_power_max_dBm)
#else
AMP
@@ -1026,7 +1026,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
frame_tx, subframe_tx,
n1_pucch,pucch_ack_payload[0],pucch_ack_payload[1],SR_payload,
Po_PUCCH,
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
get_tx_amp(Po_PUCCH,phy_vars_ue->tx_power_max_dBm)
#else
AMP
@@ -1045,7 +1045,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
0, // n2_pucch
1, // shortened format
pucch_ack_payload,
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
get_tx_amp(Po_PUCCH,phy_vars_ue->tx_power_max_dBm),
#else
AMP,
@@ -1093,7 +1093,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
0, // n2_pucch
1, // shortened format
pucch_ack_payload, // this is ignored anyway, we just need a pointer
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
get_tx_amp(Po_PUCCH,phy_vars_ue->tx_power_max_dBm),
#else
AMP,
@@ -1169,7 +1169,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
if (abstraction_flag == 0) {
nsymb = (frame_parms->Ncp == 0) ? 14 : 12;
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP) //this is the EXPRESS MIMO case
ulsch_start = (phy_vars_ue->rx_offset+subframe_tx*frame_parms->samples_per_tti-
openair_daq_vars.timing_advance-
phy_vars_ue->timing_advance-
@@ -1191,7 +1191,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
if (frame_parms->Ncp == 1)
PHY_ofdm_mod(&phy_vars_ue->lte_ue_common_vars.txdataF[aa][subframe_tx*nsymb*frame_parms->ofdm_symbol_size],
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
dummy_tx_buffer,
#else
&phy_vars_ue->lte_ue_common_vars.txdata[aa][ulsch_start],
@@ -1204,7 +1204,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
CYCLIC_PREFIX);
else
normal_prefix_mod(&phy_vars_ue->lte_ue_common_vars.txdataF[aa][subframe_tx*nsymb*frame_parms->ofdm_symbol_size],
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
dummy_tx_buffer,
#else
&phy_vars_ue->lte_ue_common_vars.txdata[aa][ulsch_start],
@@ -1225,7 +1225,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
}
*/
#ifndef OFDMA_ULSCH
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
apply_7_5_kHz(phy_vars_ue,dummy_tx_buffer,0);
apply_7_5_kHz(phy_vars_ue,dummy_tx_buffer,1);
#else
@@ -1240,7 +1240,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
*/
#endif
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
overflow = ulsch_start - 9*frame_parms->samples_per_tti;
//if ((slot_tx==4) && (aa==0)) printf("ulsch_start %d, overflow %d\n",ulsch_start,overflow);
for (k=ulsch_start,l=0; k<cmin(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,ulsch_start+frame_parms->samples_per_tti); k++,l++)
@@ -1317,7 +1317,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
phy_vars_ue->tx_total_RE = 96;
-#if defined(EXMIMO) || defined(USRP) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(USRP)
phy_vars_ue->lte_ue_prach_vars[eNB_id]->amp = get_tx_amp(phy_vars_ue->tx_power_dBm,phy_vars_ue->tx_power_max_dBm);
#else
phy_vars_ue->lte_ue_prach_vars[eNB_id]->amp = AMP;
@@ -1509,7 +1509,7 @@ void lte_ue_measurement_procedures(uint16_t l, PHY_VARS_UE *phy_vars_ue,uint8_t
gain_control_all(phy_vars_ue->PHY_measurements.rx_power_avg_dB[eNB_id],0);
#else
-#if !(defined(USRP) || defined(OAI_USRP))
+#ifndef USRP
phy_adjust_gain (phy_vars_ue,0);
#endif
#endif
@@ -3454,7 +3454,7 @@ void phy_UE_lte_check_measurement_thresholds(instance_t instanceP, ral_threshold
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_LTE,1);
#if defined(EXMIMO)
-#if !(defined(USRP) || defined(OAI_USRP))
+#ifndef USRP
vcd_signal_dumper_dump_variable_by_name(VCD_SIGNAL_DUMPER_VARIABLES_DAQ_MBOX, *((volatile unsigned int *) openair0_exmimo_pci[0].rxcnt_ptr[0]));
#endif
#endif
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 46395d3e8eb..1eb679c2654 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -1769,7 +1769,7 @@ static void get_options (int argc, char **argv) {
// char line[1000];
// int l;
int k,i;//,j,k;
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
int clock_src;
#endif
int CC_id;
@@ -1953,7 +1953,7 @@ static void get_options (int argc, char **argv) {
}
break;
case 's':
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
clock_src = atoi(optarg);
if (clock_src == 0) {
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index dca43093040..08936e7c46b 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -257,7 +257,7 @@ static void *UE_thread_synch(void *arg) {
openair0_cfg[card].rx_freq[i] = downlink_frequency[card][i];
openair0_cfg[card].tx_freq[i] = downlink_frequency[card][i]+uplink_frequency_offset[card][i];
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
openair0_cfg[card].rx_gain[i] = UE->rx_total_gain_dB-USRP_GAIN_OFFSET;
switch(UE->lte_frame_parms.N_RB_DL) {
case 6:
@@ -280,7 +280,7 @@ static void *UE_thread_synch(void *arg) {
//openair0_config(&openair0_cfg[card],1);
#endif
}
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
#ifndef USRP_DEBUG
openair0_set_rx_frequencies(&openair0,&openair0_cfg[0]);
openair0_set_gains(&openair0,&openair0_cfg[0]);
@@ -336,7 +336,7 @@ static void *UE_thread_synch(void *arg) {
openair0_cfg[card].rx_freq[i] = downlink_frequency[card][i]+openair_daq_vars.freq_offset;
openair0_cfg[card].tx_freq[i] = downlink_frequency[card][i]+uplink_frequency_offset[card][i]+openair_daq_vars.freq_offset;
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
openair0_cfg[card].rx_gain[i] = UE->rx_total_gain_dB-USRP_GAIN_OFFSET; // 65 calibrated for USRP B210 @ 2.6 GHz
switch(UE->lte_frame_parms.N_RB_DL) {
case 6:
@@ -360,7 +360,7 @@ static void *UE_thread_synch(void *arg) {
//openair0_config(&openair0_cfg[card],1);
#endif
}
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
#ifndef USRP_DEBUG
openair0_set_rx_frequencies(&openair0,&openair0_cfg[0]);
// openair0_set_gains(&openair0,&openair0_cfg[0]);
@@ -422,7 +422,7 @@ static void *UE_thread_synch(void *arg) {
for (i=0; i<openair0_cfg[card].rx_num_channels; i++) {
openair0_cfg[card].rx_freq[i] = downlink_frequency[card][i]+openair_daq_vars.freq_offset;
openair0_cfg[card].tx_freq[i] = downlink_frequency[card][i]+uplink_frequency_offset[card][i]+openair_daq_vars.freq_offset;
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
openair0_cfg[card].rx_gain[i] = UE->rx_total_gain_dB-USRP_GAIN_OFFSET; // 65 calibrated for USRP B210 @ 2.6 GHz
switch(UE->lte_frame_parms.N_RB_DL) {
@@ -447,7 +447,7 @@ static void *UE_thread_synch(void *arg) {
//rt_sleep_ns(FRAME_PERIOD);
#endif
}
-#if defined(USRP) || defined(OAI_USRP)
+#ifdef USRP
#ifndef USRP_DEBUG
openair0_set_frequencies(&openair0,&openair0_cfg[0]);
// openair0_set_gains(&openair0,&openair0_cfg[0]);
@@ -1405,7 +1405,7 @@ void *UE_thread(void *arg) {
}
else {
// LOG_I(PHY,"[initial_sync] trying carrier off %d Hz\n",openair_daq_vars.freq_offset);
- #if !(defined(USRP) || defined(OAI_USRP))
+ #ifndef USRP
for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
for (i=0; i<openair0_cfg[rf_map[CC_id].card].rx_num_channels; i++)
openair0_cfg[rf_map[CC_id].card].rx_freq[rf_map[CC_id].chain+i] = downlink_frequency[CC_id][i]+openair_daq_vars.freq_offset;
--
GitLab