Skip to content

O
OpenXG-RAN
Commit f07397e6 authored by Nick Ho's avatar Nick Ho
Browse files
Options

Modify defs.h in MAC for NB-IoT

parent a9a6a545
Show whitespace changes
Inline Side-by-side
Showing with 279 additions and 395 deletions
openair2/LAYER2/MAC/defs.h
View file @ f07397e6
...@@ -80,43 +80,19 @@ ...@@ -80,43 +80,19 @@
#define SCH_PAYLOAD_SIZE_MAX 4096 #define SCH_PAYLOAD_SIZE_MAX 4096
/// Logical channel ids from 36-311 (Note BCCH is not specified in 36-311, uses the same as first DRB) /// Logical channel ids from 36-311 (Note BCCH is not specified in 36-311, uses the same as first DRB)
#if defined(Rel10) || defined(Rel14) /*!MBMS is not supported in NB-IoT */
// Mask for identifying subframe for MBMS
#define MBSFN_TDD_SF3 0x80// for TDD
#define MBSFN_TDD_SF4 0x40
#define MBSFN_TDD_SF7 0x20
#define MBSFN_TDD_SF8 0x10
#define MBSFN_TDD_SF9 0x08
#define MBSFN_FDD_SF1 0x80// for FDD
#define MBSFN_FDD_SF2 0x40
#define MBSFN_FDD_SF3 0x20
#define MBSFN_FDD_SF6 0x10
#define MBSFN_FDD_SF7 0x08
#define MBSFN_FDD_SF8 0x04
#define MAX_MBSFN_AREA 8
#define MAX_PMCH_perMBSFN 15
/*!\brief MAX MCCH payload size */
#define MCCH_PAYLOAD_SIZE_MAX 128
//#define MCH_PAYLOAD_SIZE_MAX 16384// this value is using in case mcs and TBS index are high
#endif
#ifdef USER_MODE #ifdef USER_MODE
#define printk printf #define printk printf
#endif //USER_MODE #endif //USER_MODE
/*!\brief Maximum number of logical channl group IDs */ /*In NB-IoT, 36.321 6.1.3.1 Logical channel group ID is set to #0 */
/*!\brief Maximum number of logical channel group IDs */
#define MAX_NUM_LCGID 4 #define MAX_NUM_LCGID 4
/*!\brief logical channl group ID 0 */ /*!\brief logical channl group ID 0 */
#define LCGID0 0 #define LCGID0 0
/*!\brief logical channl group ID 1 */
#define LCGID1 1 /*!\brief Maximum number of logical chanels 0-10*/
/*!\brief logical channl group ID 2 */
#define LCGID2 2
/*!\brief logical channl group ID 3 */
#define LCGID3 3
/*!\brief Maximum number of logical chanels */
#define MAX_NUM_LCID 11 #define MAX_NUM_LCID 11
/*!\brief Maximum number od control elemenets */ /*!\brief Maximum number od control elemenets */
#define MAX_NUM_CE 5 #define MAX_NUM_CE 5
...@@ -126,16 +102,15 @@ ...@@ -126,16 +102,15 @@
#define BSR_TABLE_SIZE 64 #define BSR_TABLE_SIZE 64
/*!\brief The power headroom reporting range is from -23 ...+40 dB and beyond, with step 1 */ /*!\brief The power headroom reporting range is from -23 ...+40 dB and beyond, with step 1 */
#define PHR_MAPPING_OFFSET 23 // if ( x>= -23 ) val = floor (x + 23) #define PHR_MAPPING_OFFSET 23 // if ( x>= -23 ) val = floor (x + 23)
/*!\brief maximum number of resource block groups */
#define N_RBG_MAX 25 // for 20MHz channel BW /*There is no CQI & RB concept in NB-IoT*/
/*!\brief minimum value for channel quality indicator */ /*!\brief maximum number of resource block groups, not used in NB-IoT */
#define MIN_CQI_VALUE 0 /*!\brief minimum value for channel quality indicator, not used in NB-IoT */
/*!\brief maximum value for channel quality indicator */ /*!\brief maximum value for channel quality indicator, not used in NB-IoT */
#define MAX_CQI_VALUE 15
/*!\briefmaximum number of supported bandwidth (1.4, 5, 10, 20 MHz) */ /*!\brief maximum number of supported bandwidth (1.4, 5, 10, 20 MHz) */
#define MAX_SUPPORTED_BW 4 #define MAX_SUPPORTED_BW 4
/*!\brief CQI values range from 1 to 15 (4 bits) */ /*!\brief CQI values range from 1 to 15 (4 bits), not used in NB-IoT */
#define CQI_VALUE_RANGE 16
/*!\brief value for indicating BSR Timer is not running */ /*!\brief value for indicating BSR Timer is not running */
#define MAC_UE_BSR_TIMER_NOT_RUNNING (0xFFFF) #define MAC_UE_BSR_TIMER_NOT_RUNNING (0xFFFF)
...@@ -160,49 +135,23 @@ ...@@ -160,49 +135,23 @@
/* /*
* UE/ENB common part * UE/ENB common part
*/ */
/*!\brief MAC header of Random Access Response for Random access preamble identifier (RAPID) */ /*!\brief MAC header of Random Access Response for Random access preamble identifier (RAPID) for NB-IoT */
typedef struct { typedef struct {
uint8_t RAPID:6; uint8_t RAPID:6;
uint8_t T:1; uint8_t T:1;
uint8_t E:1; uint8_t E:1;
} __attribute__((__packed__))RA_HEADER_RAPID; } __attribute__((__packed__))RA_HEADER_RAPID_NB;
/*!\brief MAC header of Random Access Response for backoff indicator (BI)*/ /*!\brief MAC header of Random Access Response for backoff indicator (BI) for NB-IoT*/
typedef struct { typedef struct {
uint8_t BI:4; uint8_t BI:4;
uint8_t R:2; uint8_t R:2;
uint8_t T:1; uint8_t T:1;
uint8_t E:1; uint8_t E:1;
} __attribute__((__packed__))RA_HEADER_BI; } __attribute__((__packed__))RA_HEADER_BI_NB;
/*
typedef struct { /*Seems not to do the packed of RAR pdu*/
uint64_t padding:16;
uint64_t t_crnti:16;
uint64_t hopping_flag:1;
uint64_t rb_alloc:10;
uint64_t mcs:4;
uint64_t TPC:3;
uint64_t UL_delay:1;
uint64_t cqi_req:1;
uint64_t Timing_Advance_Command:11; // first/2nd octet LSB
uint64_t R:1; // octet MSB
} __attribute__((__packed__))RAR_PDU;
typedef struct {
uint64_t padding:16;
uint64_t R:1; // octet MSB
uint64_t Timing_Advance_Command:11; // first/2nd octet LSB
uint64_t cqi_req:1;
uint64_t UL_delay:1;
uint64_t TPC:3;
uint64_t mcs:4;
uint64_t rb_alloc:10;
uint64_t hopping_flag:1;
uint64_t t_crnti:16;
} __attribute__((__packed__))RAR_PDU;
#define sizeof_RAR_PDU 6
*/
/*!\brief MAC subheader short with 7bit Length field */ /*!\brief MAC subheader short with 7bit Length field */
typedef struct { typedef struct {
uint8_t LCID:5; // octet 1 LSB uint8_t LCID:5; // octet 1 LSB
...@@ -210,7 +159,7 @@ typedef struct { ...@@ -210,7 +159,7 @@ typedef struct {
uint8_t R:2; // octet 1 MSB uint8_t R:2; // octet 1 MSB
uint8_t L:7; // octet 2 LSB uint8_t L:7; // octet 2 LSB
uint8_t F:1; // octet 2 MSB uint8_t F:1; // octet 2 MSB
} __attribute__((__packed__))SCH_SUBHEADER_SHORT; } __attribute__((__packed__))SCH_SUBHEADER_SHORT_NB;
/*!\brief MAC subheader long with 15bit Length field */ /*!\brief MAC subheader long with 15bit Length field */
typedef struct { typedef struct {
uint8_t LCID:5; // octet 1 LSB uint8_t LCID:5; // octet 1 LSB
...@@ -220,40 +169,32 @@ typedef struct { ...@@ -220,40 +169,32 @@ typedef struct {
uint8_t F:1; // octet 2 MSB uint8_t F:1; // octet 2 MSB
uint8_t L_LSB:8; uint8_t L_LSB:8;
uint8_t padding; uint8_t padding;
} __attribute__((__packed__))SCH_SUBHEADER_LONG; } __attribute__((__packed__))SCH_SUBHEADER_LONG_NB;
/*!\brief MAC subheader short without length field */ /*!\brief MAC subheader short without length field */
typedef struct { typedef struct {
uint8_t LCID:5; uint8_t LCID:5;
uint8_t E:1; uint8_t E:1;
uint8_t R:2; uint8_t R:2;
} __attribute__((__packed__))SCH_SUBHEADER_FIXED; } __attribute__((__packed__))SCH_SUBHEADER_FIXED_NB;
/*!\brief mac control element: short buffer status report for a specific logical channel group ID*/ /*!\brief mac control element: short buffer status report for a specific logical channel group ID*/
typedef struct { typedef struct {
uint8_t Buffer_size:6; // octet 1 LSB uint8_t Buffer_size:6; // octet 1 LSB
uint8_t LCGID:2; // octet 1 MSB uint8_t LCGID:2; // octet 1 MSB
} __attribute__((__packed__))BSR_SHORT; } __attribute__((__packed__))BSR_SHORT_NB;
typedef BSR_SHORT BSR_TRUNCATED; /*!\TRUNCATED BSR and Long BSR is not supported in NB-IoT*/
/*!\brief mac control element: long buffer status report for all logical channel group ID*/
typedef struct {
uint8_t Buffer_size3:6;
uint8_t Buffer_size2:6;
uint8_t Buffer_size1:6;
uint8_t Buffer_size0:6;
} __attribute__((__packed__))BSR_LONG;
#define BSR_LONG_SIZE (sizeof(BSR_LONG))
/*!\brief mac control element: timing advance */ /*!\brief mac control element: timing advance */
typedef struct { typedef struct {
uint8_t TA:6; uint8_t TA:6;
uint8_t R:2; uint8_t R:2;
} __attribute__((__packed__))TIMING_ADVANCE_CMD; } __attribute__((__packed__))TIMING_ADVANCE_CMD_NB;
/*!\brief mac control element: power headroom report */ /*!\brief mac control element: power headroom report */
typedef struct { typedef struct {
uint8_t PH:6; uint8_t PH:6;
uint8_t R:2; uint8_t R:2;
} __attribute__((__packed__))POWER_HEADROOM_CMD; } __attribute__((__packed__))POWER_HEADROOM_CMD_NB;
/*!\brief DCI PDU filled by MAC for the PHY */ /*!\brief DCI PDU filled by MAC for the PHY */
typedef struct { typedef struct {
...@@ -262,62 +203,44 @@ typedef struct { ...@@ -262,62 +203,44 @@ typedef struct {
// uint32_t nCCE; // uint32_t nCCE;
uint32_t num_pdcch_symbols; uint32_t num_pdcch_symbols;
DCI_ALLOC_t dci_alloc[NUM_DCI_MAX] ; DCI_ALLOC_t dci_alloc[NUM_DCI_MAX] ;
} DCI_PDU; } DCI_PDU_NB;
/*! \brief CCCH payload */ /*! \brief CCCH payload */
typedef struct { typedef struct {
uint8_t payload[CCCH_PAYLOAD_SIZE_MAX] ; uint8_t payload[CCCH_PAYLOAD_SIZE_MAX] ;
} __attribute__((__packed__))CCCH_PDU; } __attribute__((__packed__))CCCH_PDU_NB;
/*! \brief BCCH payload */ /*! \brief BCCH payload */
typedef struct { typedef struct {
uint8_t payload[BCCH_PAYLOAD_SIZE_MAX] ; uint8_t payload[BCCH_PAYLOAD_SIZE_MAX] ;
} __attribute__((__packed__))BCCH_PDU; } __attribute__((__packed__))BCCH_PDU_NB;
/*! \brief BCCH payload */ /*! \brief PCCH payload */
typedef struct { typedef struct {
uint8_t payload[PCCH_PAYLOAD_SIZE_MAX] ; uint8_t payload[PCCH_PAYLOAD_SIZE_MAX] ;
} __attribute__((__packed__))PCCH_PDU; } __attribute__((__packed__))PCCH_PDU_NB;
/*MCCH & CC is not used in NB-IoT*/
#if defined(Rel10) || defined(Rel14)
/*! \brief MCCH payload */
typedef struct {
uint8_t payload[MCCH_PAYLOAD_SIZE_MAX] ;
} __attribute__((__packed__))MCCH_PDU;
/*!< \brief MAC control element for activation and deactivation of component carriers */
typedef struct {
uint8_t C7:1;/*!< \brief Component carrier 7 */
uint8_t C6:1;/*!< \brief Component carrier 6 */
uint8_t C5:1;/*!< \brief Component carrier 5 */
uint8_t C4:1;/*!< \brief Component carrier 4 */
uint8_t C3:1;/*!< \brief Component carrier 3 */
uint8_t C2:1;/*!< \brief Component carrier 2 */
uint8_t C1:1;/*!< \brief Component carrier 1 */
uint8_t R:1;/*!< \brief Reserved */
} __attribute__((__packed__))CC_ELEMENT;
/*! \brief MAC control element: MCH Scheduling Information */
typedef struct {
uint8_t stop_sf_MSB:3; // octet 1 LSB
uint8_t lcid:5; // octet 2 MSB
uint8_t stop_sf_LSB:8;
} __attribute__((__packed__))MSI_ELEMENT;
#endif
/*! \brief Values of CCCH LCID for DLSCH */ /*! \brief Values of CCCH LCID for DLSCH */
#define CCCH_LCHANID 0 //#define CCCH_LCHANID 0 not used in OAI
/*!\brief Values of BCCH logical channel */ /*!\brief Values of BCCH0 logical channel for MIB*/
#define BCCH 3 // SI #define BCCH0 11 // MIB-NB
/*!\brief Values of BCCH1 logical channel for SIBs */
#define BCCH1 12 // SI-SIB-NBs
/*!\brief Values of PCCH logical channel */ /*!\brief Values of PCCH logical channel */
#define PCCH 4 // Paging #define PCCH 13 // Paging
/*!\brief Value of CCCH / SRB0 logical channel */ /*!\brief Value of CCCH / SRB0 logical channel */
#define CCCH 0 // srb0 #define CCCH 0 // srb0
/*!\brief DCCH / SRB1 logical channel */ /*!\brief DCCH0 / SRB1bis logical channel */
#define DCCH 1 // srb1 #define DCCH0 3 // srb1bis
/*!\brief DCCH1 / SRB2 logical channel */ /*!\brief DCCH1 / SRB1 logical channel */
#define DCCH1 2 // srb2 #define DCCH1 1 // srb1
/*!\brief DTCH DRB1 logical channel */ /*!\brief DTCH0 DRB0 logical channel */
#define DTCH 3 // LCID #define DTCH0 4 // DRB0
/*!\brief MCCH logical channel */ /*!\brief DTCH1 DRB1 logical channel */
#define MCCH 4 #define DTCH1 5 // DRB1
/*!\brief MTCH logical channel */
#define MTCH 1 // DLSCH LCHAN ID all the same as NB-IoT
// DLSCH LCHAN ID
/*!\brief LCID of UE contention resolution identity for DLSCH*/ /*!\brief LCID of UE contention resolution identity for DLSCH*/
#define UE_CONT_RES 28 #define UE_CONT_RES 28
/*!\brief LCID of timing advance for DLSCH */ /*!\brief LCID of timing advance for DLSCH */
...@@ -327,29 +250,14 @@ typedef struct { ...@@ -327,29 +250,14 @@ typedef struct {
/*!\brief LCID of padding LCID for DLSCH */ /*!\brief LCID of padding LCID for DLSCH */
#define SHORT_PADDING 31 #define SHORT_PADDING 31
#if defined(Rel10) || defined(Rel14) //MCH/CC not defined in NB-IoT
// MCH LCHAN IDs (table6.2.1-4 TS36.321)
/*!\brief LCID of MCCH for DL */
#define MCCH_LCHANID 0
/*!\brief LCID of MCH scheduling info for DL */
#define MCH_SCHDL_INFO 3
/*!\brief LCID of Carrier component activation/deactivation */
#define CC_ACT_DEACT 27
#endif
// ULSCH LCHAN IDs // ULSCH LCHAN IDs the EXTENDED_POWER_HEADROOM POWER_HEADROOM TRUNCATED_BSR LONG_BSR is not used in NB-IoT
/*!\brief LCID of extended power headroom for ULSCH */
#define EXTENDED_POWER_HEADROOM 25
/*!\brief LCID of power headroom for ULSCH */
#define POWER_HEADROOM 26
/*!\brief LCID of CRNTI for ULSCH */ /*!\brief LCID of CRNTI for ULSCH */
#define CRNTI 27 #define CRNTI 27
/*!\brief LCID of truncated BSR for ULSCH */
#define TRUNCATED_BSR 28
/*!\brief LCID of short BSR for ULSCH */ /*!\brief LCID of short BSR for ULSCH */
#define SHORT_BSR 29 #define SHORT_BSR 29
/*!\brief LCID of long BSR for ULSCH */
#define LONG_BSR 30
/*!\bitmaps for BSR Triggers */ /*!\bitmaps for BSR Triggers */
#define BSR_TRIGGER_NONE (0) /* No BSR Trigger */ #define BSR_TRIGGER_NONE (0) /* No BSR Trigger */
#define BSR_TRIGGER_REGULAR (1) /* For Regular and ReTxBSR Expiry Triggers */ #define BSR_TRIGGER_REGULAR (1) /* For Regular and ReTxBSR Expiry Triggers */
...@@ -361,53 +269,38 @@ typedef struct { ...@@ -361,53 +269,38 @@ typedef struct {
typedef struct { typedef struct {
int8_t payload[8][SCH_PAYLOAD_SIZE_MAX]; int8_t payload[8][SCH_PAYLOAD_SIZE_MAX];
uint16_t Pdu_size[8]; uint16_t Pdu_size[8];
} __attribute__ ((__packed__)) DLSCH_PDU; } __attribute__ ((__packed__)) DLSCH_PDU_NB;
/*! \brief MCH PDU Structure */ /*MCH is not defined in NB-IoT*/
typedef struct {
int8_t payload[SCH_PAYLOAD_SIZE_MAX];
uint16_t Pdu_size;
uint8_t mcs;
uint8_t sync_area;
uint8_t msi_active;
uint8_t mcch_active;
uint8_t mtch_active;
} __attribute__ ((__packed__)) MCH_PDU;
/*! \brief Uplink SCH PDU Structure */ /*! \brief Uplink SCH PDU Structure */
typedef struct { typedef struct {
int8_t payload[SCH_PAYLOAD_SIZE_MAX]; /*!< \brief SACH payload */ int8_t payload[SCH_PAYLOAD_SIZE_MAX]; /*!< \brief SACH payload */
uint16_t Pdu_size; uint16_t Pdu_size;
} __attribute__ ((__packed__)) ULSCH_PDU; } __attribute__ ((__packed__)) ULSCH_PDU_NB;
#include "PHY/impl_defs_top.h" #include "PHY/impl_defs_top.h"
/*!\brief UE ULSCH scheduling states*/ /*!\brief UE ULSCH scheduling states*/
typedef enum { typedef enum {
S_UL_NONE =0, S_UL_NONE =0,// used in rrc_mac_remove_ue
S_UL_WAITING, S_UL_WAITING,// used in add_new_ue
S_UL_SCHEDULED, S_UL_SCHEDULED,// used in scheudle_ulsch_rnti
S_UL_BUFFERED, S_UL_BUFFERED,// not used
S_UL_NUM_STATUS S_UL_NUM_STATUS// not used
} UE_ULSCH_STATUS; } UE_ULSCH_STATUS_NB;
/*!\brief UE DLSCH scheduling states*/ /*!\brief UE DLSCH scheduling states*/
typedef enum { typedef enum {
S_DL_NONE =0, S_DL_NONE =0,//used in rrc_mac_remove_ue, scheudle_ue_spec,init_ue_sched_info
S_DL_WAITING, S_DL_WAITING,//used in schedule_next_dlue,fill_DLSCH_dci,add_new_ue
S_DL_SCHEDULED, S_DL_SCHEDULED,//used in scheudle_ue_spec,fill_DLSCH_dci
S_DL_BUFFERED, S_DL_BUFFERED,//used in schedule_next_dlue
S_DL_NUM_STATUS S_DL_NUM_STATUS// not used
} UE_DLSCH_STATUS; } UE_DLSCH_STATUS_NB;
/*!\brief scheduling policy for the contention-based access */ /*!\brief scheduling policy for the contention-based access */
typedef enum { /*CBA is not defined in NB-IoT*/
CBA_ES=0, /// equal share of RB among groups w
CBA_ES_S, /// equal share of RB among groups with small allocation
CBA_PF, /// proportional fair (kind of)
CBA_PF_S, /// proportional fair (kind of) with small RB allocation
CBA_RS /// random allocation
} CBA_POLICY;
/*! \brief temporary struct for ULSCH sched */ /*! \brief temporary struct for ULSCH sched */
...@@ -416,7 +309,7 @@ typedef struct { ...@@ -416,7 +309,7 @@ typedef struct {
uint16_t subframe; uint16_t subframe;
uint16_t serving_num; uint16_t serving_num;
UE_ULSCH_STATUS status; UE_ULSCH_STATUS status;
} eNB_ULSCH_INFO; } eNB_ULSCH_INFO_NB;
/*! \brief temp struct for DLSCH sched */ /*! \brief temp struct for DLSCH sched */
typedef struct { typedef struct {
rnti_t rnti; rnti_t rnti;
...@@ -424,7 +317,7 @@ typedef struct { ...@@ -424,7 +317,7 @@ typedef struct {
uint16_t subframe; uint16_t subframe;
uint16_t serving_num; uint16_t serving_num;
UE_DLSCH_STATUS status; UE_DLSCH_STATUS status;
} eNB_DLSCH_INFO; } eNB_DLSCH_INFO_NB;
/*! \brief eNB overall statistics */ /*! \brief eNB overall statistics */
typedef struct { typedef struct {
/// num BCCH PDU per CC /// num BCCH PDU per CC
...@@ -441,15 +334,15 @@ typedef struct { ...@@ -441,15 +334,15 @@ typedef struct {
/// BCCH buffer size /// BCCH buffer size
uint32_t ccch_buffer; uint32_t ccch_buffer;
/// total BCCH buffer size /// total BCCH buffer size
uint32_t total_ccch_buffer; uint32_t total_ccch_buffertotal_ccch_buffer;
/// BCCH MCS /// BCCH MCS
uint32_t ccch_mcs; uint32_t ccch_mcs;
/// num active users /// num active users
uint16_t num_dlactive_UEs; uint16_t num_dlactive_UEs;
/// available number of PRBs for a give SF /// available number of PRBs for a give SF fix to 1 in NB-IoT
uint16_t available_prbs; uint16_t available_prbs;
/// total number of PRB available for the user plane /// total number of PRB available for the user plane in NB-IoT
uint32_t total_available_prbs; uint32_t total_available_prbs;
/// aggregation /// aggregation
/// total avilable nccc : num control channel element /// total avilable nccc : num control channel element
...@@ -489,7 +382,7 @@ typedef struct { ...@@ -489,7 +382,7 @@ typedef struct {
/// missed deadlines /// missed deadlines
int missed_deadlines; int missed_deadlines;
} eNB_STATS; } eNB_STATS_NB;
/*! \brief eNB statistics for the connected UEs*/ /*! \brief eNB statistics for the connected UEs*/
typedef struct { typedef struct {
...@@ -497,15 +390,15 @@ typedef struct { ...@@ -497,15 +390,15 @@ typedef struct {
rnti_t crnti; ///user id (rnti) of connected UEs rnti_t crnti; ///user id (rnti) of connected UEs
// rrc status // rrc status
uint8_t rrc_status; uint8_t rrc_status;
/// harq pid /// harq pid set to 1 in NB-IoT
uint8_t harq_pid; uint8_t harq_pid;
/// harq rounf /// harq rounf
uint8_t harq_round; uint8_t harq_round;
/// DL Wideband CQI index (2 TBs) /// DL Wideband CQI index (2 TBs)
uint8_t dl_cqi; //uint8_t dl_cqi;
/// total available number of PRBs for a new transmission /// total available number of PRBs for a new transmission fix to 1 in NB-IoT
uint16_t rbs_used; uint16_t rbs_used;
/// total available number of PRBs for a retransmission /// total available number of PRBs for a retransmission fix to 1 in NB-IoT
uint16_t rbs_used_retx; uint16_t rbs_used_retx;
/// total nccc used for a new transmission: num control channel element /// total nccc used for a new transmission: num control channel element
uint16_t ncce_used; uint16_t ncce_used;
...@@ -615,7 +508,7 @@ typedef struct { ...@@ -615,7 +508,7 @@ typedef struct {
/// num of error pdus /// num of error pdus
uint32_t total_num_errors_rx; uint32_t total_num_errors_rx;
} eNB_UE_STATS; } eNB_UE_STATS_NB;
/*! \brief eNB template for UE context information */ /*! \brief eNB template for UE context information */
typedef struct { typedef struct {
/// C-RNTI of UE /// C-RNTI of UE
...@@ -630,10 +523,10 @@ typedef struct { ...@@ -630,10 +523,10 @@ typedef struct {
boolean_t configured; boolean_t configured;
/// MCS from last scheduling /// MCS from last scheduling
uint8_t mcs[8]; //Modify uint8_t mcs[8];
/// TPC from last scheduling /// TPC from last scheduling
uint8_t oldTPC[8]; //Delete uint8_t oldTPC[8];
// PHY interface info // PHY interface info
...@@ -649,22 +542,22 @@ typedef struct { ...@@ -649,22 +542,22 @@ typedef struct {
/// DCI buffer for DLSCH /// DCI buffer for DLSCH
/* rounded to 32 bits unit (actual value should be 8 due to the logic /* rounded to 32 bits unit (actual value should be 8 due to the logic
* of the function generate_dci0) */ * of the function generate_dci0) */
uint8_t DLSCH_DCI[8][(((MAX_DCI_SIZE_BITS)+31)>>5)*4]; //Modifyuint8_t DLSCH_DCI[8][(((MAX_DCI_SIZE_BITS)+31)>>5)*4];
/// Number of Allocated RBs for DL after scheduling (prior to frequency allocation) /// Number of Allocated RBs for DL after scheduling (prior to frequency allocation)
uint16_t nb_rb[8]; // num_max_harq //Delete uint16_t nb_rb[8]; // num_max_harq
/// Number of Allocated RBs for UL after scheduling (prior to frequency allocation) /// Number of Allocated RBs for UL after scheduling (prior to frequency allocation)
uint16_t nb_rb_ul[8]; // num_max_harq //Delete uint16_t nb_rb_ul[8]; // num_max_harq
/// Number of Allocated RBs by the ulsch preprocessor /// Number of Allocated RBs by the ulsch preprocessor
uint8_t pre_allocated_nb_rb_ul; //Delete uint8_t pre_allocated_nb_rb_ul;
/// index of Allocated RBs by the ulsch preprocessor /// index of Allocated RBs by the ulsch preprocessor
int8_t pre_allocated_rb_table_index_ul; //Delete int8_t pre_allocated_rb_table_index_ul;
/// total allocated RBs /// total allocated RBs
int8_t total_allocated_rbs; //Delete int8_t total_allocated_rbs;
/// pre-assigned MCS by the ulsch preprocessor /// pre-assigned MCS by the ulsch preprocessor
uint8_t pre_assigned_mcs_ul; uint8_t pre_assigned_mcs_ul;
...@@ -675,19 +568,19 @@ typedef struct { ...@@ -675,19 +568,19 @@ typedef struct {
/// DCI buffer for ULSCH /// DCI buffer for ULSCH
/* rounded to 32 bits unit (actual value should be 8 due to the logic /* rounded to 32 bits unit (actual value should be 8 due to the logic
* of the function generate_dci0) */ * of the function generate_dci0) */
uint8_t ULSCH_DCI[8][(((MAX_DCI_SIZE_BITS)+31)>>5)*4]; //Modify uint8_t ULSCH_DCI[8][(((MAX_DCI_SIZE_BITS)+31)>>5)*4];
/// DL DAI /// DL DAI
uint8_t DAI; //Delete uint8_t DAI;
/// UL DAI /// UL DAI
uint8_t DAI_ul[10]; //Delete uint8_t DAI_ul[10];
/// UL Scheduling Request Received /// UL Scheduling Request Received
uint8_t ul_SR; //Delete uint8_t ul_SR;
///Resource Block indication for each sub-band in MU-MIMO /// Resource Block indication for each sub-band in MU-MIMO
uint8_t rballoc_subband[8][50]; //Delete uint8_t rballoc_subband[8][50];
// Logical channel info for link with RLC // Logical channel info for link with RLC
...@@ -695,13 +588,13 @@ typedef struct { ...@@ -695,13 +588,13 @@ typedef struct {
uint8_t bsr_info[MAX_NUM_LCGID]; uint8_t bsr_info[MAX_NUM_LCGID];
/// LCGID mapping /// LCGID mapping
long lcgidmap[11]; //Delete long lcgidmap[11];
/// phr information /// phr information, received from DPR MAC control element
int8_t phr_info; int8_t phr_info_DPR;
/// phr information /// phr information, received from DPR MAC control element
int8_t phr_info_configured; int8_t phr_info_configured_DPR;
///dl buffer info ///dl buffer info
uint32_t dl_buffer_info[MAX_NUM_LCID]; uint32_t dl_buffer_info[MAX_NUM_LCID];
...@@ -733,15 +626,14 @@ typedef struct { ...@@ -733,15 +626,14 @@ typedef struct {
int32_t ue_tx_power; int32_t ue_tx_power;
/// stores the frame where the last TPC was transmitted /// stores the frame where the last TPC was transmitted
uint32_t pusch_tpc_tx_frame; //Delete uint32_t pusch_tpc_tx_frame;
uint32_t pusch_tpc_tx_subframe; //Delete uint32_t pusch_tpc_tx_subframe;
uint32_t pucch_tpc_tx_frame; //Delete uint32_t pucch_tpc_tx_frame;
uint32_t pucch_tpc_tx_subframe; //Delete uint32_t pucch_tpc_tx_subframe;
#ifdef LOCALIZATION //Delete eNB_UE_estimated_distances distance;
eNB_UE_estimated_distances distance;
#endif } UE_TEMPLATE_NB;
} UE_TEMPLATE;
/*! \brief scheduling control information set through an API (not used)*/ /*! \brief scheduling control information set through an API (not used)*/
typedef struct { typedef struct {
...@@ -760,11 +652,11 @@ typedef struct { ...@@ -760,11 +652,11 @@ typedef struct {
///aggregated bit rate of non-gbr bearer per UE ///aggregated bit rate of non-gbr bearer per UE
uint64_t ue_AggregatedMaximumBitrateUL; uint64_t ue_AggregatedMaximumBitrateUL;
///CQI scheduling interval in subframes. ///CQI scheduling interval in subframes.
uint16_t cqiSchedInterval; //Delete uint16_t cqiSchedInterval;
///Contention resolution timer used during random access ///Contention resolution timer used during random access
uint8_t mac_ContentionResolutionTimer; uint8_t mac_ContentionResolutionTimer;
uint16_t max_allowed_rbs[MAX_NUM_LCID]; //Delete uint16_t max_allowed_rbs[MAX_NUM_LCID];
uint8_t max_mcs[MAX_NUM_LCID]; uint8_t max_mcs[MAX_NUM_LCID];
...@@ -774,19 +666,19 @@ typedef struct { ...@@ -774,19 +666,19 @@ typedef struct {
uint8_t harq_pid[MAX_NUM_CCs]; uint8_t harq_pid[MAX_NUM_CCs];
uint8_t round[MAX_NUM_CCs]; uint8_t round[MAX_NUM_CCs];
uint8_t dl_pow_off[MAX_NUM_CCs]; uint8_t dl_pow_off[MAX_NUM_CCs];
uint16_t pre_nb_available_rbs[MAX_NUM_CCs]; //Delete uint16_t pre_nb_available_rbs[MAX_NUM_CCs];
unsigned char rballoc_sub_UE[MAX_NUM_CCs][N_RBG_MAX]; //Delete unsigned char rballoc_sub_UE[MAX_NUM_CCs][N_RBG_MAX];
uint16_t ta_timer; uint16_t ta_timer;
int16_t ta_update; int16_t ta_update;
int32_t context_active_timer; int32_t context_active_timer;
int32_t cqi_req_timer; //Delete int32_t cqi_req_timer;
int32_t ul_inactivity_timer; int32_t ul_inactivity_timer;
int32_t ul_failure_timer; int32_t ul_failure_timer;
int32_t ul_scheduled; int32_t ul_scheduled;
int32_t ra_pdcch_order_sent; int32_t ra_pdcch_order_sent;
int32_t ul_out_of_sync; int32_t ul_out_of_sync;
int32_t phr_received; int32_t phr_received;// received from Msg3 MAC Control Element
} UE_sched_ctrl; } UE_sched_ctrl_NB;
/*! \brief eNB template for the Random access information */ /*! \brief eNB template for the Random access information */
typedef struct { typedef struct {
/// Flag to indicate this process is active /// Flag to indicate this process is active
...@@ -809,7 +701,7 @@ typedef struct { ...@@ -809,7 +701,7 @@ typedef struct {
uint8_t RA_dci_fmt2; uint8_t RA_dci_fmt2;
/// Flag to indicate the eNB should generate RAR. This is triggered by detection of PRACH /// Flag to indicate the eNB should generate RAR. This is triggered by detection of PRACH
uint8_t generate_rar; uint8_t generate_rar;
/// Subframe where preamble was received /// Subframe where preamble was received, Delete?
uint8_t preamble_subframe; uint8_t preamble_subframe;
/// Subframe where Msg3 is to be sent /// Subframe where Msg3 is to be sent
uint8_t Msg3_subframe; uint8_t Msg3_subframe;
...@@ -821,25 +713,19 @@ typedef struct { ...@@ -821,25 +713,19 @@ typedef struct {
rnti_t rnti; rnti_t rnti;
/// RA RNTI allocated from received PRACH /// RA RNTI allocated from received PRACH
uint16_t RA_rnti; uint16_t RA_rnti;
/// Received preamble_index /// Delete Received preamble_index, use subcarrier index?
uint8_t preamble_index;
/// Received UE Contention Resolution Identifier /// Received UE Contention Resolution Identifier
uint8_t cont_res_id[6]; uint8_t cont_res_id[6];
/// Timing offset indicated by PHY /// Timing offset indicated by PHY
int16_t timing_offset; int16_t timing_offset;
/// Timeout for RRC connection /// Timeout for RRC connection
int16_t RRC_timer; int16_t RRC_timer;
} RA_TEMPLATE; } RA_TEMPLATE_NB;
/*! \brief subband bitmap confguration (for ALU icic algo purpose), in test phase */ /*! \Delete struct SBMAP_CONF, brief subband bitmap confguration (for ALU icic algo purpose), in test phase */
typedef struct {
uint8_t sbmap[NUMBER_OF_SUBBANDS_MAX]; //13 = number of SB MAX for 100 PRB
uint8_t periodicity;
uint8_t first_subframe;
uint8_t sb_size;
uint8_t nb_active_sb;
} SBMAP_CONF;
/*! \brief UE list used by eNB to order UEs/CC for scheduling*/ /*! \brief UE list used by eNB to order UEs/CC for scheduling*/
typedef struct { typedef struct {
/// DLSCH pdu /// DLSCH pdu
...@@ -848,16 +734,16 @@ typedef struct { ...@@ -848,16 +734,16 @@ typedef struct {
UE_TEMPLATE UE_template[MAX_NUM_CCs][NUMBER_OF_UE_MAX]; UE_TEMPLATE UE_template[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
/// DCI template and MAC connection for RA processes /// DCI template and MAC connection for RA processes
int pCC_id[NUMBER_OF_UE_MAX]; int pCC_id[NUMBER_OF_UE_MAX];
/// sorted downlink component carrier for the scheduler /// Delete sorted downlink component carrier for the scheduler
int ordered_CCids[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
/// number of downlink active component carrier /// Delete number of downlink active component carrier
int numactiveCCs[NUMBER_OF_UE_MAX];
/// sorted uplink component carrier for the scheduler /// Delete sorted uplink component carrier for the scheduler
int ordered_ULCCids[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
/// number of uplink active component carrier /// Delete number of uplink active component carrier
int numactiveULCCs[NUMBER_OF_UE_MAX];
/// number of downlink active component carrier /// Delete number of downlink active component carrier
uint8_t dl_CC_bitmap[NUMBER_OF_UE_MAX];
/// eNB to UE statistics /// eNB to UE statistics
eNB_UE_STATS eNB_UE_stats[MAX_NUM_CCs][NUMBER_OF_UE_MAX]; eNB_UE_STATS eNB_UE_stats[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
/// scheduling control info /// scheduling control info
...@@ -870,7 +756,7 @@ typedef struct { ...@@ -870,7 +756,7 @@ typedef struct {
int avail; int avail;
int num_UEs; int num_UEs;
boolean_t active[NUMBER_OF_UE_MAX]; boolean_t active[NUMBER_OF_UE_MAX];
} UE_list_t; } UE_list_t_NB;
/*! \brief eNB common channels */ /*! \brief eNB common channels */
typedef struct { typedef struct {
...@@ -883,43 +769,43 @@ typedef struct { ...@@ -883,43 +769,43 @@ typedef struct {
/// Outgoing CCCH pdu for PHY /// Outgoing CCCH pdu for PHY
CCCH_PDU CCCH_pdu; CCCH_PDU CCCH_pdu;
RA_TEMPLATE RA_template[NB_RA_PROC_MAX]; RA_TEMPLATE RA_template[NB_RA_PROC_MAX];
/// VRB map for common channels /// Delete VRB map for common channels
uint8_t vrb_map[100];
/// MBSFN SubframeConfig /// Delete MBSFN SubframeConfig
struct MBSFN_SubframeConfig *mbsfn_SubframeConfig[8];
/// number of subframe allocation pattern available for MBSFN sync area /// Delete number of subframe allocation pattern available for MBSFN sync area
uint8_t num_sf_allocation_pattern;
#if defined(Rel10) || defined(Rel14) // #if defined(Rel10) || defined(Rel14)
/// MBMS Flag /// Delete MBMS Flag
uint8_t MBMS_flag;
/// Outgoing MCCH pdu for PHY /// Delete Outgoing MCCH pdu for PHY
MCCH_PDU MCCH_pdu;
/// MCCH active flag /// Delete MCCH active flag
uint8_t msi_active;
/// MCCH active flag /// Delete MCCH active flag
uint8_t mcch_active;
/// MTCH active flag /// Delete MTCH active flag
uint8_t mtch_active;
/// number of active MBSFN area /// Delete number of active MBSFN area
uint8_t num_active_mbsfn_area;
/// MBSFN Area Info /// Delete MBSFN Area Info
struct MBSFN_AreaInfo_r9 *mbsfn_AreaInfo[MAX_MBSFN_AREA];
/// PMCH Config /// Delete PMCH Config
struct PMCH_Config_r9 *pmch_Config[MAX_PMCH_perMBSFN];
/// MBMS session info list /// Delete MBMS session info list
struct MBMS_SessionInfoList_r9 *mbms_SessionList[MAX_PMCH_perMBSFN];
/// Outgoing MCH pdu for PHY /// Delete Outgoing MCH pdu for PHY
MCH_PDU MCH_pdu;
#endif // #endif
#ifdef CBA // #ifdef CBA
/// number of CBA groups /// Delete number of CBA groups
uint8_t num_active_cba_groups;
/// RNTI for each CBA group /// Delete RNTI for each CBA group
uint16_t cba_rnti[NUM_MAX_CBA_GROUP];
/// MCS for each CBA group /// Delete MCS for each CBA group
uint8_t group_mcs[NUM_MAX_CBA_GROUP];
#endif // #endif
} COMMON_channels_t; } COMMON_channels_t_NB;
/*! \brief top level eNB MAC structure */ /*! \brief top level eNB MAC structure */
typedef struct { typedef struct {
/// ///
...@@ -932,10 +818,11 @@ typedef struct { ...@@ -932,10 +818,11 @@ typedef struct {
COMMON_channels_t common_channels[MAX_NUM_CCs]; COMMON_channels_t common_channels[MAX_NUM_CCs];
UE_list_t UE_list; UE_list_t UE_list;
///subband bitmap configuration ///Delete subband bitmap configuration, no related CQI report
SBMAP_CONF sbmap_conf;
/// CCE table used to build DCI scheduling information // / Modify CCE table used to build DCI scheduling information
int CCE_table[MAX_NUM_CCs][800]; int CCE_table[MAX_NUM_CCs][12];//180 khz for Anchor carrier
/// active flag for Other lcid /// active flag for Other lcid
uint8_t lcid_active[NB_RB_MAX]; uint8_t lcid_active[NB_RB_MAX];
/// eNB stats /// eNB stats
...@@ -955,12 +842,12 @@ typedef struct { ...@@ -955,12 +842,12 @@ typedef struct {
time_stats_t schedule_dlsch_preprocessor; time_stats_t schedule_dlsch_preprocessor;
/// processing time of eNB DLSCH scheduler /// processing time of eNB DLSCH scheduler
time_stats_t schedule_dlsch; // include rlc_data_req + MAC header + preprocessor time_stats_t schedule_dlsch; // include rlc_data_req + MAC header + preprocessor
/// processing time of eNB MCH scheduler /// Delete processing time of eNB MCH scheduler
time_stats_t schedule_mch;
/// processing time of eNB ULSCH reception /// processing time of eNB ULSCH reception
time_stats_t rx_ulsch_sdu; // include rlc_data_ind time_stats_t rx_ulsch_sdu; // include rlc_data_ind
} eNB_MAC_INST; } eNB_MAC_INST_NB;
/* /*
* UE part * UE part
...@@ -972,7 +859,7 @@ typedef enum { ...@@ -972,7 +859,7 @@ typedef enum {
CONNECTION_LOST, CONNECTION_LOST,
PHY_RESYNCH, PHY_RESYNCH,
PHY_HO_PRACH PHY_HO_PRACH
} UE_L2_STATE_t; } UE_L2_STATE_t_NB;
/*!\brief UE scheduling info */ /*!\brief UE scheduling info */
typedef struct { typedef struct {
...@@ -986,10 +873,10 @@ typedef struct { ...@@ -986,10 +873,10 @@ typedef struct {
uint16_t All_lcid_buffer_size_lastTTI; uint16_t All_lcid_buffer_size_lastTTI;
/// buffer status for each lcid /// buffer status for each lcid
uint8_t LCID_status[MAX_NUM_LCID]; uint8_t LCID_status[MAX_NUM_LCID];
/// SR pending as defined in 36.321 /// Delete SR pending as defined in 36.321
uint8_t SR_pending;
/// SR_COUNTER as defined in 36.321 /// Delete SR_COUNTER as defined in 36.321
uint16_t SR_COUNTER;
/// logical channel group ide for each LCID /// logical channel group ide for each LCID
uint8_t LCGID[MAX_NUM_LCID]; uint8_t LCGID[MAX_NUM_LCID];
/// retxBSR-Timer, default value is sf2560 /// retxBSR-Timer, default value is sf2560
...@@ -1000,41 +887,42 @@ typedef struct { ...@@ -1000,41 +887,42 @@ typedef struct {
uint16_t periodicBSR_Timer; uint16_t periodicBSR_Timer;
/// periodicBSR_SF, number of subframe before triggering a periodic BSR /// periodicBSR_SF, number of subframe before triggering a periodic BSR
uint16_t periodicBSR_SF; uint16_t periodicBSR_SF;
/// default value is 0: not configured /// Delete sr_ProhibitTimer in MAC_MainConfig, default value is 0: not configured
uint16_t sr_ProhibitTimer;
/// sr ProhibitTime running /// Delete sr ProhibitTime running
uint8_t sr_ProhibitTimer_Running;
/// default value to n5 /// Delete maxHARQ_Tx in MAC_MainConfig, default value to n5
uint16_t maxHARQ_Tx;
/// default value is false /// delete ttiBundling in MAC_MainConfig, default value is false
uint16_t ttiBundling;
/// default value is release /// default value is release
struct DRX_Config *drx_config; struct DRX_Config *drx_config;
/// default value is release /// Delete phr_config in MAC_MainConfig, default value is release
struct MAC_MainConfig__phr_Config *phr_config;
///timer before triggering a periodic PHR ///Delete timer before triggering a periodic PHR
uint16_t periodicPHR_Timer;
///timer before triggering a prohibit PHR ///Delete timer before triggering a prohibit PHR
uint16_t prohibitPHR_Timer;
///DL Pathloss change value ///DL Pathloss change value
uint16_t PathlossChange; uint16_t PathlossChange;
///number of subframe before triggering a periodic PHR ///Delete number of subframe before triggering a periodic PHR
int16_t periodicPHR_SF;
///number of subframe before triggering a prohibit PHR ///Delete number of subframe before triggering a prohibit PHR
int16_t prohibitPHR_SF;
///DL Pathloss Change in db ///DL Pathloss Change in db
uint16_t PathlossChange_db; uint16_t PathlossChange_db;
/// default value is false /// Delete extendedBSR_Sizes_r10, default value is false, only support short BSR
uint16_t extendedBSR_Sizes_r10;
/// default value is false
uint16_t extendedPHR_r10;
//Bj bucket usage per lcid /// Delete extendedPHR_r10, default value is false
int16_t Bj[MAX_NUM_LCID];
// Bucket size per lcid
int16_t bucket_size[MAX_NUM_LCID]; //For NB-IoT in TS 36.321, prioritisedBitRate, bucketSizeDuration and the corresponding steps of the Logical Channel Prioritisation procedure (i.e., Step 1 and Step 2 below) are not applicable.
} UE_SCHEDULING_INFO; //Delete Bj bucket usage per lcid,
//Delete Bucket size per lcid
} UE_SCHEDULING_INFO_NB;
/*!\brief Top level UE MAC structure */ /*!\brief Top level UE MAC structure */
typedef struct { typedef struct {
uint16_t Node_id; uint16_t Node_id;
...@@ -1048,8 +936,8 @@ typedef struct { ...@@ -1048,8 +936,8 @@ typedef struct {
sub_frame_t txSubframe; sub_frame_t txSubframe;
/// C-RNTI of UE /// C-RNTI of UE
uint16_t crnti; uint16_t crnti;
/// C-RNTI of UE before HO /// Delete C-RNTI of UE before HO
rnti_t crnti_before_ho; ///user id (rnti) of connected UEs
/// uplink active flag /// uplink active flag
uint8_t ul_active; uint8_t ul_active;
/// pointer to RRC PHY configuration /// pointer to RRC PHY configuration
...@@ -1059,19 +947,19 @@ typedef struct { ...@@ -1059,19 +947,19 @@ typedef struct {
/// pointer to RRC PHY configuration /// pointer to RRC PHY configuration
struct PhysicalConfigDedicated *physicalConfigDedicated; struct PhysicalConfigDedicated *physicalConfigDedicated;
#if defined(Rel10) || defined(Rel14) #if defined(Rel10) || defined(Rel14)
/// pointer to RRC PHY configuration SCEll /// Delete pointer to RRC PHY configuration SCEll
struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10;
#endif #endif
/// pointer to TDD Configuration (NULL for FDD) /// Delete pointer to TDD Configuration (NULL for FDD)
TDD_Config_t *tdd_Config;
/// Number of adjacent cells to measure /// Delete Number of adjacent cells to measure
uint8_t n_adj_cells;
/// Array of adjacent physical cell ids /// Delete Array of adjacent physical cell ids
uint32_t adj_cell_id[6];
/// Pointer to RRC MAC configuration /// Pointer to RRC MAC configuration
MAC_MainConfig_t *macConfig; MAC_MainConfig_t *macConfig;
/// Pointer to RRC Measurement gap configuration /// Delete Pointer to RRC Measurement gap configuration
MeasGapConfig_t *measGapConfig;
/// Pointers to LogicalChannelConfig indexed by LogicalChannelIdentity. Note NULL means LCHAN is inactive. /// Pointers to LogicalChannelConfig indexed by LogicalChannelIdentity. Note NULL means LCHAN is inactive.
LogicalChannelConfig_t *logicalChannelConfig[MAX_NUM_LCID]; LogicalChannelConfig_t *logicalChannelConfig[MAX_NUM_LCID];
/// Scheduling Information /// Scheduling Information
...@@ -1088,12 +976,12 @@ typedef struct { ...@@ -1088,12 +976,12 @@ typedef struct {
int8_t RA_window_cnt; int8_t RA_window_cnt;
/// Random-access Msg3 size in bytes /// Random-access Msg3 size in bytes
uint8_t RA_Msg3_size; uint8_t RA_Msg3_size;
/// Random-access prachMaskIndex /// delete Random-access prachMaskIndex, NB use subcarrier index
uint8_t RA_prachMaskIndex;
/// Flag indicating Preamble set (A,B) used for first Msg3 transmission /// Flag indicating Preamble set (A,B) used for first Msg3 transmission
uint8_t RA_usedGroupA; uint8_t RA_usedGroupA;
/// Random-access Resources /// Delete Random-access Resources, cause it use for ra_PreambleIndex and ra_RACH_MaskIndex.
PRACH_RESOURCES_t RA_prach_resources;
/// Random-access PREAMBLE_TRANSMISSION_COUNTER /// Random-access PREAMBLE_TRANSMISSION_COUNTER
uint8_t RA_PREAMBLE_TRANSMISSION_COUNTER; uint8_t RA_PREAMBLE_TRANSMISSION_COUNTER;
/// Random-access backoff counter /// Random-access backoff counter
...@@ -1128,52 +1016,48 @@ typedef struct { ...@@ -1128,52 +1016,48 @@ typedef struct {
/// periodBSR-Timer expires flag /// periodBSR-Timer expires flag
uint8_t periodBSRTimer_expires_flag; uint8_t periodBSRTimer_expires_flag;
/// MBSFN_Subframe Configuration /// Delete MBSFN_Subframe Configuration
struct MBSFN_SubframeConfig *mbsfn_SubframeConfig[8]; // FIXME replace 8 by MAX_MBSFN_AREA?
/// number of subframe allocation pattern available for MBSFN sync area /// Delete number of subframe allocation pattern available for MBSFN sync area
uint8_t num_sf_allocation_pattern;
#if defined(Rel10) || defined(Rel14)
/// number of active MBSFN area // #if defined(Rel10) || defined(Rel14)
uint8_t num_active_mbsfn_area; /// Delete number of active MBSFN area
/// MBSFN Area Info
struct MBSFN_AreaInfo_r9 *mbsfn_AreaInfo[MAX_MBSFN_AREA]; /// Delete MBSFN Area Info
/// PMCH Config
struct PMCH_Config_r9 *pmch_Config[MAX_PMCH_perMBSFN]; /// Delete PMCH Config
/// MCCH status
uint8_t mcch_status; /// Delete MCCH status
/// MSI status
uint8_t msi_status;// could be an array if there are >1 MCH in one MBSFN area /// Delete MSI status
#endif
// #endif
/// Delete UE query for MCH subframe processing time
//#ifdef CBA //#ifdef CBA
/// CBA RNTI for each group /// CBA RNTI for each group
uint16_t cba_rnti[NUM_MAX_CBA_GROUP];
/// last SFN for CBA channel access /// Delete last SFN for CBA channel access
uint8_t cba_last_access[NUM_MAX_CBA_GROUP];
//#endif //#endif
/// total UE scheduler processing time /// total UE scheduler processing time
time_stats_t ue_scheduler; // total time_stats_t ue_scheduler; // total
/// UE ULSCH tx processing time inlcuding RLC interface (rlc_data_req) and mac header generation /// UE ULSCH tx processing time inlcuding RLC interface (rlc_data_req) and mac header generation
time_stats_t tx_ulsch_sdu; time_stats_t tx_ulsch_sdu;
/// UE DLSCH rx processing time inlcuding RLC interface (mac_rrc_data_ind or mac_rlc_status_ind+mac_rlc_data_ind) and mac header parser /// UE DLSCH rx processing time inlcuding RLC interface (mac_rrc_data_ind or mac_rlc_status_ind+mac_rlc_data_ind) and mac header parser
time_stats_t rx_dlsch_sdu ; time_stats_t rx_dlsch_sdu;
/// UE query for MCH subframe processing time /// Delete UE query for MCH subframe processing time
time_stats_t ue_query_mch;
/// UE MCH rx processing time /* Delete UE MCH rx processing time , no support in NB-IoT*/
time_stats_t rx_mch_sdu;
/// UE BCCH rx processing time including RLC interface (mac_rrc_data_ind) /// UE BCCH rx processing time including RLC interface (mac_rrc_data_ind)
time_stats_t rx_si; time_stats_t rx_si;
/// UE PCCH rx processing time including RLC interface (mac_rrc_data_ind) /// UE PCCH rx processing time including RLC interface (mac_rrc_data_ind)
time_stats_t rx_p; time_stats_t rx_p;
} UE_MAC_INST; } UE_MAC_INST_NB;
/*! \brief ID of the neighboring cells used for HO*/
typedef struct { /* Delete struct neigh_cell_id_t, no support in NB-IoT*/
uint16_t cell_ids[6];
uint8_t n_adj_cells;
} neigh_cell_id_t;
#include "proto.h" #include "proto.h"
/*@}*/ /*@}*/
#endif /*__LAYER2_MAC_DEFS_H__ */ #endif /*__LAYER2_MAC_DEFS_H__ */
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment