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
canghaiwuhen
OpenXG-RAN
Commits
5d366c96
Commit
5d366c96
authored
Jul 27, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nr_pdcch' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into nr_pdcch
parents
b387b203
c7bb34aa
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
118 additions
and
500 deletions
+118
-500
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+8
-3
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+6
-1
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+98
-0
openair1/PHY/defs_NR.h
openair1/PHY/defs_NR.h
+0
-488
openair1/PHY/defs_eNB.h
openair1/PHY/defs_eNB.h
+1
-2
openair1/PHY/defs_gNB.h
openair1/PHY/defs_gNB.h
+2
-3
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/fapi_nr_l1.c
+2
-2
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_defs.h
+1
-1
No files found.
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
View file @
5d366c96
...
...
@@ -241,7 +241,7 @@ typedef struct {
}
nfapi_nr_config_request_t
;
typedef
enum
{
NFAPI_NR_DL_DCI_FORMAT_1_0
=
0
,
NFAPI_NR_DL_DCI_FORMAT_1_0
=
0
,
NFAPI_NR_DL_DCI_FORMAT_1_1
,
NFAPI_NR_DL_DCI_FORMAT_2_0
,
NFAPI_NR_DL_DCI_FORMAT_2_1
,
...
...
@@ -252,7 +252,7 @@ typedef enum {
}
nfapi_nr_dci_format_e
;
typedef
enum
{
NFAPI_NR_RNTI_new
=
0
,
NFAPI_NR_RNTI_new
=
0
,
NFAPI_NR_RNTI_C
,
NFAPI_NR_RNTI_RA
,
NFAPI_NR_RNTI_P
,
...
...
@@ -307,6 +307,7 @@ nfapi_tl_t tl;
uint8_t
cce_idx
;
uint8_t
aggregation_level
;
uint16_t
rnti
;
uint8_t
rnti_type
;
uint8_t
dci_format
;
//1 bit
uint16_t
frequency_domain_resource_assignment
;
//up to 9 bits
...
...
@@ -346,6 +347,7 @@ nfapi_tl_t tl;
uint8_t
cce_idx
;
uint8_t
aggregation_level
;
uint16_t
rnti
;
uint8_t
rnti_type
;
uint8_t
dci_format
;
//1 bit
uint16_t
frequency_domain_resource_assignment
;
//up to 9 bits
...
...
@@ -395,6 +397,9 @@ uint8_t *block_numbers;
}
nfapi_nr_dl_config_dci_dl_pdu_rel15_t
;
//#define NFAPI_NR_DL_CONFIG_REQUEST_DCI_DL_PDU_REL15_TAG 0x????
typedef
struct
{
nfapi_nr_dl_config_dci_pdu_rel15_t
dci_dl_pdu_rel15
;
}
nfapi_dl_config_dci_dl_pdu
;
typedef
struct
{
uint8_t
coreset_id
;
...
...
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
5d366c96
...
...
@@ -224,7 +224,12 @@ void fill_pdcch_order(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC_t *dci_a
proc
->
frame_tx
,
proc
->
subframe_tx
,
rel8
->
rnti
);
}
void
fill_dci_and_dlsch
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
eNB_rxtx_proc_t
*
proc
,
DCI_ALLOC_t
*
dci_alloc
,
nfapi_dl_config_dci_dl_pdu
*
pdu
)
void
fill_dci_and_dlsch
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
eNB_rxtx_proc_t
*
proc
,
DCI_ALLOC_t
*
dci_alloc
,
nfapi_dl_config_dci_dl_pdu
*
pdu
)
{
LTE_DL_FRAME_PARMS
*
fp
=
&
eNB
->
frame_parms
;
uint8_t
*
dci_pdu
=
&
dci_alloc
->
dci_pdu
[
0
];
...
...
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
View file @
5d366c96
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
/*! \file PHY/NR_TRANSPORT/nr_dci_tools.c
* \brief
* \author
* \date 2018
* \version 0.1
* \company Eurecom
* \email:
* \note
* \warning
*/
#include "nfapi_nr_interface.h"
void
nr_fill_dci_and_dlsch
(
PHY_VARS_gNB
*
gNB
,
int
frame
,
int
subframe
,
gNB_rxtx_proc_t
*
proc
,
NR_DCI_ALLOC_t
*
dci_alloc
,
nfapi_nr_dl_config_dci_pdu_rel15_t
*
pdu
)
{
NR_DL_FRAME_PARMS
*
fp
=
&
gNB
->
frame_parms
;
uint8_t
*
dci_pdu
=
&
dci_alloc
->
dci_pdu
[
0
];
nfapi_nr_dl_config_dci_pdu_rel15_t
*
rel15
=
&
pdu
->
dci_dl_pdu_rel15
;
nfapi_nr_config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
dci_alloc
->
L
=
rel15
->
aggregation_level
;
dci_alloc
->
firstCCE
=
rel15
->
cce_idx
;
dci_alloc
->
rnti
=
rel15
->
rnti
;
dci_alloc
->
ra_flag
=
0
;
//dci_alloc->search_space = ???
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_1_0
)
{
dci_alloc
->
format
=
format1_0
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_C
||
rel15
->
rnti_type
==
NFAPI_NR_RNTI_CS
||
rel15
->
rnti_type
==
NFAPI_NR_RNTI_new
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_P
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_SI
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_RA
)
{
dci_alloc
->
ra_flag
=
1
;
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_TC
)
{
}
else
{
AssertFatal
(
1
==
0
,
"[nr_fill_dci_and_dlsch] Incorrect DCI Format(%d) and RNTI Type(%d) combination"
,
rel15
->
dci_format
,
rel15
->
rnti_type
);
}
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_UL_DCI_FORMAT_0_0
)
{
dci_alloc
->
format
=
format0_0
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_ul
,
&
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_1_1
)
{
dci_alloc
->
format
=
format1_1
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_UL_DCI_FORMAT_0_1
)
{
dci_alloc
->
format
=
format0_1
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_ul
,
&
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_0
)
{
dci_alloc
->
format
=
format2_0
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_1
)
{
dci_alloc
->
format
=
format2_1
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_2
)
{
dci_alloc
->
format
=
format2_2
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_3
)
{
dci_alloc
->
format
=
format2_3
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
}
else
{
AssertFatal
(
1
==
0
,
"[nr_fill_dci_and_dlsch] Incorrect DCI Format(%d)"
,
rel15
->
dci_format
);
}
return
;
}
openair1/PHY/defs_NR.h
deleted
100644 → 0
View file @
b387b203
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_eNB.h
View file @
5d366c96
...
...
@@ -732,4 +732,3 @@ typedef struct PHY_VARS_eNB_s {
}
PHY_VARS_eNB
;
#endif // __PHY_DEFS_eNB_H__
openair1/PHY/defs_gNB.h
View file @
5d366c96
...
...
@@ -29,6 +29,7 @@
\note
\warning
*/
#ifndef __PHY_DEFS_GNB__H__
#define __PHY_DEFS_GNB__H__
...
...
@@ -471,6 +472,4 @@ typedef struct PHY_VARS_gNB_s {
int32_t
pusch_stats_BO
[
NUMBER_OF_UE_MAX
][
10240
];
}
PHY_VARS_gNB
;
#endif
openair1/SCHED_NR/fapi_nr_l1.c
View file @
5d366c96
...
...
@@ -66,7 +66,7 @@ void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
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
//nr_fill_dci_and_dlsch(e
NB,frame,subframe,proc,&pdcch_vars->dci_alloc[pdcch_vars->num_dci],pdu);
nr_fill_dci_and_dlsch
(
g
NB
,
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
);
}
...
...
openair2/RRC/NR/nr_rrc_defs.h
View file @
5d366c96
...
...
@@ -18,7 +18,7 @@
* contact@openairinterface.org
*/
/*! \file RRC/
LITE/defs_NR
.h
/*! \file RRC/
NR/nr_rrc_defs
.h
* \brief NR RRC struct definitions and function prototypes
* \author Navid Nikaein, Raymond Knopp
* \date 2010 - 2014, 2018
...
...
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