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
67b4cf30
Commit
67b4cf30
authored
1 year ago
by
hsum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add check receives scheduling request and Remove print log.
parent
e604c3f3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+2
-2
nfapi/open-nFAPI/pnf/src/pnf_p7.c
nfapi/open-nFAPI/pnf/src/pnf_p7.c
+1
-1
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+1
-1
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_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+2
-2
No files found.
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
67b4cf30
...
@@ -961,7 +961,7 @@ static uint8_t pack_ul_tti_request_prach_pdu(nfapi_nr_prach_pdu_t *prach_pdu, ui
...
@@ -961,7 +961,7 @@ static uint8_t pack_ul_tti_request_prach_pdu(nfapi_nr_prach_pdu_t *prach_pdu, ui
static
uint8_t
pack_ul_tti_request_pucch_pdu
(
nfapi_nr_pucch_pdu_t
*
pucch_pdu
,
uint8_t
**
ppWritePackedMsg
,
uint8_t
*
end
)
static
uint8_t
pack_ul_tti_request_pucch_pdu
(
nfapi_nr_pucch_pdu_t
*
pucch_pdu
,
uint8_t
**
ppWritePackedMsg
,
uint8_t
*
end
)
{
{
LOG_I
(
PHY
,
"pucch_pdu->sr_flag: %d
\n
"
,
pucch_pdu
->
sr_flag
);
//
LOG_I(PHY,"pucch_pdu->sr_flag: %d\n",pucch_pdu->sr_flag);
if
(
!
(
push16
(
pucch_pdu
->
rnti
,
ppWritePackedMsg
,
end
)
if
(
!
(
push16
(
pucch_pdu
->
rnti
,
ppWritePackedMsg
,
end
)
&&
push32
(
pucch_pdu
->
handle
,
ppWritePackedMsg
,
end
)
&&
push32
(
pucch_pdu
->
handle
,
ppWritePackedMsg
,
end
)
&&
push16
(
pucch_pdu
->
bwp_size
,
ppWritePackedMsg
,
end
)
&&
push16
(
pucch_pdu
->
bwp_size
,
ppWritePackedMsg
,
end
)
...
@@ -1665,7 +1665,7 @@ static uint8_t pack_ul_config_request_body_value(void *tlv, uint8_t **ppWritePac
...
@@ -1665,7 +1665,7 @@ static uint8_t pack_ul_config_request_body_value(void *tlv, uint8_t **ppWritePac
static
uint8_t
pack_ul_tti_request
(
void
*
msg
,
uint8_t
**
ppWritePackedMsg
,
uint8_t
*
end
,
nfapi_p7_codec_config_t
*
config
)
static
uint8_t
pack_ul_tti_request
(
void
*
msg
,
uint8_t
**
ppWritePackedMsg
,
uint8_t
*
end
,
nfapi_p7_codec_config_t
*
config
)
{
{
nfapi_nr_ul_tti_request_t
*
pNfapiMsg
=
(
nfapi_nr_ul_tti_request_t
*
)
msg
;
nfapi_nr_ul_tti_request_t
*
pNfapiMsg
=
(
nfapi_nr_ul_tti_request_t
*
)
msg
;
LOG_I
(
PHY
,
"pack_ul_tti_request SFN/Slot:%d.%d
\n
"
,
pNfapiMsg
->
SFN
,
pNfapiMsg
->
Slot
);
//
LOG_I(PHY,"pack_ul_tti_request SFN/Slot:%d.%d\n",pNfapiMsg->SFN,pNfapiMsg->Slot);
pNfapiMsg
->
n_ulcch
=
0
;
pNfapiMsg
->
n_ulcch
=
0
;
pNfapiMsg
->
n_ulsch
=
0
;
pNfapiMsg
->
n_ulsch
=
0
;
for
(
int
i
=
0
;
i
<
pNfapiMsg
->
n_pdus
;
i
++
)
{
for
(
int
i
=
0
;
i
<
pNfapiMsg
->
n_pdus
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @
67b4cf30
...
@@ -925,7 +925,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
...
@@ -925,7 +925,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
{
{
DevAssert
(
pnf_p7
->
_public
.
tx_data_req_fn
!=
NULL
);
DevAssert
(
pnf_p7
->
_public
.
tx_data_req_fn
!=
NULL
);
LOG_
I
(
PHY
,
"Process tx_data SFN/slot %d.%d buffer index: %d
\n
"
,
sfn_tx
,
slot_tx
,
buffer_index_tx
);
LOG_
D
(
PHY
,
"Process tx_data SFN/slot %d.%d buffer index: %d
\n
"
,
sfn_tx
,
slot_tx
,
buffer_index_tx
);
// pnf_phy_tx_data_req()
// pnf_phy_tx_data_req()
(
pnf_p7
->
_public
.
tx_data_req_fn
)(
&
(
pnf_p7
->
_public
),
&
tx_slot_buffer
->
tx_data_req
);
(
pnf_p7
->
_public
.
tx_data_req_fn
)(
&
(
pnf_p7
->
_public
),
&
tx_slot_buffer
->
tx_data_req
);
//tx_slot_buffer->tx_data_req.SFN = -1; // to make sure it might not get
//tx_slot_buffer->tx_data_req.SFN = -1; // to make sure it might not get
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
67b4cf30
...
@@ -383,7 +383,7 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
...
@@ -383,7 +383,7 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
uci_pdu
->
timing_advance
=
0xffff
;
// currently not valid
uci_pdu
->
timing_advance
=
0xffff
;
// currently not valid
uci_pdu
->
rssi
=
1280
-
(
10
*
dB_fixed
(
32767
*
32767
))
-
dB_fixed_times10
(
signal_energy_ant0
);
uci_pdu
->
rssi
=
1280
-
(
10
*
dB_fixed
(
32767
*
32767
))
-
dB_fixed_times10
(
signal_energy_ant0
);
LOG_I
(
PHY
,
"(%d/%d) uci_pdu->pduBitmap:%d
\n
"
,
frame
,
slot
,
uci_pdu
->
pduBitmap
);
//
LOG_I(PHY,"(%d/%d) uci_pdu->pduBitmap:%d\n",frame,slot,uci_pdu->pduBitmap);
if
(
pucch_pdu
->
bit_len_harq
==
0
)
{
if
(
pucch_pdu
->
bit_len_harq
==
0
)
{
uci_pdu
->
sr
.
sr_confidence_level
=
SNRtimes10
<
uci_stats
->
pucch0_thres
;
uci_pdu
->
sr
.
sr_confidence_level
=
SNRtimes10
<
uci_stats
->
pucch0_thres
;
uci_stats
->
pucch0_sr_trials
++
;
uci_stats
->
pucch0_sr_trials
++
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
67b4cf30
...
@@ -1386,7 +1386,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -1386,7 +1386,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
TX_req
->
Number_of_PDUs
++
;
TX_req
->
Number_of_PDUs
++
;
TX_req
->
SFN
=
frame
;
TX_req
->
SFN
=
frame
;
TX_req
->
Slot
=
slot
;
TX_req
->
Slot
=
slot
;
LOG_I
(
NFAPI_VNF
,
"[t1] scheduler_dlsch fill TX_D , %d/%d
\n
"
,
frame
,
slot
);
//
LOG_I(NFAPI_VNF,"[t1] scheduler_dlsch fill TX_D , %d/%d \n",frame,slot);
/* mark UE as scheduled */
/* mark UE as scheduled */
sched_pdsch
->
rbSize
=
0
;
sched_pdsch
->
rbSize
=
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
67b4cf30
...
@@ -1020,7 +1020,7 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
...
@@ -1020,7 +1020,7 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
return
;
return
;
}
}
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE
->
UE_sched_ctrl
;
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE
->
UE_sched_ctrl
;
LOG_I
(
NR_MAC
,
"(%d/%d)uci_01->pduBitmap:%d
\n
"
,
frame
,
slot
,
uci_01
->
pduBitmap
);
//
LOG_I(NR_MAC,"(%d/%d)uci_01->pduBitmap:%d\n",frame,slot,uci_01->pduBitmap);
if
(((
uci_01
->
pduBitmap
>>
1
)
&
0x01
))
{
if
(((
uci_01
->
pduBitmap
>>
1
)
&
0x01
))
{
// iterate over received harq bits
// iterate over received harq bits
...
@@ -1055,7 +1055,7 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
...
@@ -1055,7 +1055,7 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
if
(
uci_01
->
sr
.
sr_indication
&&
uci_01
->
sr
.
sr_confidence_level
==
0
&&
uci_01
->
ul_cqi
>=
148
)
{
if
(
uci_01
->
sr
.
sr_indication
&&
uci_01
->
sr
.
sr_confidence_level
==
0
&&
uci_01
->
ul_cqi
>=
148
)
{
// SR detected with SNR >= 10dB
// SR detected with SNR >= 10dB
sched_ctrl
->
SR
|=
true
;
sched_ctrl
->
SR
|=
true
;
LOG_
D
(
NR_MAC
,
"SR UE %04x ul_cqi %d
\n
"
,
uci_01
->
rnti
,
uci_01
->
ul_cqi
);
LOG_
I
(
NR_MAC
,
"SR UE %04x ul_cqi %d
\n
"
,
uci_01
->
rnti
,
uci_01
->
ul_cqi
);
}
}
}
}
...
...
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