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
alex037yang
OpenXG-RAN
Commits
80dae9d5
Commit
80dae9d5
authored
Jun 21, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor pdcch changes
parent
813df31b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
24 deletions
+43
-24
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+22
-10
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+8
-4
openair1/PHY/NR_TRANSPORT/nr_dci.h
openair1/PHY/NR_TRANSPORT/nr_dci.h
+11
-8
openair1/PHY/NR_TRANSPORT/nr_pbch.c
openair1/PHY/NR_TRANSPORT/nr_pbch.c
+1
-1
openair1/PHY/defs_nr_common.h
openair1/PHY/defs_nr_common.h
+1
-1
No files found.
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
View file @
80dae9d5
...
@@ -173,14 +173,10 @@ typedef struct {
...
@@ -173,14 +173,10 @@ typedef struct {
nfapi_uint16_tlv_t
TimeDomainResourceAllocation_mappingType
;
///// L1 parameter 'Mapping-type'
nfapi_uint16_tlv_t
TimeDomainResourceAllocation_mappingType
;
///// L1 parameter 'Mapping-type'
}
nfapi_nr_pdsch_config_t
;
}
nfapi_nr_pdsch_config_t
;
typedef
struct
{
typedef
struct
{
nfapi_uint16_tlv_t
searchSpaceSIB1
;
///// L1 parameter 'rmsi-SearchSpace'
nfapi_uint16_tlv_t
controlResourceSetId
;
///// L1 parameter 'CORESET-ID'
nfapi_uint16_tlv_t
searchSpaceOtherSystemInformation
;
///// L1 parameter 'osi-SearchSpace'
nfapi_uint16_tlv_t
frequencyDomainResources
///// L1 parameter 'CORESET-freq-dom'
nfapi_uint16_tlv_t
pagingSearchSpace
;
///// L1 parameter 'paging-SearchSpace'
nfapi_uint16_tlv_t
duration
;
///// L1 parameter 'CORESET-time-duration'
nfapi_uint16_tlv_t
ra_SearchSpace
;
///// L1 parameter 'ra-SearchSpace'
nfapi_uint16_tlv_t
rach_ra_ControlResourceSet
;
///// L1 parameter 'rach-coreset-configuration'
nfapi_uint16_tlv_t
common_controlResourceSetId
;
///// L1 parameter 'CORESET-ID
nfapi_uint16_tlv_t
common_ControlResourceSet_duration
;
///// L1 parameter 'CORESET-time-duration'
nfapi_uint16_tlv_t
cce_REG_MappingType
;
///// L1 parameter 'CORESET-CCE-REG-mapping-type'
nfapi_uint16_tlv_t
cce_REG_MappingType
;
///// L1 parameter 'CORESET-CCE-REG-mapping-type'
nfapi_uint16_tlv_t
reg_BundleSize
;
///// L1 parameter 'CORESET-REG-bundle-size'
nfapi_uint16_tlv_t
reg_BundleSize
;
///// L1 parameter 'CORESET-REG-bundle-size'
nfapi_uint16_tlv_t
interleaverSize
;
///// L1 parameter 'CORESET-interleaver-size'
nfapi_uint16_tlv_t
interleaverSize
;
///// L1 parameter 'CORESET-interleaver-size'
...
@@ -188,9 +184,14 @@ typedef struct {
...
@@ -188,9 +184,14 @@ typedef struct {
nfapi_uint16_tlv_t
precoderGranularity
;
///// L1 parameter 'CORESET-precoder-granuality'
nfapi_uint16_tlv_t
precoderGranularity
;
///// L1 parameter 'CORESET-precoder-granuality'
nfapi_uint16_tlv_t
TCI_StateId
;
///// L1 parameter 'TCI-StatesPDCCH'
nfapi_uint16_tlv_t
TCI_StateId
;
///// L1 parameter 'TCI-StatesPDCCH'
nfapi_uint16_tlv_t
tci_PresentInDCI
;
///// L1 parameter 'TCI-PresentInDCI'
nfapi_uint16_tlv_t
tci_PresentInDCI
;
///// L1 parameter 'TCI-PresentInDCI'
nfapi_uint16_tlv_t
pdcch_DMRS_ScramblingID
;
///// L1 parameter 'PDCCH-DMRS-Scrambling-ID'
}
nfapi_nr_pdcch_commonControlResourcesSets_t
;
typedef
struct
{
nfapi_uint16_tlv_t
SearchSpaceId
;
nfapi_uint16_tlv_t
SearchSpaceId
;
nfapi_uint16_tlv_t
commonSearchSpaces_controlResourceSetId
;
nfapi_uint16_tlv_t
commonSearchSpaces_controlResourceSetId
;
nfapi_uint16_tlv_t
SearchSpace_monitoringSlotPeriodicityAndOffset
;
///// L1 parameters 'Montoring-periodicity-PDCCH-slot'
nfapi_uint16_tlv_t
SearchSpace_monitoringSlotPeriodicityAndOffset
;
///// L1 parameters 'Montoring-periodicity-PDCCH-slot'
nfapi_uint16_tlv_t
monitoringSymbolsWithinSlot
///// L1 parameter 'Montoring-symbols-PDCCH-within-slot'
nfapi_uint16_tlv_t
SearchSpace_nrofCandidates_aggregationLevel1
;
///// L1 parameter 'Aggregation-level-1'
nfapi_uint16_tlv_t
SearchSpace_nrofCandidates_aggregationLevel1
;
///// L1 parameter 'Aggregation-level-1'
nfapi_uint16_tlv_t
SearchSpace_nrofCandidates_aggregationLevel2
;
///// L1 parameter 'Aggregation-level-2'
nfapi_uint16_tlv_t
SearchSpace_nrofCandidates_aggregationLevel2
;
///// L1 parameter 'Aggregation-level-2'
nfapi_uint16_tlv_t
SearchSpace_nrofCandidates_aggregationLevel4
;
///// L1 parameter 'Aggregation-level-4'
nfapi_uint16_tlv_t
SearchSpace_nrofCandidates_aggregationLevel4
;
///// L1 parameter 'Aggregation-level-4'
...
@@ -200,7 +201,18 @@ typedef struct {
...
@@ -200,7 +201,18 @@ typedef struct {
nfapi_uint16_tlv_t
Common_dci_Format2_3_monitoringPeriodicity
;
///// L1 parameter 'SRS-monitoring-periodicity'
nfapi_uint16_tlv_t
Common_dci_Format2_3_monitoringPeriodicity
;
///// L1 parameter 'SRS-monitoring-periodicity'
nfapi_uint16_tlv_t
Common_dci_Format2_3_nrofPDCCH_Candidates
;
///// L1 parameter 'SRS-Num-PDCCH-cand'
nfapi_uint16_tlv_t
Common_dci_Format2_3_nrofPDCCH_Candidates
;
///// L1 parameter 'SRS-Num-PDCCH-cand'
nfapi_uint16_tlv_t
ue_Specific__dci_Formats
;
nfapi_uint16_tlv_t
ue_Specific__dci_Formats
;
}
nfapi_nr_pdcch_config_t
;
}
nfapi_nr_pdcch_commonSearchSpaces_t
;
typedef
struct
{
nfapi_nr_pdcch_commonControlResourcesSets_t
commonControlResourcesSets
;
nfapi_nr_pfcch_commonSearchSpaces_t
commonSearchSpaces
;
nfapi_uint16_tlv_t
searchSpaceSIB1
;
///// L1 parameter 'rmsi-SearchSpace'
nfapi_uint16_tlv_t
searchSpaceOtherSystemInformation
;
///// L1 parameter 'osi-SearchSpace'
nfapi_uint16_tlv_t
pagingSearchSpace
;
///// L1 parameter 'paging-SearchSpace'
nfapi_uint16_tlv_t
ra_SearchSpace
;
///// L1 parameter 'ra-SearchSpace'
nfapi_uint16_tlv_t
rach_ra_ControlResourceSet
;
///// L1 parameter 'rach-coreset-configuration'
}
nfapi_nr_pdcch_common_config_t
;
typedef
struct
{
typedef
struct
{
nfapi_uint16_tlv_t
ssb_PositionsInBurst_PR
;
///// L1 parameter 'SSB-Transmitted
nfapi_uint16_tlv_t
ssb_PositionsInBurst_PR
;
///// L1 parameter 'SSB-Transmitted
...
@@ -270,7 +282,6 @@ typedef struct {
...
@@ -270,7 +282,6 @@ typedef struct {
nfapi_vendor_extension_tlv_t
vendor_extension
;
nfapi_vendor_extension_tlv_t
vendor_extension
;
}
nfapi_nr_config_request_t
;
}
nfapi_nr_config_request_t
;
typedef
enum
{
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_1_1
,
...
@@ -303,3 +314,4 @@ typedef struct {
...
@@ -303,3 +314,4 @@ typedef struct {
}
nfapi_nr_dl_config_dci_dl_pdu
;
}
nfapi_nr_dl_config_dci_dl_pdu
;
#endif
#endif
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
80dae9d5
...
@@ -126,7 +126,11 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
...
@@ -126,7 +126,11 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
}
}
uint8_t
nr_generate_dci_top
()
uint8_t
nr_generate_dci_top
(
NR_DCI_ALLOC_t
dci_alloc
,
int32_t
**
txdataF
,
int16_t
amp
,
NR_DL_FRAME_PARMS
*
frame_parms
,
nfapi_config_request_t
*
config
)
{
{
return
0
;
return
0
;
}
}
openair1/PHY/NR_TRANSPORT/nr_dci.h
View file @
80dae9d5
...
@@ -27,12 +27,12 @@
...
@@ -27,12 +27,12 @@
typedef
enum
{
typedef
enum
{
nr_dci_format_0_0
=
0
,
nr_dci_format_0_0
=
0
,
nr_dci_format_0_1
,
nr_dci_format_0_1
,
nr_dci_format_1_0
,
nr_dci_format_1_1
,
nr_dci_format_2_0
,
nr_dci_format_2_0
,
nr_dci_format_2_1
,
nr_dci_format_2_1
,
nr_dci_format_2_2
,
nr_dci_format_2_2
,
nr_dci_format_2_3
nr_dci_format_2_3
,
nr_dci_format_1_0
,
nr_dci_format_1_1
,
}
nr_dci_format_e
;
}
nr_dci_format_e
;
typedef
enum
{
typedef
enum
{
...
@@ -45,7 +45,6 @@ typedef enum {
...
@@ -45,7 +45,6 @@ typedef enum {
}
nr_rnti_type_e
;
}
nr_rnti_type_e
;
typedef
struct
{
typedef
struct
{
/// Length of DCI in bits
/// Length of DCI in bits
uint8_t
size
;
uint8_t
size
;
...
@@ -69,6 +68,10 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
...
@@ -69,6 +68,10 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
NR_BWP_PARMS
bwp
,
NR_BWP_PARMS
bwp
,
nfapi_nr_config_request_t
*
config
);
nfapi_nr_config_request_t
*
config
);
uint8_t
nr_generate_dci_top
();
uint8_t
nr_generate_dci_top
(
NR_DCI_ALLOC_t
dci_alloc
,
int32_t
**
txdataF
,
int16_t
amp
,
NR_DL_FRAME_PARMS
*
frame_parms
,
nfapi_config_request_t
*
config
)
#endif //__PHY_NR_TRANSPORT_DCI__H
#endif //__PHY_NR_TRANSPORT_DCI__H
openair1/PHY/NR_TRANSPORT/nr_pbch.c
View file @
80dae9d5
...
@@ -207,7 +207,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
...
@@ -207,7 +207,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
mod_pbch_e
[(
i
<<
1
)
+
1
]
=
nr_mod_table
[((
NR_MOD_TABLE_QPSK_OFFSET
+
idx
)
<<
1
)
+
1
];
mod_pbch_e
[(
i
<<
1
)
+
1
]
=
nr_mod_table
[((
NR_MOD_TABLE_QPSK_OFFSET
+
idx
)
<<
1
)
+
1
];
#ifdef DEBUG_PBCH
#ifdef DEBUG_PBCH
printf
(
"i %d
mod_pbch %d %d
\n
"
,
i
,
mod_pbch_e
[
2
*
i
],
mod_pbch_e
[
2
*
i
+
1
]);
printf
(
"i %d
idx %d mod_pbch %d %d
\n
"
,
i
,
idx
,
mod_pbch_e
[
2
*
i
],
mod_pbch_e
[
2
*
i
+
1
]);
#endif
#endif
}
}
...
...
openair1/PHY/defs_nr_common.h
View file @
80dae9d5
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#define __PHY_DEFS_NR_COMMON__H__
#define __PHY_DEFS_NR_COMMON__H__
#include "defs_common.h"
#include "defs_common.h"
#include "nfapi_
nr_
interface.h"
#include "nfapi_interface.h"
#include "impl_defs_nr.h"
#include "impl_defs_nr.h"
#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
...
...
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