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
ZhouShuya
OpenXG-RAN
Commits
c9d7455d
Commit
c9d7455d
authored
4 years ago
by
Rangaswami
Committed by
guhan
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed the segemntation fault and added CSI bitlength in uci_pdu
parent
e6d057ec
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+1
-0
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+4
-3
No files found.
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
c9d7455d
...
...
@@ -1642,6 +1642,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
// csi
if
(
pucch_pdu
->
bit_len_csi_part1
>
0
)
{
uci_pdu
->
pduBitmap
|=
4
;
uci_pdu
->
csi_part1
.
csi_part1_bit_len
=
pucch_pdu
->
bit_len_csi_part1
;
int
csi_part1_bytes
=
pucch_pdu
->
bit_len_csi_part1
>>
3
;
if
((
pucch_pdu
->
bit_len_csi_part1
&
7
)
>
0
)
csi_part1_bytes
++
;
uci_pdu
->
csi_part1
.
csi_part1_payload
=
(
uint8_t
*
)
malloc
(
csi_part1_bytes
);
...
...
This diff is collapsed.
Click to expand it.
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
View file @
c9d7455d
...
...
@@ -52,7 +52,7 @@ extern int oai_nfapi_rx_ind(nfapi_rx_indication_t *ind);
extern
uint8_t
nfapi_mode
;
extern
uint16_t
sf_ahead
;
extern
uint16_t
sl_ahead
;
void
tci_handling
(
in
t
Mod_idP
,
int
UE_id
,
int
CC_id
,
NR_UE_sched_ctrl_t
*
sched_ctrl
,
frame_t
frame
,
slot_t
slot
);
void
tci_handling
(
module_id_
t
Mod_idP
,
int
UE_id
,
int
CC_id
,
NR_UE_sched_ctrl_t
*
sched_ctrl
,
frame_t
frame
,
slot_t
slot
);
void
handle_nr_rach
(
NR_UL_IND_t
*
UL_info
)
{
...
...
@@ -129,9 +129,10 @@ void extract_pucch_csi_report ( NR_CSI_MeasConfig_t *csi_MeasConfig,
NR_SubcarrierSpacing_t
scs
,
int
UE_id
,
module_id_t
Mod_idP
)
{
/** From Table 6.3.1.1.2-3: RI, LI, CQI, and CRI of codebookType=typeI-SinglePanel */
uint8_t
idx
=
0
;
uint8_t
payload_size
=
ceil
((
double
)
uci_pdu
->
csi_part1
.
csi_part1_bit_len
/
8
);
uint8_t
payload_size
=
ceil
((
(
double
)
uci_pdu
->
csi_part1
.
csi_part1_bit_len
)
/
8
);
uint8_t
*
payload
=
calloc
(
payload_size
,
sizeof
(
uint8_t
));
NR_CSI_ReportConfig__reportQuantity_PR
reportQuantity_type
=
NR_CSI_ReportConfig__reportQuantity_PR_NOTHING
;
NR_UE_list_t
*
UE_list
=
&
(
RC
.
nrmac
[
Mod_idP
]
->
UE_list
);
...
...
@@ -140,10 +141,10 @@ void extract_pucch_csi_report ( NR_CSI_MeasConfig_t *csi_MeasConfig,
memcpy
(
payload
,
uci_pdu
->
csi_part1
.
csi_part1_payload
,
payload_size
);
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
nb_of_csi_ssb_report
=
0
;
for
(
csi_report_id
=
0
;
csi_report_id
<
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
count
;
csi_report_id
++
)
{
//Assuming in periodic reporting for one slot can be configured with only one CSI-ReportConfig
// if (csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportConfigType.present == NR_CSI_ReportConfig__reportConfigType_PR_periodic) {
//considering 30khz scs and
//Has to implement according to reportSlotConfig type
periodicity
=
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
periodicity
;
LOG_I
(
PHY
,
"SFN/SF:%d%d
\n
"
,
frame
,
slot
);
...
...
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