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
ff66d896
Commit
ff66d896
authored
Jan 21, 2021
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix in UCI statistics
parent
602f1b90
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
6 deletions
+15
-6
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-0
executables/nr-softmodem.c
executables/nr-softmodem.c
+5
-0
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/pucch.c
+3
-2
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-1
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR/rrc_gNB_NGAP.c
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
ff66d896
...
...
@@ -3066,6 +3066,8 @@ add_executable(nr-softmodem
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR_DIR
}
/common/utils/utils.c
${
OPENAIR_DIR
}
/common/utils/system.c
${
OPENAIR_DIR
}
/common/utils/lte/ue_power.c
${
OPENAIR_DIR
}
/common/utils/lte/prach_utils.c
${
OPENAIR_DIR
}
/common/utils/nr/nr_common.c
${
GTPU_need_ITTI
}
${
XFORMSINTERFACE_SOURCE
}
...
...
executables/nr-softmodem.c
View file @
ff66d896
...
...
@@ -167,10 +167,15 @@ uint32_t target_ul_mcs = 20;
uint32_t
timing_advance
=
0
;
uint64_t
num_missed_slots
=
0
;
// counter for the number of missed slots
#include <executables/split_headers.h>
int
split73
=
0
;
void
sendFs6Ul
(
PHY_VARS_eNB
*
eNB
,
int
UE_id
,
int
harq_pid
,
int
segmentID
,
int16_t
*
data
,
int
dataLen
,
int
r_offset
)
{
AssertFatal
(
false
,
"Must not be called in this context
\n
"
);
}
void
sendFs6Ulharq
(
enum
pckType
type
,
int
UEid
,
PHY_VARS_eNB
*
eNB
,
LTE_eNB_UCI
*
uci
,
int
frame
,
int
subframe
,
uint8_t
*
harq_ack
,
uint8_t
tdd_mapping_mode
,
uint16_t
tdd_multiplexing_mask
,
uint16_t
rnti
,
int32_t
stat
)
{
AssertFatal
(
false
,
"Must not be called in this context
\n
"
);
}
extern
void
reset_opp_meas
(
void
);
extern
void
print_opp_meas
(
void
);
...
...
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
ff66d896
...
...
@@ -843,11 +843,12 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
if
(
fmt
!=
pucch_format3
)
{
/* PUCCH format3 */
eNB_UCI_STATS_t
*
first_uci_stats
=
NULL
;
LOG_I
(
PHY
,
"Getting UCI stats, UCI_id %d
\n
"
,
UCI_id
);
for
(
int
i
=
0
;
i
<
NUMBER_OF_SCH_STATS_MAX
;
i
++
)
if
(
eNB
->
uci_stats
[
i
].
rnti
==
eNB
->
u
lsch
[
UCI_id
]
->
rnti
)
{
if
(
eNB
->
uci_stats
[
i
].
rnti
==
eNB
->
u
ci_vars
[
UCI_id
].
rnti
)
{
uci_stats
=
&
eNB
->
uci_stats
[
i
];
break
;
}
else
if
(
eNB
->
uci_stats
[
i
].
rnti
==
0
)
first_uci_stats
=
&
eNB
->
uci_stats
[
i
];
}
else
if
(
first_uci_stats
==
NULL
&&
eNB
->
uci_stats
[
i
].
rnti
==
0
)
first_uci_stats
=
&
eNB
->
uci_stats
[
i
];
if
(
uci_stats
==
NULL
)
{
uci_stats
=
first_uci_stats
;
uci_stats
->
rnti
=
eNB
->
ulsch
[
UCI_id
]
->
rnti
;}
...
...
openair2/GNB_APP/gnb_config.c
View file @
ff66d896
...
...
@@ -35,6 +35,7 @@
#include "assertions.h"
#include "gnb_config.h"
#include "gnb_paramdef.h"
#include "enb_paramdef.h"
#include "UTIL/OTG/otg.h"
#include "UTIL/OTG/otg_externs.h"
#include "intertask_interface.h"
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
ff66d896
...
...
@@ -647,7 +647,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
retInfo
->
numDmrsCdmGrpsNoData
);
/* we do not have to do anything, since we do not require to get data
* from RLC, encode MAC CEs, or copy data to FAPI structures */
LOG_
W
(
MAC
,
LOG_
D
(
MAC
,
"%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d
\n
"
,
frame
,
slot
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
ff66d896
...
...
@@ -627,7 +627,7 @@ void nr_schedule_ulsch(module_id_t module_id,
if
(
cur_harq
->
round
==
0
)
{
UE_info
->
mac_stats
[
UE_id
].
ulsch_total_bytes_scheduled
+=
sched_pusch
->
tb_size
;
}
else
{
LOG_
W
(
MAC
,
LOG_
D
(
MAC
,
"%d.%2d UL retransmission RNTI %04x sched %d.%2d HARQ PID %d round %d NDI %d
\n
"
,
frame
,
slot
,
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
ff66d896
...
...
@@ -472,7 +472,7 @@ rrc_gNB_process_RRCSetupComplete(
LOG_I
(
NR_RRC
,
PROTOCOL_NR_RRC_CTXT_UE_FMT
" [RAPROC] Logical Channel UL-DCCH, "
"processing NR_RRCSetupComplete from UE (SRB1 Active)
\n
"
,
PROTOCOL_NR_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
ue_context_pP
->
ue_context
.
Srb1
.
Active
=
1
;
ue_context_pP
->
ue_context
.
S
tatus
=
NR_RRC_CONNECTED
;
ue_context_pP
->
ue_context
.
s
tatus
=
NR_RRC_CONNECTED
;
if
(
AMF_MODE_ENABLED
)
{
rrc_gNB_send_NGAP_NAS_FIRST_REQ
(
ctxt_pP
,
ue_context_pP
,
rrcSetupComplete
);
...
...
openair2/RRC/NR/rrc_gNB_NGAP.c
View file @
ff66d896
...
...
@@ -372,7 +372,7 @@ rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
}
// in case, send the S1SP initial context response if it is not sent with the attach complete message
if
(
ue_context_p
->
ue_context
.
S
tatus
==
NR_RRC_RECONFIGURED
)
{
if
(
ue_context_p
->
ue_context
.
s
tatus
==
NR_RRC_RECONFIGURED
)
{
LOG_I
(
NR_RRC
,
"Sending rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP, cause %ld
\n
"
,
ue_context_p
->
ue_context
.
reestablishment_cause
);
rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP
(
&
ctxt
,
ue_context_p
);
}
...
...
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