Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-RAN
Commits
b5114190
Commit
b5114190
authored
8 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolved residual warnings after merge with develop (no warnings again for lte-softmodem)
parent
e71aebc6
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
104 additions
and
50 deletions
+104
-50
openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
+1
-1
openair1/PHY/CODING/defs.h
openair1/PHY/CODING/defs.h
+6
-0
openair1/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
...air1/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
+2
-1
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
+8
-7
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/prach.c
+3
-3
openair1/PHY/LTE_TRANSPORT/print_stats.c
openair1/PHY/LTE_TRANSPORT/print_stats.c
+26
-5
openair1/PHY/TOOLS/defs.h
openair1/PHY/TOOLS/defs.h
+2
-2
openair1/PHY/TOOLS/lte_dfts.c
openair1/PHY/TOOLS/lte_dfts.c
+46
-20
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-2
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+1
-1
openair2/LAYER2/openair2_proc.c
openair2/LAYER2/openair2_proc.c
+2
-5
openair2/RRC/LITE/proto.h
openair2/RRC/LITE/proto.h
+2
-0
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+1
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+1
-1
No files found.
openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
View file @
b5114190
...
...
@@ -1413,6 +1413,6 @@ unsigned char phy_threegpplte_turbo_decoder16avx2(int16_t *y,
return
(
iteration_cnt
);
}
#endif __AVX2__
#endif
//
__AVX2__
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/defs.h
View file @
b5114190
...
...
@@ -303,6 +303,10 @@ void ccodedot11_init(void);
\brief This function initializes the trellis structure for decoding an 802.11 convolutional code.*/
void
ccodedot11_init_inv
(
void
);
/*!\fn void teillis_table_init(void)
\brief This function initializes the trellis structure for 3GPP LTE Turbo code.*/
void
treillis_table_init
(
void
);
/*\fn void threegpplte_turbo_encoder(uint8_t *input,uint16_t input_length_bytes,uint8_t *output,uint8_t F,uint16_t interleaver_f1,uint16_t interleaver_f2)
\brief This function implements a rate 1/3 8-state parralel concatenated turbo code (3GPP-LTE).
@param input Pointer to input buffer
...
...
@@ -353,6 +357,8 @@ void ccodedab_init(void);
\brief This function initializes the trellis structure for decoding an DAB convolutional code (first 3 bits).*/
void
ccodedab_init_inv
(
void
);
/*!\fn void crcTableInit(void)
\brief This function initializes the different crc tables.*/
void
crcTableInit
(
void
);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
View file @
b5114190
...
...
@@ -771,7 +771,8 @@ int lte_dl_mbsfn_channel_estimation(PHY_VARS_UE *phy_vars_ue,
break
;
case
75
:
idft1536
((
int16_t
*
)
&
phy_vars_ue
->
lte_ue_common_vars
.
dl_ch_estimates
[
eNB_offset
][
aa
][
LTE_CE_OFFSET
],
(
int16_t
*
)
phy_vars_ue
->
lte_ue_common_vars
.
dl_ch_estimates_time
[
eNB_offset
][
aa
]);
(
int16_t
*
)
phy_vars_ue
->
lte_ue_common_vars
.
dl_ch_estimates_time
[
eNB_offset
][
aa
],
1
);
break
;
case
100
:
idft2048
((
int16_t
*
)
&
phy_vars_ue
->
lte_ue_common_vars
.
dl_ch_estimates
[
eNB_offset
][
aa
][
LTE_CE_OFFSET
],
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
View file @
b5114190
...
...
@@ -170,12 +170,13 @@ int lte_sync_time_init(LTE_DL_FRAME_PARMS *frame_parms ) // LTE_UE_COMMON *com
case
75
:
idft1536
((
short
*
)
syncF_tmp
,
/// complex input
(
short
*
)
sync_tmp
);
/// complex output
(
short
*
)
sync_tmp
,
1
);
/// complex output
break
;
case
100
:
idft2048
((
short
*
)
syncF_tmp
,
/// complex input
(
short
*
)
sync_tmp
,
/// complex output
1
);
(
short
*
)
sync_tmp
,
/// complex output
1
);
break
;
default:
LOG_E
(
PHY
,
"Unsupported N_RB_DL %d
\n
"
,
frame_parms
->
N_RB_DL
);
...
...
@@ -217,8 +218,8 @@ int lte_sync_time_init(LTE_DL_FRAME_PARMS *frame_parms ) // LTE_UE_COMMON *com
case
75
:
idft1536
((
short
*
)
syncF_tmp
,
/// complex input
(
short
*
)
sync_tmp
/// complex output
);
(
short
*
)
sync_tmp
,
/// complex output
1
);
break
;
case
100
:
idft2048
((
short
*
)
syncF_tmp
,
/// complex input
...
...
@@ -265,8 +266,8 @@ int lte_sync_time_init(LTE_DL_FRAME_PARMS *frame_parms ) // LTE_UE_COMMON *com
case
75
:
idft1536
((
short
*
)
syncF_tmp
,
/// complex input
(
short
*
)
sync_tmp
/// complex output
);
(
short
*
)
sync_tmp
,
/// complex output
1
);
break
;
case
100
:
idft2048
((
short
*
)
syncF_tmp
,
/// complex input
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/prach.c
View file @
b5114190
...
...
@@ -898,7 +898,7 @@ int32_t generate_prach( PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id, uint8_t subfra
memmove
(
prach
,
prach
+
512
,
Ncp
<<
2
);
prach_len
=
256
+
Ncp
;
}
else
{
idft1536
(
prachF
,
prach2
);
idft1536
(
prachF
,
prach2
,
1
);
memmove
(
prach
,
prach
+
3072
,
Ncp
<<
2
);
prach_len
=
1536
+
Ncp
;
...
...
@@ -1338,10 +1338,10 @@ void rx_prach(PHY_VARS_eNB *phy_vars_eNB,uint8_t subframe,uint16_t *preamble_ene
if
(
prach_fmt
==
4
)
{
dft256
(
prach2
,
rxsigF
[
aa
],
1
);
}
else
{
dft1536
(
prach2
,
rxsigF
[
aa
]);
dft1536
(
prach2
,
rxsigF
[
aa
]
,
1
);
if
(
prach_fmt
>
1
)
dft1536
(
prach2
+
3072
,
rxsigF
[
aa
]
+
3072
);
dft1536
(
prach2
+
3072
,
rxsigF
[
aa
]
+
3072
,
1
);
}
break
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/print_stats.c
View file @
b5114190
...
...
@@ -639,8 +639,7 @@ int dump_eNB_stats(PHY_VARS_eNB *phy_vars_eNB, char* buffer, int length)
phy_vars_eNB
->
lte_frame_parms
.
ul_power_control_config_common
.
p0_NominalPUCCH
,
dB_fixed
(
phy_vars_eNB
->
eNB_UE_stats
[
UE_id
].
Po_PUCCH1_below
/
phy_vars_eNB
->
lte_frame_parms
.
N_RB_UL
)
-
phy_vars_eNB
->
rx_total_gain_eNB_dB
,
dB_fixed
(
phy_vars_eNB
->
eNB_UE_stats
[
UE_id
].
Po_PUCCH1_above
/
phy_vars_eNB
->
lte_frame_parms
.
N_RB_UL
)
-
phy_vars_eNB
->
rx_total_gain_eNB_dB
,
PUCCH1_THRES
+
phy_vars_eNB
->
PHY_measurements_eNB
[
0
].
n0_power_tot_dBm
-
dB_fixed
(
phy_vars_eNB
->
lte_frame_parms
.
N_RB_UL
),
phy_vars_eNB
->
eNB_UE_stats
[
UE_id
].
sector
);
PUCCH1_THRES
+
phy_vars_eNB
->
PHY_measurements_eNB
[
0
].
n0_power_tot_dBm
-
dB_fixed
(
phy_vars_eNB
->
lte_frame_parms
.
N_RB_UL
));
len
+=
sprintf
(
&
buffer
[
len
],
"DL mcs %d, UL mcs %d, UL rb %d, delta_TF %d, "
,
phy_vars_eNB
->
dlsch_eNB
[(
uint8_t
)
UE_id
][
0
]
->
harq_processes
[
0
]
->
mcs
,
...
...
@@ -688,11 +687,33 @@ int dump_eNB_stats(PHY_VARS_eNB *phy_vars_eNB, char* buffer, int length)
phy_vars_eNB
->
eNB_UE_stats
[
UE_id
].
sr_total
-
phy_vars_eNB
->
eNB_UE_stats
[
UE_id
].
sr_received
);
len
+=
sprintf
(
&
buffer
[
len
],
"DL Subband CQI: "
);
for
(
i
=
0
;
i
<
25
;
i
++
)
int
nb_sb
;
switch
(
phy_vars_eNB
->
lte_frame_parms
.
N_RB_DL
)
{
case
6
:
nb_sb
=
0
;
break
;
case
15
:
nb_sb
=
4
;
case
25
:
nb_sb
=
7
;
break
;
case
50
:
nb_sb
=
9
;
break
;
case
75
:
nb_sb
=
10
;
break
;
case
100
:
nb_sb
=
13
;
break
;
default:
nb_sb
=
0
;
break
;
}
for
(
i
=
0
;
i
<
nb_sb
;
i
++
)
len
+=
sprintf
(
&
buffer
[
len
],
"%2d "
,
phy_vars_eNB
->
eNB_UE_stats
[
UE_id
].
DL_subband_cqi
[
0
][
i
]);
len
+=
sprintf
(
&
buffer
[
len
],
"
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/TOOLS/defs.h
View file @
b5114190
...
...
@@ -156,7 +156,7 @@ This function performs optimized fixed-point radix-2 FFT/IFFT.
);
*/
void
idft1536
(
int16_t
*
sigF
,
int16_t
*
sig
);
void
idft1536
(
int16_t
*
sigF
,
int16_t
*
sig
,
int
scale
);
void
idft6144
(
int16_t
*
sigF
,
int16_t
*
sig
);
...
...
@@ -168,7 +168,7 @@ void idft3072(int16_t *sigF,int16_t *sig);
void
idft24576
(
int16_t
*
sigF
,
int16_t
*
sig
);
void
dft1536
(
int16_t
*
sigF
,
int16_t
*
sig
);
void
dft1536
(
int16_t
*
sigF
,
int16_t
*
sig
,
int
scale
);
void
dft6144
(
int16_t
*
sigF
,
int16_t
*
sig
);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/TOOLS/lte_dfts.c
View file @
b5114190
...
...
@@ -5403,7 +5403,7 @@ void idft8192(int16_t *x,int16_t *y,int scale)
#include "twiddle1536.h"
// 512 x 3
void idft1536(int16_t *input, int16_t *output)
void idft1536(int16_t *input, int16_t *output
, int scale
)
{
int i,i2,j;
uint32_t tmp[3][512 ]__attribute__((aligned(32)));
...
...
@@ -5428,24 +5428,26 @@ void idft1536(int16_t *input, int16_t *output)
}
for (i=0; i<24; i++) {
y128p[0] = mulhi_int16(y128p[0],ONE_OVER_SQRT3_Q15_128);
y128p[1] = mulhi_int16(y128p[1],ONE_OVER_SQRT3_Q15_128);
y128p[2] = mulhi_int16(y128p[2],ONE_OVER_SQRT3_Q15_128);
y128p[3] = mulhi_int16(y128p[3],ONE_OVER_SQRT3_Q15_128);
y128p[4] = mulhi_int16(y128p[4],ONE_OVER_SQRT3_Q15_128);
y128p[5] = mulhi_int16(y128p[5],ONE_OVER_SQRT3_Q15_128);
y128p[6] = mulhi_int16(y128p[6],ONE_OVER_SQRT3_Q15_128);
y128p[7] = mulhi_int16(y128p[7],ONE_OVER_SQRT3_Q15_128);
y128p[8] = mulhi_int16(y128p[8],ONE_OVER_SQRT3_Q15_128);
y128p[9] = mulhi_int16(y128p[9],ONE_OVER_SQRT3_Q15_128);
y128p[10] = mulhi_int16(y128p[10],ONE_OVER_SQRT3_Q15_128);
y128p[11] = mulhi_int16(y128p[11],ONE_OVER_SQRT3_Q15_128);
y128p[12] = mulhi_int16(y128p[12],ONE_OVER_SQRT3_Q15_128);
y128p[13] = mulhi_int16(y128p[13],ONE_OVER_SQRT3_Q15_128);
y128p[14] = mulhi_int16(y128p[14],ONE_OVER_SQRT3_Q15_128);
y128p[15] = mulhi_int16(y128p[15],ONE_OVER_SQRT3_Q15_128);
y128p+=16;
if (scale==1) {
for (i=0; i<24; i++) {
y128p[0] = mulhi_int16(y128p[0],ONE_OVER_SQRT3_Q15_128);
y128p[1] = mulhi_int16(y128p[1],ONE_OVER_SQRT3_Q15_128);
y128p[2] = mulhi_int16(y128p[2],ONE_OVER_SQRT3_Q15_128);
y128p[3] = mulhi_int16(y128p[3],ONE_OVER_SQRT3_Q15_128);
y128p[4] = mulhi_int16(y128p[4],ONE_OVER_SQRT3_Q15_128);
y128p[5] = mulhi_int16(y128p[5],ONE_OVER_SQRT3_Q15_128);
y128p[6] = mulhi_int16(y128p[6],ONE_OVER_SQRT3_Q15_128);
y128p[7] = mulhi_int16(y128p[7],ONE_OVER_SQRT3_Q15_128);
y128p[8] = mulhi_int16(y128p[8],ONE_OVER_SQRT3_Q15_128);
y128p[9] = mulhi_int16(y128p[9],ONE_OVER_SQRT3_Q15_128);
y128p[10] = mulhi_int16(y128p[10],ONE_OVER_SQRT3_Q15_128);
y128p[11] = mulhi_int16(y128p[11],ONE_OVER_SQRT3_Q15_128);
y128p[12] = mulhi_int16(y128p[12],ONE_OVER_SQRT3_Q15_128);
y128p[13] = mulhi_int16(y128p[13],ONE_OVER_SQRT3_Q15_128);
y128p[14] = mulhi_int16(y128p[14],ONE_OVER_SQRT3_Q15_128);
y128p[15] = mulhi_int16(y128p[15],ONE_OVER_SQRT3_Q15_128);
y128p+=16;
}
}
_mm_empty();
...
...
@@ -5453,11 +5455,13 @@ void idft1536(int16_t *input, int16_t *output)
}
void dft1536(int16_t *input, int16_t *output)
void dft1536(int16_t *input, int16_t *output
, int scale
)
{
int i,i2,j;
uint32_t tmp[3][512] __attribute__((aligned(32)));
uint32_t tmpo[3][512] __attribute__((aligned(32)));
simd_q15_t *y128p=(simd_q15_t*)output;
simd_q15_t ONE_OVER_SQRT3_Q15_128 = set1_int16(ONE_OVER_SQRT3_Q15);
for (i=0,j=0; i<512; i++) {
tmp[0][i] = ((uint32_t *)input)[j++];
...
...
@@ -5485,6 +5489,28 @@ void dft1536(int16_t *input, int16_t *output)
(simd_q15_t*)(twa1536+i),(simd_q15_t*)(twb1536+i));
}
if (scale==1) {
for (i=0; i<24; i++) {
y128p[0] = mulhi_int16(y128p[0],ONE_OVER_SQRT3_Q15_128);
y128p[1] = mulhi_int16(y128p[1],ONE_OVER_SQRT3_Q15_128);
y128p[2] = mulhi_int16(y128p[2],ONE_OVER_SQRT3_Q15_128);
y128p[3] = mulhi_int16(y128p[3],ONE_OVER_SQRT3_Q15_128);
y128p[4] = mulhi_int16(y128p[4],ONE_OVER_SQRT3_Q15_128);
y128p[5] = mulhi_int16(y128p[5],ONE_OVER_SQRT3_Q15_128);
y128p[6] = mulhi_int16(y128p[6],ONE_OVER_SQRT3_Q15_128);
y128p[7] = mulhi_int16(y128p[7],ONE_OVER_SQRT3_Q15_128);
y128p[8] = mulhi_int16(y128p[8],ONE_OVER_SQRT3_Q15_128);
y128p[9] = mulhi_int16(y128p[9],ONE_OVER_SQRT3_Q15_128);
y128p[10] = mulhi_int16(y128p[10],ONE_OVER_SQRT3_Q15_128);
y128p[11] = mulhi_int16(y128p[11],ONE_OVER_SQRT3_Q15_128);
y128p[12] = mulhi_int16(y128p[12],ONE_OVER_SQRT3_Q15_128);
y128p[13] = mulhi_int16(y128p[13],ONE_OVER_SQRT3_Q15_128);
y128p[14] = mulhi_int16(y128p[14],ONE_OVER_SQRT3_Q15_128);
y128p[15] = mulhi_int16(y128p[15],ONE_OVER_SQRT3_Q15_128);
y128p+=16;
}
}
_mm_empty();
_m_empty();
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
b5114190
...
...
@@ -99,7 +99,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
UE_list_t
*
UE_list
=&
eNB_mac_inst
[
module_idP
].
UE_list
;
rnti_t
rnti
;
void
*
DLSCH_dci
=
NULL
;
int
size_bits
,
size_bytes
;
int
size_bits
=
0
,
size_bytes
=
0
;
LOG_D
(
MAC
,
"[eNB %d] Frame %d, Subframe %d, entering MAC scheduler (UE_list->head %d)
\n
"
,
module_idP
,
frameP
,
subframeP
,
UE_list
->
head
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
b5114190
...
...
@@ -401,7 +401,7 @@ void rx_sdu(
if
(
UE_id
!=
-
1
)
{
// adjust buffer occupancy of the correponding logical channel group
if
(
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
>=
rx_lengths
[
i
])
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
-
rx_lengths
[
i
];
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
-
=
rx_lengths
[
i
];
else
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
=
0
;
...
...
@@ -451,7 +451,7 @@ void rx_sdu(
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]);
if
(
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
>=
rx_lengths
[
i
])
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
-
rx_lengths
[
i
];
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
-
=
rx_lengths
[
i
];
else
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_buffer_info
[
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
rx_lcids
[
i
]]]
=
0
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
b5114190
...
...
@@ -45,7 +45,7 @@
#include "pdcp_sequence_manager.h"
#include "LAYER2/RLC/rlc.h"
#include "LAYER2/MAC/extern.h"
#include "RRC/L
2_INTERFACE/openair_rrc_L2_interface
.h"
#include "RRC/L
ITE/proto
.h"
#include "pdcp_primitives.h"
#include "OCG.h"
#include "OCG_extern.h"
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/openair2_proc.c
View file @
b5114190
...
...
@@ -201,11 +201,8 @@ int dump_eNB_l2_stats(char *buffer, int length)
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
avg_overhead_bytes
);
<<<<<<<
HEAD
len
+=
sprintf
(
&
buffer
[
len
],
"[MAC] UE %d (ULSCH), Status %d, Failute timer %d, RNTI %x : rx power (normalized %d, target %d), MCS (pre %d, post %d), RB (rx %d, retx %d, total %d), Current TBS %d
\n
"
,
=======
len
+=
sprintf
(
&
buffer
[
len
],
"[MAC] UE %d (ULSCH), Status %s, RNTI %x : rx power (normalized %d, target %d), MCS (pre %d, post %d), RB (rx %d, retx %d, total %d), Current TBS %d
\n
"
,
>>>>>>>
origin
/
develop
len
+=
sprintf
(
&
buffer
[
len
],
"[MAC] UE %d (ULSCH), Status %s, Failute timer %d, RNTI %x : rx power (normalized %d, target %d), MCS (pre %d, post %d), RB (rx %d, retx %d, total %d), Current TBS %d
\n
"
,
UE_id
,
map_int_to_str
(
rrc_status_names
,
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
rrc_status
),
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
,
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/proto.h
View file @
b5114190
...
...
@@ -38,6 +38,8 @@
* @{
*/
#include "RRC/LITE/defs.h"
//main.c
int
rrc_init_global_param
(
void
);
int
L3_xface_init
(
void
);
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/rrc_eNB.c
View file @
b5114190
...
...
@@ -841,7 +841,7 @@ rrc_eNB_free_UE(const module_id_t enb_mod_idP,const struct rrc_eNB_ue_context_s*
rrc_eNB_remove_ue_context
(
&
ctxt
,
&
eNB_rrc_inst
[
enb_mod_idP
],
ue_context_pP
);
(
struct
rrc_eNB_ue_context_s
*
)
ue_context_pP
);
}
}
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-ue.c
View file @
b5114190
...
...
@@ -501,7 +501,7 @@ static void *UE_thread_synch(void *arg)
if
(
abs
(
freq_offset
)
>
7500
)
{
LOG_I
(
PHY
,
"[initial_sync] No cell synchronization found, abandoning
\n
"
);
FILE
*
fd
;
if
(
fd
=
fopen
(
"rxsig_frame0.dat"
,
"w"
)
)
{
if
(
(
fd
=
fopen
(
"rxsig_frame0.dat"
,
"w"
))
!=
NULL
)
{
fwrite
((
void
*
)
&
UE
->
lte_ue_common_vars
.
rxdata
[
0
][
0
],
sizeof
(
int32_t
),
10
*
UE
->
lte_frame_parms
.
samples_per_tti
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment