Cleanup MAC header files
- sorted out according to recurring logic that wants function prototypes in separate files from data struct and constants definitions, variables in separate .c files with inclusion of "extern" header files - moved function prototypes to resective header files - moved data structures and constants to respective header files - merged unnecessary mac.h file into mac_defs.h @ MAC UE - moved const variables suchs as tables to respective .c files - moved extern references to respective extern.h files
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
/*! \file PHY/defs_nr_UE.h
|
||||
\brief Top-level defines and structure definitions for nr ue
|
||||
\brief Top-level constants and data structures definitions for NR UE
|
||||
\author Guy De Souza, H. WANG, A. Mico Pereperez
|
||||
\date 2018
|
||||
\version 0.1
|
||||
@@ -123,6 +123,9 @@
|
||||
|
||||
#define FRAME_PERIOD 100000000ULL
|
||||
#define DAQ_PERIOD 66667ULL
|
||||
#define DLSCH_RB_ALLOC 0x1fbf // skip DC RB (total 23/25 RBs)
|
||||
#define DLSCH_RB_ALLOC_12 0x0aaa // skip DC RB (total 23/25 RBs)
|
||||
#define NS_PER_SLOT 500000
|
||||
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
\brief NR UE PHY functions prototypes
|
||||
\author R. Knopp, F. Kaltenberger
|
||||
\company EURECOM
|
||||
\email knopp@eurecom.fr
|
||||
|
||||
@@ -75,17 +75,10 @@ fifo_dump_emos_UE emos_dump_UE;
|
||||
#include "intertask_interface.h"
|
||||
#include "T.h"
|
||||
|
||||
#define DLSCH_RB_ALLOC 0x1fbf // skip DC RB (total 23/25 RBs)
|
||||
#define DLSCH_RB_ALLOC_12 0x0aaa // skip DC RB (total 23/25 RBs)
|
||||
|
||||
#define NS_PER_SLOT 500000
|
||||
|
||||
char nr_mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
|
||||
|
||||
const uint8_t nr_rv_round_map_ue[4] = {0, 2, 1, 3};
|
||||
|
||||
extern double cpuf;
|
||||
|
||||
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
|
||||
extern uint64_t downlink_frequency[MAX_NUM_CCs][4];
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user