Commit 1f6cd4a3 authored by lfq's avatar lfq

add 5.5g conf

parent d4ebfe59
...@@ -697,6 +697,7 @@ install_asn1c_from_source(){ ...@@ -697,6 +697,7 @@ install_asn1c_from_source(){
sudo wget -c http://www.opensource5g.org:19780/share/oai/libs/asn1c.tar.gz -P /tmp/ sudo wget -c http://www.opensource5g.org:19780/share/oai/libs/asn1c.tar.gz -P /tmp/
tar -zxvf /tmp/asn1c.tar.gz -C /tmp tar -zxvf /tmp/asn1c.tar.gz -C /tmp
cd /tmp/asn1c cd /tmp/asn1c
git config --global --add safe.directory /tmp/asn1c
git checkout vlm_master git checkout vlm_master
# Showing which version is used # Showing which version is used
git log -n1 git log -n1
...@@ -720,6 +721,7 @@ install_simde_from_source(){ ...@@ -720,6 +721,7 @@ install_simde_from_source(){
sudo wget -c http://www.opensource5g.org:19780/share/oai/libs/simde.tar.gz -P /tmp/ sudo wget -c http://www.opensource5g.org:19780/share/oai/libs/simde.tar.gz -P /tmp/
tar -zxvf /tmp/simde.tar.gz -C /tmp tar -zxvf /tmp/simde.tar.gz -C /tmp
cd /tmp/simde cd /tmp/simde
git config --global --add safe.directory /tmp/simde
# we can specify a given version of SIMDE (sha-one or tag) # we can specify a given version of SIMDE (sha-one or tag)
if [[ -v SIMDE_VERSION ]]; then if [[ -v SIMDE_VERSION ]]; then
git checkout -f $SIMDE_VERSION git checkout -f $SIMDE_VERSION
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "LAYER2/nr_pdcp/nr_pdcp_oai_api.h" #include "LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
#include "LAYER2/nr_rlc/nr_rlc_oai_api.h" #include "LAYER2/nr_rlc/nr_rlc_oai_api.h"
#include "RRC/NR/MESSAGES/asn1_msg.h" #include "RRC/NR/MESSAGES/asn1_msg.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
/* /*
* NR SLOT PROCESSING SEQUENCE * NR SLOT PROCESSING SEQUENCE
* *
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
#define RX_JOB_ID 0x1010 #define RX_JOB_ID 0x1010
#define TX_JOB_ID 100 #define TX_JOB_ID 100
int32_t g_buff_temp[614400];
typedef enum { typedef enum {
pss = 0, pss = 0,
pbch = 1, pbch = 1,
...@@ -523,7 +524,7 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD) { ...@@ -523,7 +524,7 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD) {
} else { } else {
flags = TX_BURST_MIDDLE; flags = TX_BURST_MIDDLE;
} }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1);
if (flags || IS_SOFTMODEM_RFSIM) if (flags || IS_SOFTMODEM_RFSIM)
AssertFatal(rxtxD->writeBlockSize == AssertFatal(rxtxD->writeBlockSize ==
UE->rfdevice.trx_write_func(&UE->rfdevice, UE->rfdevice.trx_write_func(&UE->rfdevice,
...@@ -535,7 +536,7 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD) { ...@@ -535,7 +536,7 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD) {
for (int i=0; i<UE->frame_parms.nb_antennas_tx; i++) for (int i=0; i<UE->frame_parms.nb_antennas_tx; i++)
memset(txp[i], 0, rxtxD->writeBlockSize); memset(txp[i], 0, rxtxD->writeBlockSize);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0);
} }
void processSlotTX(void *arg) { void processSlotTX(void *arg) {
...@@ -839,7 +840,7 @@ void *UE_thread(void *arg) ...@@ -839,7 +840,7 @@ void *UE_thread(void *arg)
continue; continue;
} }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
absolute_slot++; absolute_slot++;
int slot_nr = absolute_slot % nb_slot_frame; int slot_nr = absolute_slot % nb_slot_frame;
...@@ -938,7 +939,29 @@ void *UE_thread(void *arg) ...@@ -938,7 +939,29 @@ void *UE_thread(void *arg)
if (res == NULL) if (res == NULL)
LOG_E(PHY, "Tpool has been aborted\n"); LOG_E(PHY, "Tpool has been aborted\n");
else else
delNotifiedFIFO_elt(res); delNotifiedFIFO_elt(res);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
#if 0
static int first_slot = 0;
if (first_slot == 0)
{
first_slot = absolute_slot;
}
if ((absolute_slot >= first_slot + 1000) && (absolute_slot < first_slot + 1020))
{
memcpy(&g_buff_temp[slot_nr * 30720], &UE->common_vars.rxdata[0][30720 * slot_nr], 30720 * 4);
}
if (absolute_slot == first_slot + 1030)
{
FILE *fp = fopen("Rx_time_data.am", "wb+");
fwrite(&g_buff_temp[0], 4, 30720*20, fp);
fclose(fp);
printf("out data\n");
exit(0);
}
#endif
} // while !oai_exit } // while !oai_exit
return NULL; return NULL;
......
...@@ -188,8 +188,8 @@ MACRLCs = ( ...@@ -188,8 +188,8 @@ MACRLCs = (
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
pucch_TargetSNRx10 = 200; pucch_TargetSNRx10 = 200;
ulsch_max_frame_inactivity = 0; ulsch_max_frame_inactivity = 0;
target_dl_slotmap = 129150; target_dl_slotmap = 129150; #129150;
target_dl_mcs = 14; target_dl_mcs = 10;
target_dl_rb = 100; target_dl_rb = 100;
} }
); );
...@@ -201,19 +201,20 @@ L1s = ( ...@@ -201,19 +201,20 @@ L1s = (
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
tx_amp_backoff_dB = 26;
} }
); );
RUs = ( RUs = (
{ {
local_rf = "yes" local_rf = "yes"
nb_tx = 2 nb_tx = 1
nb_rx = 2 nb_rx = 1
att_tx = 0 att_tx = 25
att_rx = 0; att_rx = 0;
bands = [78]; bands = [78];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 75; max_rxgain = 70;
eNB_instances = [0]; eNB_instances = [0];
##beamforming 1x2 matrix: 1 layer x 2 antennas ##beamforming 1x2 matrix: 1 layer x 2 antennas
bf_weights = [0x00007fff, 0x0000]; bf_weights = [0x00007fff, 0x0000];
......
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