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
lizhongxiao
OpenXG-RAN
Commits
70028ba4
Commit
70028ba4
authored
Jan 11, 2021
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed inconsistencies in the type of dci_format @ NR UE
parent
7946a0bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+1
-1
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+8
-8
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+4
-4
No files found.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
70028ba4
...
...
@@ -324,7 +324,7 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
@param NR_UE_MAC_INST_t mac: pointer to local MAC instance
@returns void
*/
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint16_t
*
bwp_ind
,
in
t
*
dci_format
){
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint16_t
*
bwp_ind
,
uint8_
t
*
dci_format
){
NR_ServingCellConfig_t
*
scd
=
mac
->
scg
->
spCellConfig
->
spCellConfigDedicated
;
...
...
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
70028ba4
...
...
@@ -119,7 +119,7 @@ uint32_t ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
int8_t
nr_ue_get_SR
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
,
uint16_t
rnti
,
sub_frame_t
subframe
);
int8_t
nr_ue_process_dci
(
module_id_t
module_id
,
int
cc_id
,
uint8_t
gNB_index
,
frame_t
frame
,
int
slot
,
dci_pdu_rel15_t
*
dci
,
uint16_t
rnti
,
uint
32
_t
dci_format
);
int8_t
nr_ue_process_dci
(
module_id_t
module_id
,
int
cc_id
,
uint8_t
gNB_index
,
frame_t
frame
,
int
slot
,
dci_pdu_rel15_t
*
dci
,
uint16_t
rnti
,
uint
8
_t
dci_format
);
int
nr_ue_process_dci_indication_pdu
(
module_id_t
module_id
,
int
cc_id
,
int
gNB_index
,
frame_t
frame
,
int
slot
,
fapi_nr_dci_indication_pdu_t
*
dci
);
uint32_t
get_ssb_frame
(
uint32_t
test
);
...
...
@@ -157,12 +157,12 @@ uint16_t nr_generate_ulsch_pdu(uint8_t *sdus_payload,
void
ue_dci_configuration
(
NR_UE_MAC_INST_t
*
mac
,
fapi_nr_dl_config_request_t
*
dl_config
,
frame_t
frame
,
int
slot
);
in
t
nr_extract_dci_info
(
NR_UE_MAC_INST_t
*
mac
,
in
t
dci_format
,
uint8_t
dci_length
,
uint16_t
rnti
,
uint64_t
*
dci_pdu
,
dci_pdu_rel15_t
*
nr_pdci_info_extracted
);
uint8_
t
nr_extract_dci_info
(
NR_UE_MAC_INST_t
*
mac
,
uint8_
t
dci_format
,
uint8_t
dci_length
,
uint16_t
rnti
,
uint64_t
*
dci_pdu
,
dci_pdu_rel15_t
*
nr_pdci_info_extracted
);
uint8_t
...
...
@@ -287,7 +287,7 @@ void get_num_re_dmrs(nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
void
build_ssb_to_ro_map
(
NR_ServingCellConfigCommon_t
*
scc
,
uint8_t
unpaired
);
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint16_t
*
bwp_ind
,
in
t
*
dci_format
);
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint16_t
*
bwp_ind
,
uint8_
t
*
dci_format
);
#endif
/** @}*/
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
70028ba4
...
...
@@ -1941,11 +1941,11 @@ int nr_ue_process_dci_indication_pdu(module_id_t module_id,int cc_id, int gNB_in
LOG_D(MAC,"Received dci indication (rnti %x,dci format %d,n_CCE %d,payloadSize %d,payload %llx)\n",
dci->rnti,dci->dci_format,dci->n_CCE,dci->payloadSize,*(unsigned long long*)dci->payloadBits);
int
dci_format
=
nr_extract_dci_info
(
mac
,
dci
->
dci_format
,
dci
->
payloadSize
,
dci
->
rnti
,(
uint64_t
*
)
dci
->
payloadBits
,
def_dci_pdu_rel15
);
uint32_t dci_format = nr_extract_dci_info(mac, dci->dci_format, dci->payloadSize, dci->rnti, (uint64_t *)dci->payloadBits,
def_dci_pdu_rel15);
return (nr_ue_process_dci(module_id, cc_id, gNB_index, frame, slot, def_dci_pdu_rel15, dci->rnti, dci_format));
}
int8_t
nr_ue_process_dci
(
module_id_t
module_id
,
int
cc_id
,
uint8_t
gNB_index
,
frame_t
frame
,
int
slot
,
dci_pdu_rel15_t
*
dci
,
uint16_t
rnti
,
uint
32
_t
dci_format
){
int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, frame_t frame, int slot, dci_pdu_rel15_t *dci, uint16_t rnti, uint
8
_t dci_format){
int mu = 0;
long k2 = 0;
...
...
@@ -2952,8 +2952,8 @@ int get_n_rb(NR_UE_MAC_INST_t *mac, int rnti_type){
}
in
t
nr_extract_dci_info
(
NR_UE_MAC_INST_t
*
mac
,
in
t
dci_format
,
uint8_
t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
uint8_
t dci_format,
uint8_t dci_size,
uint16_t rnti,
uint64_t *dci_pdu,
...
...
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