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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
04e6828c
Commit
04e6828c
authored
1 year ago
by
Rúben Soares Silva
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change functions using RX_DATA.indication PDU_Length to expect 32 bits
parent
e1885f65
Branches unavailable
2025.w14
2025.w13
2025.w12
2025.w11
2025.w10
2025.w09
2025.w08
2025.w07
2025.w06
2025.w05
2025.w04
2025.w03
2025.w02
2024.w51
2024.w50
2024.w49
2024.w48
2024.w47
2024.w46
2024.w45
2024.w44
2024.w43
2024.w42
2024.w41
2024.w40
2024.w39
2024.w38
2024.w36
2024.w35
2024.w34
2024.w33
2024.w32
2024.w31
2024.w30
2024.w29
2024.w28
v2.2.0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
25 deletions
+22
-25
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+19
-22
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+1
-1
No files found.
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
04e6828c
...
...
@@ -3177,18 +3177,16 @@ uint8_t pack_nr_slot_indication(void *msg, uint8_t **ppWritePackedMsg, uint8_t *
static
uint8_t
pack_nr_rx_data_indication_body
(
nfapi_nr_rx_data_pdu_t
*
value
,
uint8_t
**
ppWritePackedMsg
,
uint8_t
*
end
)
{
AssertFatal
(
value
->
pdu_length
<=
0xFFFF
,
"RX_DATA.indication PDU_Length should be within 16 bit, according to SCF222.10.02"
);
if
(
!
(
push32
(
value
->
handle
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
rnti
,
ppWritePackedMsg
,
end
)
&&
push8
(
value
->
harq_id
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
pdu_length
,
ppWritePackedMsg
,
end
)
&&
push8
(
value
->
ul_cqi
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
timing_advance
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
rssi
,
ppWritePackedMsg
,
end
)
))
if
(
!
(
push32
(
value
->
handle
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
rnti
,
ppWritePackedMsg
,
end
)
&&
push8
(
value
->
harq_id
,
ppWritePackedMsg
,
end
)
&&
push32
(
value
->
pdu_length
,
ppWritePackedMsg
,
end
)
&&
push8
(
value
->
ul_cqi
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
timing_advance
,
ppWritePackedMsg
,
end
)
&&
push16
(
value
->
rssi
,
ppWritePackedMsg
,
end
)))
return
0
;
if
(
pusharray8
(
value
->
pdu
,
value
->
pdu_length
,
value
->
pdu_length
,
ppWritePackedMsg
,
end
)
==
0
)
if
(
pusharray8
(
value
->
pdu
,
value
->
pdu_length
,
value
->
pdu_length
,
ppWritePackedMsg
,
end
)
==
0
)
return
0
;
return
1
;
...
...
@@ -6066,19 +6064,18 @@ static uint8_t unpack_nr_rx_data_indication_body(nfapi_nr_rx_data_pdu_t *value,
uint8_t
*
end
,
nfapi_p7_codec_config_t
*
config
)
{
if
(
!
(
pull32
(
ppReadPackedMsg
,
&
value
->
handle
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
value
->
rnti
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
value
->
harq_id
,
end
)
&&
pull16
(
ppReadPackedMsg
,
(
uint16_t
*
)
&
value
->
pdu_length
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
value
->
ul_cqi
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
value
->
timing_advance
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
value
->
rssi
,
end
)))
return
0
;
if
(
!
(
pull32
(
ppReadPackedMsg
,
&
value
->
handle
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
value
->
rnti
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
value
->
harq_id
,
end
)
&&
pull32
(
ppReadPackedMsg
,
&
value
->
pdu_length
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
value
->
ul_cqi
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
value
->
timing_advance
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
value
->
rssi
,
end
)))
return
0
;
uint32_t
length
=
value
->
pdu_length
;
value
->
pdu
=
nfapi_p7_allocate
(
sizeof
(
*
value
->
pdu
)
*
length
,
config
);
if
(
pullarray8
(
ppReadPackedMsg
,
value
->
pdu
,
length
,
length
,
end
)
==
0
)
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s pullarray8 failure
\n
"
,
__FUNCTION__
);
return
0
;
}
return
1
;
value
->
pdu
=
nfapi_p7_allocate
(
sizeof
(
*
value
->
pdu
)
*
value
->
pdu_length
,
config
);
if
(
pullarray8
(
ppReadPackedMsg
,
value
->
pdu
,
value
->
pdu_length
,
value
->
pdu_length
,
end
)
==
0
)
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s pullarray8 failure
\n
"
,
__FUNCTION__
);
return
0
;
}
return
1
;
}
static
uint8_t
unpack_nr_rx_data_indication
(
uint8_t
**
ppReadPackedMsg
,
uint8_t
*
end
,
nfapi_nr_rx_data_indication_t
*
msg
,
nfapi_p7_codec_config_t
*
config
)
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
04e6828c
...
...
@@ -644,7 +644,7 @@ static void _nr_rx_sdu(const module_id_t gnb_mod_idP,
const
sub_frame_t
slotP
,
const
rnti_t
rntiP
,
uint8_t
*
sduP
,
const
uint
16
_t
sdu_lenP
,
const
uint
32
_t
sdu_lenP
,
const
uint16_t
timing_advance
,
const
uint8_t
ul_cqi
,
const
uint16_t
rssi
)
...
...
@@ -939,7 +939,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
const
sub_frame_t
slotP
,
const
rnti_t
rntiP
,
uint8_t
*
sduP
,
const
uint
16
_t
sdu_lenP
,
const
uint
32
_t
sdu_lenP
,
const
uint16_t
timing_advance
,
const
uint8_t
ul_cqi
,
const
uint16_t
rssi
)
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
04e6828c
...
...
@@ -343,7 +343,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
const
sub_frame_t
subframeP
,
const
rnti_t
rntiP
,
uint8_t
*
sduP
,
const
uint
16
_t
sdu_lenP
,
const
uint
32
_t
sdu_lenP
,
const
uint16_t
timing_advance
,
const
uint8_t
ul_cqi
,
const
uint16_t
rssi
);
...
...
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