Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
e2f91088
Commit
e2f91088
authored
Jul 24, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compiling version
parent
45d53425
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
24 deletions
+24
-24
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+1
-1
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+12
-12
openair1/PHY/NR_TRANSPORT/nr_dci.h
openair1/PHY/NR_TRANSPORT/nr_dci.h
+2
-2
openair1/PHY/defs_gNB.h
openair1/PHY/defs_gNB.h
+5
-1
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/fapi_nr_l1.c
+2
-2
targets/RT/USER/nr-gnb.c
targets/RT/USER/nr-gnb.c
+2
-6
No files found.
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
View file @
e2f91088
...
@@ -238,7 +238,7 @@ typedef enum {
...
@@ -238,7 +238,7 @@ typedef enum {
NFAPI_NR_DL_DCI_FORMAT_2_2
,
NFAPI_NR_DL_DCI_FORMAT_2_2
,
NFAPI_NR_DL_DCI_FORMAT_2_3
,
NFAPI_NR_DL_DCI_FORMAT_2_3
,
NFAPI_NR_UL_DCI_FORMAT_0_0
,
NFAPI_NR_UL_DCI_FORMAT_0_0
,
NFAPI_NR_UL_DCI_FORMAT_
1_0
NFAPI_NR_UL_DCI_FORMAT_
0_1
}
nfapi_nr_dci_format_e
;
}
nfapi_nr_dci_format_e
;
typedef
enum
{
typedef
enum
{
...
...
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
e2f91088
...
@@ -37,8 +37,8 @@
...
@@ -37,8 +37,8 @@
extern
short
nr_mod_table
[
NR_MOD_TABLE_SIZE_SHORT
];
extern
short
nr_mod_table
[
NR_MOD_TABLE_SIZE_SHORT
];
uint8_t
nr_get_dci_size
(
nr_dci_format_e
format
,
uint8_t
nr_get_dci_size
(
n
fapi_n
r_dci_format_e
format
,
nr_rnti_type_e
rnti_type
,
n
fapi_n
r_rnti_type_e
rnti_type
,
NR_BWP_PARMS
*
bwp
,
NR_BWP_PARMS
*
bwp
,
nfapi_nr_config_request_t
*
config
)
nfapi_nr_config_request_t
*
config
)
{
{
...
@@ -47,7 +47,7 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
...
@@ -47,7 +47,7 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
switch
(
format
)
{
switch
(
format
)
{
/*Only sizes for 0_0 and 1_0 are correct at the moment*/
/*Only sizes for 0_0 and 1_0 are correct at the moment*/
case
nr_dci_format
_0_0
:
case
NFAPI_NR_UL_DCI_FORMAT
_0_0
:
/// fixed: Format identifier 1, Hop flag 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2 Time Domain assgnmt 4 --20
/// fixed: Format identifier 1, Hop flag 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2 Time Domain assgnmt 4 --20
size
+=
20
;
size
+=
20
;
size
+=
(
uint8_t
)
ceil
(
log2
(
(
N_RB
*
(
N_RB
+
1
))
>>
1
)
);
// Freq domain assignment -- hopping scenario to be updated
size
+=
(
uint8_t
)
ceil
(
log2
(
(
N_RB
*
(
N_RB
+
1
))
>>
1
)
);
// Freq domain assignment -- hopping scenario to be updated
...
@@ -55,7 +55,7 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
...
@@ -55,7 +55,7 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
// Padding
// Padding
break
;
break
;
case
nr_dci_format
_0_1
:
case
NFAPI_NR_UL_DCI_FORMAT
_0_1
:
/// fixed: Format identifier 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2, SRS request 2 --17
/// fixed: Format identifier 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2, SRS request 2 --17
size
+=
17
;
size
+=
17
;
// Carrier indicator
// Carrier indicator
...
@@ -77,14 +77,14 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
...
@@ -77,14 +77,14 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
// DMRS sequence init
// DMRS sequence init
break
;
break
;
case
nr_dci_format
_1_0
:
case
NFAPI_NR_DL_DCI_FORMAT
_1_0
:
/// fixed: Format identifier 1, VRB2PRB 1, MCS 5, NDI 1, RV 2, HARQ PID 4, DAI 2, PUCCH TPC 2, PUCCH RInd 3, PDSCH to HARQ TInd 3 --24
/// fixed: Format identifier 1, VRB2PRB 1, MCS 5, NDI 1, RV 2, HARQ PID 4, DAI 2, PUCCH TPC 2, PUCCH RInd 3, PDSCH to HARQ TInd 3 --24
size
+=
24
;
size
+=
24
;
size
+=
(
uint8_t
)
ceil
(
log2
(
(
N_RB
*
(
N_RB
+
1
))
>>
1
)
);
// Freq domain assignment
size
+=
(
uint8_t
)
ceil
(
log2
(
(
N_RB
*
(
N_RB
+
1
))
>>
1
)
);
// Freq domain assignment
// Time domain assignment
// Time domain assignment
break
;
break
;
case
nr_dci_format
_1_1
:
case
NFAPI_NR_DL_DCI_FORMAT
_1_1
:
// Carrier indicator
// Carrier indicator
size
+=
1
;
// Format identifier
size
+=
1
;
// Format identifier
// BWP Indicator
// BWP Indicator
...
@@ -111,16 +111,16 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
...
@@ -111,16 +111,16 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
break
;
break
;
case
nr_dci_format
_2_0
:
case
NFAPI_NR_DL_DCI_FORMAT
_2_0
:
break
;
break
;
case
nr_dci_format
_2_1
:
case
NFAPI_NR_DL_DCI_FORMAT
_2_1
:
break
;
break
;
case
nr_dci_format
_2_2
:
case
NFAPI_NR_DL_DCI_FORMAT
_2_2
:
break
;
break
;
case
nr_dci_format
_2_3
:
case
NFAPI_NR_DL_DCI_FORMAT
_2_3
:
break
;
break
;
default:
default:
...
@@ -137,8 +137,8 @@ void nr_pdcch_scrambling(NR_gNB_DCI_ALLOC_t dci_alloc,
...
@@ -137,8 +137,8 @@ void nr_pdcch_scrambling(NR_gNB_DCI_ALLOC_t dci_alloc,
uint8_t
reset
;
uint8_t
reset
;
uint32_t
x1
,
x2
,
s
=
0
;
uint32_t
x1
,
x2
,
s
=
0
;
uint32_t
Nid
=
(
dci_alloc
.
s
s_type
==
nr_pdcch_uss_type
)
?
pdcch_vars
.
dmrs_scrambling_id
:
config
.
sch_config
.
physical_cell_id
.
value
;
uint32_t
Nid
=
(
dci_alloc
.
s
earch_space_type
==
NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC
)
?
pdcch_vars
.
dmrs_scrambling_id
:
config
.
sch_config
.
physical_cell_id
.
value
;
uint32_t
n_RNTI
=
(
dci_alloc
.
s
s_type
==
nr_pdcch_uss_type
)
?
dci_alloc
.
rnti
:
0
;
uint32_t
n_RNTI
=
(
dci_alloc
.
s
earch_space_type
==
NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC
)
?
dci_alloc
.
rnti
:
0
;
uint32_t
*
in
=
dci_alloc
.
dci_pdu
;
uint32_t
*
in
=
dci_alloc
.
dci_pdu
;
reset
=
1
;
reset
=
1
;
...
...
openair1/PHY/NR_TRANSPORT/nr_dci.h
View file @
e2f91088
...
@@ -85,8 +85,8 @@ typedef struct {
...
@@ -85,8 +85,8 @@ typedef struct {
typedef
unsigned
__int128
uint128_t
;
typedef
unsigned
__int128
uint128_t
;
uint8_t
nr_get_dci_size
(
nr_dci_format_e
format
,
uint8_t
nr_get_dci_size
(
n
fapi_n
r_dci_format_e
format
,
nr_rnti_type_e
rnti_type
,
n
fapi_n
r_rnti_type_e
rnti_type
,
NR_BWP_PARMS
*
bwp
,
NR_BWP_PARMS
*
bwp
,
nfapi_nr_config_request_t
*
config
);
nfapi_nr_config_request_t
*
config
);
...
...
openair1/PHY/defs_gNB.h
View file @
e2f91088
...
@@ -50,8 +50,12 @@ typedef struct {
...
@@ -50,8 +50,12 @@ typedef struct {
uint8_t
size
;
uint8_t
size
;
/// Aggregation level
/// Aggregation level
uint8_t
L
;
uint8_t
L
;
/// rnti
uint16_t
rnti
;
/// rnti type
/// rnti type
nfapi_nr_rnti_type_e
rnti
;
nfapi_nr_rnti_type_e
rnti_type
;
/// search space type
nfapi_nr_search_space_type_e
search_space_type
;
/// Format
/// Format
nfapi_nr_dci_format_e
format
;
nfapi_nr_dci_format_e
format
;
/// DCI pdu
/// DCI pdu
...
...
openair1/SCHED_NR/fapi_nr_l1.c
View file @
e2f91088
...
@@ -61,12 +61,12 @@ void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
...
@@ -61,12 +61,12 @@ void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
{
{
int
idx
=
subframe
&
1
;
int
idx
=
subframe
&
1
;
NR_gNB_PDCCH
*
pdcch_vars
=
&
gNB
->
pdcch_vars
[
idx
];
NR_gNB_PDCCH
*
pdcch_vars
=
&
gNB
->
pdcch_vars
[
idx
];
nfapi_nr_dl_config_dci_
dl_pdu
*
pdu
=
&
dl_config_pdu
->
dci_dl_pdu
;
nfapi_nr_dl_config_dci_
pdu_rel15_t
*
pdu
=
&
dl_config_pdu
->
dci_dl_pdu_rel15
;
LOG_D
(
PHY
,
"Frame %d, Subframe %d: DCI processing - populating pdcch_vars->dci_alloc[%d] proc:subframe_tx:%d idx:%d pdcch_vars->num_dci:%d
\n
"
,
frame
,
subframe
,
pdcch_vars
->
num_dci
,
proc
->
subframe_tx
,
idx
,
pdcch_vars
->
num_dci
);
LOG_D
(
PHY
,
"Frame %d, Subframe %d: DCI processing - populating pdcch_vars->dci_alloc[%d] proc:subframe_tx:%d idx:%d pdcch_vars->num_dci:%d
\n
"
,
frame
,
subframe
,
pdcch_vars
->
num_dci
,
proc
->
subframe_tx
,
idx
,
pdcch_vars
->
num_dci
);
// copy dci configuration into gNB structure
// copy dci configuration into gNB structure
nr_fill_dci_and_dlsch
(
eNB
,
frame
,
subframe
,
proc
,
&
pdcch_vars
->
dci_alloc
[
pdcch_vars
->
num_dci
],
pdu
);
//
nr_fill_dci_and_dlsch(eNB,frame,subframe,proc,&pdcch_vars->dci_alloc[pdcch_vars->num_dci],pdu);
LOG_D
(
PHY
,
"Frame %d, Subframe %d: DCI processing - populated pdcch_vars->dci_alloc[%d] proc:subframe_tx:%d idx:%d pdcch_vars->num_dci:%d
\n
"
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
pdcch_vars
->
num_dci
,
proc
->
subframe_tx
,
idx
,
pdcch_vars
->
num_dci
);
LOG_D
(
PHY
,
"Frame %d, Subframe %d: DCI processing - populated pdcch_vars->dci_alloc[%d] proc:subframe_tx:%d idx:%d pdcch_vars->num_dci:%d
\n
"
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
pdcch_vars
->
num_dci
,
proc
->
subframe_tx
,
idx
,
pdcch_vars
->
num_dci
);
}
}
...
...
targets/RT/USER/nr-gnb.c
View file @
e2f91088
...
@@ -181,21 +181,17 @@ static inline int rxtx(PHY_VARS_gNB *gNB,gNB_rxtx_proc_t *proc, char *thread_nam
...
@@ -181,21 +181,17 @@ static inline int rxtx(PHY_VARS_gNB *gNB,gNB_rxtx_proc_t *proc, char *thread_nam
gNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
||
gNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
||
gNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
gNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
)
{
)
{
LOG_D
(
PHY
,
"UL_info[rx_ind:%05d:%d harqs:%05d:%d crcs:%05d:%d preambles:%05d:%d cqis:%d] RX:%04d%d TX:%04d%d
num_pdcch_symbols:%d
\n
"
,
LOG_D
(
PHY
,
"UL_info[rx_ind:%05d:%d harqs:%05d:%d crcs:%05d:%d preambles:%05d:%d cqis:%d] RX:%04d%d TX:%04d%d
\n
"
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
rx_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
rx_ind
.
rx_indication_body
.
number_of_pdus
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
rx_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
rx_ind
.
rx_indication_body
.
number_of_pdus
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
harq_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
number_of_harqs
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
harq_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
harq_ind
.
harq_indication_body
.
number_of_harqs
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
crc_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
crc_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
rach_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
,
NFAPI_SFNSF2DEC
(
gNB
->
UL_INFO
.
rach_ind
.
sfn_sf
),
gNB
->
UL_INFO
.
rach_ind
.
rach_indication_body
.
number_of_preambles
,
gNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
,
gNB
->
UL_INFO
.
cqi_ind
.
number_of_cqis
,
proc
->
frame_rx
,
proc
->
subframe_rx
,
proc
->
frame_rx
,
proc
->
subframe_rx
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
gNB
->
pdcch_vars
[
proc
->
subframe_tx
&
1
].
num_pdcch_symbols
);
proc
->
frame_tx
,
proc
->
subframe_tx
);
}
}
}
}
if
(
nfapi_mode
==
1
&&
gNB
->
pdcch_vars
[
proc
->
subframe_tx
&
1
].
num_pdcch_symbols
==
0
)
{
LOG_E
(
PHY
,
"gNB->pdcch_vars[proc->subframe_tx&1].num_pdcch_symbols == 0"
);
return
0
;
}
/// NR disabling
/// NR disabling
// ****************************************
// ****************************************
...
...
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