Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
lizhongxiao
OpenXG UE
Commits
0104f0e7
Commit
0104f0e7
authored
Jun 18, 2019
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix C-Plane NG because of the size of MSG4 and cqi struct
parent
dab92e1e
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
49 additions
and
36 deletions
+49
-36
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+13
-1
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+1
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+7
-4
openair1/SIMULATION/LTE_PHY/ulsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+1
-1
openair2/PHY_INTERFACE/IF_Module.c
openair2/PHY_INTERFACE/IF_Module.c
+17
-19
openair2/PHY_INTERFACE/IF_Module.h
openair2/PHY_INTERFACE/IF_Module.h
+1
-1
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+3
-3
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+4
-4
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
0104f0e7
...
@@ -755,7 +755,19 @@ int phy_cqi_indication(struct nfapi_vnf_p7_config *config, nfapi_cqi_indication_
...
@@ -755,7 +755,19 @@ int phy_cqi_indication(struct nfapi_vnf_p7_config *config, nfapi_cqi_indication_
&
ind
->
cqi_indication_body
.
cqi_raw_pdu_list
[
i
],
sizeof
(
nfapi_cqi_indication_raw_pdu_t
));
&
ind
->
cqi_indication_body
.
cqi_raw_pdu_list
[
i
],
sizeof
(
nfapi_cqi_indication_raw_pdu_t
));
}
}
}
else
{
}
else
{
eNB
->
UL_INFO
.
cqi_ind
=
ind
->
cqi_indication_body
;
nfapi_cqi_indication_t
*
dest_ind
=
&
eNB
->
UL_INFO
.
cqi_ind
;
*
dest_ind
=
*
ind
;
dest_ind
->
cqi_indication_body
.
cqi_pdu_list
=
ind
->
cqi_indication_body
.
cqi_pdu_list
;
dest_ind
->
cqi_indication_body
.
cqi_raw_pdu_list
=
ind
->
cqi_indication_body
.
cqi_raw_pdu_list
;
for
(
int
i
=
0
;
i
<
ind
->
cqi_indication_body
.
number_of_cqis
;
i
++
)
{
nfapi_cqi_indication_pdu_t
*
src_pdu
=
&
ind
->
cqi_indication_body
.
cqi_pdu_list
[
i
];
LOG_D
(
MAC
,
"SR_IND[PDU:%d][rnti:%x cqi:%d channel:%d]
\n
"
,
i
,
src_pdu
->
rx_ue_information
.
rnti
,
src_pdu
->
ul_cqi_information
.
ul_cqi
,
src_pdu
->
ul_cqi_information
.
channel
);
memcpy
(
&
dest_ind
->
cqi_indication_body
.
cqi_pdu_list
[
i
],
src_pdu
,
sizeof
(
nfapi_cqi_indication_pdu_t
));
memcpy
(
&
dest_ind
->
cqi_indication_body
.
cqi_raw_pdu_list
[
i
],
&
ind
->
cqi_indication_body
.
cqi_raw_pdu_list
[
i
],
sizeof
(
nfapi_cqi_indication_raw_pdu_t
));
}
}
}
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
return
1
;
return
1
;
...
...
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
0104f0e7
...
@@ -5835,7 +5835,7 @@ static uint8_t unpack_ue_release_resp(uint8_t **ppReadPackedMsg, uint8_t *end, v
...
@@ -5835,7 +5835,7 @@ static uint8_t unpack_ue_release_resp(uint8_t **ppReadPackedMsg, uint8_t *end, v
return
0
;
return
0
;
}
}
else
{
else
{
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"ue_release_response:error_code = %d
\n
"
,
pNfapiMsg
->
error_code
);
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"ue_release_response:error_code = %d
\n
"
,
pNfapiMsg
->
error_code
);
}
}
return
1
;
return
1
;
}
}
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
0104f0e7
...
@@ -1658,8 +1658,9 @@ int getM(PHY_VARS_eNB *eNB,int frame,int subframe) {
...
@@ -1658,8 +1658,9 @@ int getM(PHY_VARS_eNB *eNB,int frame,int subframe) {
void
fill_ulsch_cqi_indication
(
PHY_VARS_eNB
*
eNB
,
uint16_t
frame
,
uint8_t
subframe
,
LTE_UL_eNB_HARQ_t
*
ulsch_harq
,
uint16_t
rnti
)
{
void
fill_ulsch_cqi_indication
(
PHY_VARS_eNB
*
eNB
,
uint16_t
frame
,
uint8_t
subframe
,
LTE_UL_eNB_HARQ_t
*
ulsch_harq
,
uint16_t
rnti
)
{
pthread_mutex_lock
(
&
eNB
->
UL_INFO_mutex
);
pthread_mutex_lock
(
&
eNB
->
UL_INFO_mutex
);
nfapi_cqi_indication_pdu_t
*
pdu
=
&
eNB
->
UL_INFO
.
cqi_ind
.
cqi_pdu_list
[
eNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
];
nfapi_cqi_indication_pdu_t
*
pdu
=
&
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
cqi_pdu_list
[
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
number_of_cqis
];
nfapi_cqi_indication_raw_pdu_t
*
raw_pdu
=
&
eNB
->
UL_INFO
.
cqi_ind
.
cqi_raw_pdu_list
[
eNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
];
nfapi_cqi_indication_raw_pdu_t
*
raw_pdu
=
&
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
cqi_raw_pdu_list
[
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
number_of_cqis
];
pdu
->
instance_length
=
0
;
pdu
->
rx_ue_information
.
tl
.
tag
=
NFAPI_RX_UE_INFORMATION_TAG
;
pdu
->
rx_ue_information
.
tl
.
tag
=
NFAPI_RX_UE_INFORMATION_TAG
;
pdu
->
rx_ue_information
.
rnti
=
rnti
;
pdu
->
rx_ue_information
.
rnti
=
rnti
;
...
@@ -1685,9 +1686,11 @@ void fill_ulsch_cqi_indication (PHY_VARS_eNB *eNB, uint16_t frame, uint8_t subfr
...
@@ -1685,9 +1686,11 @@ void fill_ulsch_cqi_indication (PHY_VARS_eNB *eNB, uint16_t frame, uint8_t subfr
pdu
->
cqi_indication_rel9
.
number_of_cc_reported
=
1
;
pdu
->
cqi_indication_rel9
.
number_of_cc_reported
=
1
;
pdu
->
ul_cqi_information
.
channel
=
1
;
// PUSCH
pdu
->
ul_cqi_information
.
channel
=
1
;
// PUSCH
pdu
->
ul_cqi_information
.
tl
.
tag
=
NFAPI_UL_CQI_INFORMATION_TAG
;
memcpy
((
void
*
)
raw_pdu
->
pdu
,
ulsch_harq
->
o
,
pdu
->
cqi_indication_rel9
.
length
);
memcpy
((
void
*
)
raw_pdu
->
pdu
,
ulsch_harq
->
o
,
pdu
->
cqi_indication_rel9
.
length
);
eNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
++
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
tl
.
tag
=
NFAPI_CQI_INDICATION_BODY_TAG
;
LOG_D
(
PHY
,
"eNB->UL_INFO.cqi_ind.number_of_cqis:%d
\n
"
,
eNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
);
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
number_of_cqis
++
;
LOG_D
(
PHY
,
"eNB->UL_INFO.cqi_ind.cqi_indication_body.number_of_cqis:%d
\n
"
,
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
number_of_cqis
);
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
}
}
...
...
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @
0104f0e7
...
@@ -618,8 +618,8 @@ int main(int argc, char **argv) {
...
@@ -618,8 +618,8 @@ int main(int argc, char **argv) {
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
crc_pdu_list
=
eNB
->
crc_pdu_list
;
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
crc_pdu_list
=
eNB
->
crc_pdu_list
;
eNB
->
UL_INFO
.
sr_ind
.
sr_indication_body
.
sr_pdu_list
=
eNB
->
sr_pdu_list
;
eNB
->
UL_INFO
.
sr_ind
.
sr_indication_body
.
sr_pdu_list
=
eNB
->
sr_pdu_list
;
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
harq_pdu_list
=
eNB
->
harq_pdu_list
;
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
harq_pdu_list
=
eNB
->
harq_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_pdu_list
=
eNB
->
cqi_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_
indication_body
.
cqi_
pdu_list
=
eNB
->
cqi_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_raw_pdu_list
=
eNB
->
cqi_raw_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_
indication_body
.
cqi_
raw_pdu_list
=
eNB
->
cqi_raw_pdu_list
;
printf
(
"lte_param_init done
\n
"
);
printf
(
"lte_param_init done
\n
"
);
// for a call to phy_reset_ue later we need PHY_vars_UE_g allocated and pointing to UE
// for a call to phy_reset_ue later we need PHY_vars_UE_g allocated and pointing to UE
PHY_vars_UE_g
=
(
PHY_VARS_UE
**
*
)
malloc
(
sizeof
(
PHY_VARS_UE
**
));
PHY_vars_UE_g
=
(
PHY_VARS_UE
**
*
)
malloc
(
sizeof
(
PHY_VARS_UE
**
));
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
0104f0e7
...
@@ -1051,7 +1051,7 @@ generate_Msg4(module_id_t module_idP,
...
@@ -1051,7 +1051,7 @@ generate_Msg4(module_id_t module_idP,
mac
->
TX_req
[
CC_idP
].
sfn_sf
=
mac
->
TX_req
[
CC_idP
].
sfn_sf
=
fill_nfapi_tx_req
(
&
mac
->
TX_req
[
CC_idP
].
tx_request_body
,
fill_nfapi_tx_req
(
&
mac
->
TX_req
[
CC_idP
].
tx_request_body
,
(
frameP
*
10
)
+
subframeP
,
(
frameP
*
10
)
+
subframeP
,
rrc_sdu_length
,
rrc_sdu_length
+
offset
,
mac
->
pdu_index
[
CC_idP
],
mac
->
pdu_index
[
CC_idP
],
mac
->
UE_list
.
mac
->
UE_list
.
DLSCH_pdu
[
CC_idP
][
0
][(
unsigned
char
)
UE_id
].
payload
[
0
]);
DLSCH_pdu
[
CC_idP
][
0
][(
unsigned
char
)
UE_id
].
payload
[
0
]);
...
...
openair2/PHY_INTERFACE/IF_Module.c
View file @
0104f0e7
...
@@ -130,14 +130,13 @@ void handle_cqi(UL_IND_t *UL_info) {
...
@@ -130,14 +130,13 @@ void handle_cqi(UL_IND_t *UL_info) {
int
i
;
int
i
;
if
(
NFAPI_MODE
==
NFAPI_MODE_PNF
)
{
if
(
NFAPI_MODE
==
NFAPI_MODE_PNF
)
{
if
(
UL_info
->
cqi_ind
.
number_of_cqis
>
0
)
{
if
(
UL_info
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
>
0
)
{
LOG_D
(
PHY
,
"UL_info->cqi_ind.number_of_cqis:%d
\n
"
,
UL_info
->
cqi_ind
.
number_of_cqis
);
LOG_D
(
PHY
,
"UL_info->cqi_ind.number_of_cqis:%d
\n
"
,
UL_info
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
);
nfapi_cqi_indication_t
ind
;
UL_info
->
cqi_ind
.
header
.
message_id
=
NFAPI_RX_CQI_INDICATION
;
ind
.
header
.
message_id
=
NFAPI_RX_CQI_INDICATION
;
UL_info
->
cqi_ind
.
sfn_sf
=
UL_info
->
frame
<<
4
|
UL_info
->
subframe
;
ind
.
sfn_sf
=
UL_info
->
frame
<<
4
|
UL_info
->
subframe
;
ind
.
cqi_indication_body
=
UL_info
->
cqi_ind
;
oai_nfapi_cqi_indication
(
&
UL_info
->
cqi_ind
);
oai_nfapi_cqi_indication
(
&
ind
);
UL_info
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
=
0
;
UL_info
->
cqi_ind
.
number_of_cqis
=
0
;
}
}
}
else
if
(
NFAPI_MODE
==
NFAPI_MODE_VNF
)
{
}
else
if
(
NFAPI_MODE
==
NFAPI_MODE_VNF
)
{
for
(
uint8_t
j
=
0
;
j
<
NUM_NFPAI_SUBFRAME
;
j
++
){
for
(
uint8_t
j
=
0
;
j
<
NUM_NFPAI_SUBFRAME
;
j
++
){
...
@@ -160,17 +159,17 @@ void handle_cqi(UL_IND_t *UL_info) {
...
@@ -160,17 +159,17 @@ void handle_cqi(UL_IND_t *UL_info) {
}
}
}
}
}
else
{
}
else
{
for
(
i
=
0
;
i
<
UL_info
->
cqi_ind
.
number_of_cqis
;
i
++
)
for
(
i
=
0
;
i
<
UL_info
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
;
i
++
)
cqi_indication
(
UL_info
->
module_id
,
cqi_indication
(
UL_info
->
module_id
,
UL_info
->
CC_id
,
UL_info
->
CC_id
,
UL_info
->
frame
,
NFAPI_SFNSF2SFN
(
UL_info
->
cqi_ind
.
sfn_sf
)
,
UL_info
->
subframe
,
NFAPI_SFNSF2SF
(
UL_info
->
cqi_ind
.
sfn_sf
)
,
UL_info
->
cqi_ind
.
cqi_pdu_list
[
i
].
rx_ue_information
.
rnti
,
UL_info
->
cqi_ind
.
cqi_indication_body
.
cqi_pdu_list
[
i
].
rx_ue_information
.
rnti
,
&
UL_info
->
cqi_ind
.
cqi_pdu_list
[
i
].
cqi_indication_rel9
,
&
UL_info
->
cqi_ind
.
cqi_indication_body
.
cqi_pdu_list
[
i
].
cqi_indication_rel9
,
UL_info
->
cqi_ind
.
cqi_raw_pdu_list
[
i
].
pdu
,
UL_info
->
cqi_ind
.
cqi_indication_body
.
cqi_raw_pdu_list
[
i
].
pdu
,
&
UL_info
->
cqi_ind
.
cqi_pdu_list
[
i
].
ul_cqi_information
);
&
UL_info
->
cqi_ind
.
cqi_indication_body
.
cqi_pdu_list
[
i
].
ul_cqi_information
);
UL_info
->
cqi_ind
.
number_of_cqis
=
0
;
UL_info
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
=
0
;
}
}
}
}
...
@@ -704,8 +703,7 @@ void UL_indication(UL_IND_t *UL_info) {
...
@@ -704,8 +703,7 @@ void UL_indication(UL_IND_t *UL_info) {
LOG_D
(
PHY
,
"SFN/SF:%d%d module_id:%d CC_id:%d UL_info[rx_ind:%d harqs:%d crcs:%d cqis:%d preambles:%d sr_ind:%d]
\n
"
,
LOG_D
(
PHY
,
"SFN/SF:%d%d module_id:%d CC_id:%d UL_info[rx_ind:%d harqs:%d crcs:%d cqis:%d preambles:%d sr_ind:%d]
\n
"
,
UL_info
->
frame
,
UL_info
->
subframe
,
UL_info
->
frame
,
UL_info
->
subframe
,
module_id
,
CC_id
,
module_id
,
CC_id
,
UL_info
->
rx_ind
.
rx_indication_body
.
number_of_pdus
,
UL_info
->
harq_ind
.
harq_indication_body
.
number_of_harqs
,
UL_info
->
crc_ind
.
crc_indication_body
.
number_of_crcs
,
UL_info
->
cqi_ind
.
number_of_cqis
,
UL_info
->
rx_ind
.
rx_indication_body
.
number_of_pdus
,
UL_info
->
harq_ind
.
harq_indication_body
.
number_of_harqs
,
UL_info
->
crc_ind
.
crc_indication_body
.
number_of_crcs
,
UL_info
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
,
UL_info
->
rach_ind
.
rach_indication_body
.
number_of_preambles
,
UL_info
->
sr_ind
.
sr_indication_body
.
number_of_srs
);
UL_info
->
rach_ind
.
rach_indication_body
.
number_of_preambles
,
UL_info
->
sr_ind
.
sr_indication_body
.
number_of_srs
);
if
(
UL_info
->
frame
==
1023
&&
UL_info
->
subframe
==
6
)
{
// dl scheduling (0,0)
if
(
UL_info
->
frame
==
1023
&&
UL_info
->
subframe
==
6
)
{
// dl scheduling (0,0)
frame_cnt
=
(
frame_cnt
+
1
)
%
7
;
// to prevent frame_cnt get too big
frame_cnt
=
(
frame_cnt
+
1
)
%
7
;
// to prevent frame_cnt get too big
...
...
openair2/PHY_INTERFACE/IF_Module.h
View file @
0104f0e7
...
@@ -71,7 +71,7 @@ typedef struct{
...
@@ -71,7 +71,7 @@ typedef struct{
nfapi_sr_indication_t
sr_ind
;
nfapi_sr_indication_t
sr_ind
;
/// CQI indication list
/// CQI indication list
nfapi_cqi_indication_
body_
t
cqi_ind
;
nfapi_cqi_indication_t
cqi_ind
;
/// RACH indication list
/// RACH indication list
nfapi_rach_indication_t
rach_ind
;
nfapi_rach_indication_t
rach_ind
;
...
...
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
0104f0e7
...
@@ -236,8 +236,8 @@ void fill_ulsch_cqi_indication_UE_MAC(int Mod_id, uint16_t frame,uint8_t subfram
...
@@ -236,8 +236,8 @@ void fill_ulsch_cqi_indication_UE_MAC(int Mod_id, uint16_t frame,uint8_t subfram
// change for mutiple UE's simulation.
// change for mutiple UE's simulation.
//pthread_mutex_lock(&UE_mac_inst[Mod_id].UL_INFO_mutex);
//pthread_mutex_lock(&UE_mac_inst[Mod_id].UL_INFO_mutex);
pthread_mutex_lock
(
&
fill_ul_mutex
.
cqi_mutex
);
pthread_mutex_lock
(
&
fill_ul_mutex
.
cqi_mutex
);
nfapi_cqi_indication_pdu_t
*
pdu
=
&
UL_INFO
->
cqi_ind
.
cqi_
pdu_list
[
UL_INFO
->
cqi_ind
.
number_of_cqis
];
nfapi_cqi_indication_pdu_t
*
pdu
=
&
UL_INFO
->
cqi_ind
.
cqi_
indication_body
.
cqi_pdu_list
[
UL_INFO
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
];
nfapi_cqi_indication_raw_pdu_t
*
raw_pdu
=
&
UL_INFO
->
cqi_ind
.
cqi_
raw_pdu_list
[
UL_INFO
->
cqi_ind
.
number_of_cqis
];
nfapi_cqi_indication_raw_pdu_t
*
raw_pdu
=
&
UL_INFO
->
cqi_ind
.
cqi_
indication_body
.
cqi_raw_pdu_list
[
UL_INFO
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
];
pdu
->
rx_ue_information
.
tl
.
tag
=
NFAPI_RX_UE_INFORMATION_TAG
;
pdu
->
rx_ue_information
.
tl
.
tag
=
NFAPI_RX_UE_INFORMATION_TAG
;
pdu
->
rx_ue_information
.
rnti
=
rnti
;
pdu
->
rx_ue_information
.
rnti
=
rnti
;
...
@@ -263,7 +263,7 @@ void fill_ulsch_cqi_indication_UE_MAC(int Mod_id, uint16_t frame,uint8_t subfram
...
@@ -263,7 +263,7 @@ void fill_ulsch_cqi_indication_UE_MAC(int Mod_id, uint16_t frame,uint8_t subfram
UL_INFO
->
cqi_ind
.
number_of_cqis
++
;
UL_INFO
->
cqi_ind
.
cqi_indication_body
.
number_of_cqis
++
;
// change for mutiple UE's simulation.
// change for mutiple UE's simulation.
//pthread_mutex_unlock(&UE_mac_inst[Mod_id].UL_INFO_mutex);
//pthread_mutex_unlock(&UE_mac_inst[Mod_id].UL_INFO_mutex);
pthread_mutex_unlock
(
&
fill_ul_mutex
.
cqi_mutex
);
pthread_mutex_unlock
(
&
fill_ul_mutex
.
cqi_mutex
);
...
...
targets/RT/USER/lte-enb.c
View file @
0104f0e7
...
@@ -175,14 +175,14 @@ static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name
...
@@ -175,14 +175,14 @@ static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
number_of_harqs
||
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
number_of_harqs
||
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
||
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
||
eNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
||
eNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
||
eNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
number_of_cqis
)
{
)
{
LOG_D
(
PHY
,
"UL_info[rx_ind:%05d:%d harqs:%05d:%d crcs:%05d:%d preambles:%05d:%d cqis:%d] RX:%04d%d TX:%04d%d num_pdcch_symbols:%d
\n
"
,
LOG_D
(
PHY
,
"UL_info[rx_ind:%05d:%d harqs:%05d:%d crcs:%05d:%d preambles:%05d:%d cqis:%d] RX:%04d%d TX:%04d%d num_pdcch_symbols:%d
\n
"
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
rx_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
rx_ind
.
rx_indication_body
.
number_of_pdus
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
rx_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
rx_ind
.
rx_indication_body
.
number_of_pdus
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
harq_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
number_of_harqs
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
harq_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
number_of_harqs
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
crc_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
crc_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
rach_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
,
NFAPI_SFNSF2DEC
(
eNB
->
UL_INFO
.
rach_ind
.
sfn_sf
),
eNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
,
eNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
,
eNB
->
UL_INFO
.
cqi_ind
.
cqi_indication_body
.
number_of_cqis
,
proc
->
frame_rx
,
proc
->
subframe_rx
,
proc
->
frame_rx
,
proc
->
subframe_rx
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
eNB
->
pdcch_vars
[
proc
->
subframe_tx
&
1
].
num_pdcch_symbols
);
proc
->
frame_tx
,
proc
->
subframe_tx
,
eNB
->
pdcch_vars
[
proc
->
subframe_tx
&
1
].
num_pdcch_symbols
);
}
}
...
@@ -1270,8 +1270,8 @@ void init_eNB(int single_thread_flag,int wait_for_sync) {
...
@@ -1270,8 +1270,8 @@ void init_eNB(int single_thread_flag,int wait_for_sync) {
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
crc_pdu_list
=
eNB
->
crc_pdu_list
;
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
crc_pdu_list
=
eNB
->
crc_pdu_list
;
eNB
->
UL_INFO
.
sr_ind
.
sr_indication_body
.
sr_pdu_list
=
eNB
->
sr_pdu_list
;
eNB
->
UL_INFO
.
sr_ind
.
sr_indication_body
.
sr_pdu_list
=
eNB
->
sr_pdu_list
;
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
harq_pdu_list
=
eNB
->
harq_pdu_list
;
eNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
harq_pdu_list
=
eNB
->
harq_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_pdu_list
=
eNB
->
cqi_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_
indication_body
.
cqi_
pdu_list
=
eNB
->
cqi_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_raw_pdu_list
=
eNB
->
cqi_raw_pdu_list
;
eNB
->
UL_INFO
.
cqi_ind
.
cqi_
indication_body
.
cqi_
raw_pdu_list
=
eNB
->
cqi_raw_pdu_list
;
eNB
->
prach_energy_counter
=
0
;
eNB
->
prach_energy_counter
=
0
;
}
}
}
}
...
...
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