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
0210fdb4
Commit
0210fdb4
authored
5 years ago
by
cig
Committed by
Thomas Schlichter
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add common mac functions declarations to nr_mac_common.h
parent
a6015174
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
35 deletions
+35
-35
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+35
-28
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+0
-7
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
View file @
0210fdb4
...
@@ -33,6 +33,34 @@
...
@@ -33,6 +33,34 @@
#define __LAYER2_NR_MAC_COMMON_H__
#define __LAYER2_NR_MAC_COMMON_H__
#include "NR_PDSCH-Config.h"
#include "NR_PDSCH-Config.h"
#include "NR_ServingCellConfigCommon.h"
typedef
enum
{
NR_DL_DCI_FORMAT_1_0
=
0
,
NR_DL_DCI_FORMAT_1_1
,
NR_DL_DCI_FORMAT_2_0
,
NR_DL_DCI_FORMAT_2_1
,
NR_DL_DCI_FORMAT_2_2
,
NR_DL_DCI_FORMAT_2_3
,
NR_UL_DCI_FORMAT_0_0
,
NR_UL_DCI_FORMAT_0_1
}
nr_dci_format_t
;
typedef
enum
{
NR_RNTI_new
=
0
,
NR_RNTI_C
,
NR_RNTI_RA
,
NR_RNTI_P
,
NR_RNTI_CS
,
NR_RNTI_TC
,
NR_RNTI_SP_CSI
,
NR_RNTI_SI
,
NR_RNTI_SFI
,
NR_RNTI_INT
,
NR_RNTI_TPC_PUSCH
,
NR_RNTI_TPC_PUCCH
,
NR_RNTI_TPC_SRS
}
nr_rnti_type_t
;
uint16_t
config_bandwidth
(
int
mu
,
int
nb_rb
,
int
nr_band
);
uint16_t
config_bandwidth
(
int
mu
,
int
nb_rb
,
int
nr_band
);
...
@@ -44,6 +72,12 @@ uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint8_t scs_index, ui
...
@@ -44,6 +72,12 @@ uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint8_t scs_index, ui
int16_t
fill_dmrs_mask
(
NR_PDSCH_Config_t
*
pdsch_Config
,
int
dmrs_TypeA_Position
,
int
NrOfSymbols
);
int16_t
fill_dmrs_mask
(
NR_PDSCH_Config_t
*
pdsch_Config
,
int
dmrs_TypeA_Position
,
int
NrOfSymbols
);
int
is_nr_DL_slot
(
NR_ServingCellConfigCommon_t
*
scc
,
slot_t
slotP
);
int
is_nr_UL_slot
(
NR_ServingCellConfigCommon_t
*
scc
,
slot_t
slotP
);
uint16_t
nr_dci_size
(
nr_dci_format_t
format
,
nr_rnti_type_t
rnti_type
,
uint16_t
N_RB
);
int
get_nr_prach_info_from_index
(
uint8_t
index
,
int
get_nr_prach_info_from_index
(
uint8_t
index
,
int
frame
,
int
frame
,
int
slot
,
int
slot
,
...
@@ -63,31 +97,4 @@ int get_format0(uint8_t index, uint8_t unpaired);
...
@@ -63,31 +97,4 @@ int get_format0(uint8_t index, uint8_t unpaired);
uint16_t
get_NCS
(
uint8_t
index
,
uint16_t
format
,
uint8_t
restricted_set_config
);
uint16_t
get_NCS
(
uint8_t
index
,
uint16_t
format
,
uint8_t
restricted_set_config
);
typedef
enum
{
#endif
NR_DL_DCI_FORMAT_1_0
=
0
,
\ No newline at end of file
NR_DL_DCI_FORMAT_1_1
,
NR_DL_DCI_FORMAT_2_0
,
NR_DL_DCI_FORMAT_2_1
,
NR_DL_DCI_FORMAT_2_2
,
NR_DL_DCI_FORMAT_2_3
,
NR_UL_DCI_FORMAT_0_0
,
NR_UL_DCI_FORMAT_0_1
}
nr_dci_format_t
;
typedef
enum
{
NR_RNTI_new
=
0
,
NR_RNTI_C
,
NR_RNTI_RA
,
NR_RNTI_P
,
NR_RNTI_CS
,
NR_RNTI_TC
,
NR_RNTI_SP_CSI
,
NR_RNTI_SI
,
NR_RNTI_SFI
,
NR_RNTI_INT
,
NR_RNTI_TPC_PUSCH
,
NR_RNTI_TPC_PUCCH
,
NR_RNTI_TPC_SRS
}
nr_rnti_type_t
;
#endif
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
0210fdb4
...
@@ -206,10 +206,6 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP);
...
@@ -206,10 +206,6 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP);
int
get_num_dmrs
(
uint16_t
dmrs_mask
);
int
get_num_dmrs
(
uint16_t
dmrs_mask
);
uint16_t
nr_dci_size
(
nr_dci_format_t
format
,
nr_rnti_type_t
rnti_type
,
uint16_t
N_RB
);
int
allocate_nr_CCEs
(
gNB_MAC_INST
*
nr_mac
,
int
allocate_nr_CCEs
(
gNB_MAC_INST
*
nr_mac
,
int
bwp_id
,
int
bwp_id
,
int
coreset_id
,
int
coreset_id
,
...
@@ -219,9 +215,6 @@ int allocate_nr_CCEs(gNB_MAC_INST *nr_mac,
...
@@ -219,9 +215,6 @@ int allocate_nr_CCEs(gNB_MAC_INST *nr_mac,
int
m
int
m
);
);
int
is_nr_DL_slot
(
NR_ServingCellConfigCommon_t
*
scc
,
slot_t
slotP
);
int
is_nr_UL_slot
(
NR_ServingCellConfigCommon_t
*
scc
,
slot_t
slotP
);
int
get_dlscs
(
nfapi_nr_config_request_t
*
cfg
);
int
get_dlscs
(
nfapi_nr_config_request_t
*
cfg
);
int
get_ulscs
(
nfapi_nr_config_request_t
*
cfg
);
int
get_ulscs
(
nfapi_nr_config_request_t
*
cfg
);
...
...
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