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
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
常顺宇
OpenXG-RAN
Commits
0109c7b1
Commit
0109c7b1
authored
Oct 23, 2020
by
Hongzhi WANG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove ue warnings
parent
5de83e0b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
16 deletions
+16
-16
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
+1
-1
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+13
-13
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
No files found.
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
View file @
0109c7b1
...
...
@@ -233,7 +233,7 @@ void nr_ue_rsrp_measurements(PHY_VARS_NR_UE *ue,
uint16_t
Nid_cell
=
ue
->
frame_parms
.
Nid_cell
;
uint8_t
eNB_offset
=
0
,
l
,
nushift
;
uint16_t
off
,
nb_rb
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
//
NR_UE_MAC_INST_t *mac = get_mac_inst(0);
int
**
rxdataF
=
ue
->
common_vars
.
common_vars_rx_data_per_thread
[
ue
->
current_thread_id
[
slot
]].
rxdataF
;
nushift
=
ue
->
frame_parms
.
Nid_cell
%
4
;
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
0109c7b1
...
...
@@ -1651,7 +1651,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
uint8_t
dci_cnt
=
0
;
NR_DL_FRAME_PARMS
*
fp
=
&
ue
->
frame_parms
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
//
NR_UE_MAC_INST_t *mac = get_mac_inst(0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX
,
VCD_FUNCTION_IN
);
...
...
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
0109c7b1
...
...
@@ -446,8 +446,8 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
return
(
FALSE
);
}
int
max_code_rate
=
0
;
int
Q_m
=
BITS_PER_SYMBOL_QPSK
;
/* default pucch modulation type is QPSK with 2 bits per symbol */
//
int max_code_rate = 0;
//
int Q_m = BITS_PER_SYMBOL_QPSK; /* default pucch modulation type is QPSK with 2 bits per symbol */
int
N_sc_ctrl_RB
=
0
;
int
O_CRC
=
0
;
...
...
@@ -476,18 +476,18 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
case
pucch_format3_nr
:
{
nb_of_prbs
=
pucch_resource
->
format
.
choice
.
format3
->
nrofPRBs
;
if
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
format3
->
choice
.
setup
->
pi2BPSK
[
0
]
==
1
)
{
Q_m
=
BITS_PER_SYMBOL_BPSK
;
/* set bpsk modulation type with 1 bit per modulation symbol */
}
//
if (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->format3->choice.setup->pi2BPSK[0] == 1) {
//
Q_m = BITS_PER_SYMBOL_BPSK; /* set bpsk modulation type with 1 bit per modulation symbol */
//
}
N_sc_ctrl_RB
=
N_SC_RB
;
nb_symbols
=
nb_symbols_excluding_dmrs
[
nb_symbols_total
-
4
][
index_additional_dmrs
][
index_hopping
];
break
;
}
case
pucch_format4_nr
:
{
if
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
format4
->
choice
.
setup
->
pi2BPSK
[
0
]
==
1
)
{
Q_m
=
BITS_PER_SYMBOL_BPSK
;
/* set bpsk modulation type with 1 bit per modulation symbol */
}
//
if (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->format4->choice.setup->pi2BPSK[0] == 1) {
//
Q_m = BITS_PER_SYMBOL_BPSK; /* set bpsk modulation type with 1 bit per modulation symbol */
//
}
nb_symbols
=
nb_symbols_excluding_dmrs
[
nb_symbols_total
-
4
][
index_additional_dmrs
][
index_hopping
];
nb_of_prbs
=
1
;
subframe_number
=
nr_tti_tx
/
(
ue
->
frame_parms
.
slots_per_subframe
);
//ttis_per_subframe);
...
...
@@ -1104,7 +1104,7 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
int
find_pucch_resource_set
(
NR_UE_MAC_INST_t
*
mac
,
uint8_t
gNB_id
,
int
uci_size
)
{
int
pucch_resource_set_id
=
0
;
long
*
pucch_max_pl_bits
=
NULL
;
//
long *pucch_max_pl_bits = NULL;
/* from TS 38.331 field maxPayloadMinus1
-- Maximum number of payload bits minus 1 that the UE may transmit using this PUCCH resource set. In a PUCCH occurrence, the UE
...
...
@@ -1116,9 +1116,9 @@ int find_pucch_resource_set(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, int uci_size)
/* look for the first resource set which supports uci_size number of bits for payload */
while
(
pucch_resource_set_id
<
MAX_NB_OF_PUCCH_RESOURCE_SETS
)
{
if
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
!=
NULL
)
{
pucch_max_pl_bits
=
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
->
maxPayloadMinus1
;
//
pucch_max_pl_bits = mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->maxPayloadMinus1;
if
(
uci_size
<=
2
)
{
//TBC rrc (((pucch_max_pl_bits != NULL) ? *pucch_max_pl_bits : 1706) + 1)) {
NR_TST_PHY_PRINTF
(
"PUCCH found resource set %d max bits %d
\n
"
,
pucch_resource_set_id
,
pucch_max_pl_bits
);
//
NR_TST_PHY_PRINTF("PUCCH found resource set %d max bits %d\n", pucch_resource_set_id, pucch_max_pl_bits);
pucch_resource_set_id
=
0
;
return
(
pucch_resource_set_id
);
break
;
...
...
@@ -1156,7 +1156,7 @@ boolean_t check_pucch_format(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, pucch_format
{
pucch_format_nr_t
selected_pucch_format
;
pucch_format_nr_t
selected_pucch_format_second
;
NR_SetupRelease_PUCCH_FormatConfig_t
*
identified_format
=
NULL
;
/*
NR_SetupRelease_PUCCH_FormatConfig_t *identified_format = NULL;
switch (format_pucch) {
case pucch_format1_nr:
...
...
@@ -1181,7 +1181,7 @@ boolean_t check_pucch_format(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, pucch_format
default:
break;
}
}
*/
/* if ((identified_format != NULL) && (identified_format->choice.setup->nrofSlots[0] != 1)) {
LOG_E(PHY,"PUCCH not implemented multislots transmission : at line %d in function %s of file %s \n", LINE_FILE , __func__, FILE_NAME);
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
0109c7b1
...
...
@@ -538,7 +538,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
first_symbol_index
=
0
;
}
// 38.213 chapter 13: over two consecutive slots
search_space_duration
=
2
;
//
search_space_duration = 2;
}
/// MUX PATTERN 2
...
...
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