Commit eceb1a30 authored by wujing's avatar wujing

openair2 LAYER2 -> MAC

parent e587e316
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include "RRC/NR/rrc_gNB_UE_context.h" #include "RRC/NR/rrc_gNB_UE_context.h"
#include "asn1_msg.h" #include "asn1_msg.h"
#include "intertask_interface.h" #include "intertask_interface.h"
#include "LAYER2/NR_MAC_gNB/mac_proto.h" #include "MAC/NR_SCD_gNB/mac_proto.h"
int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance, int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "rrc_extern.h" #include "rrc_extern.h"
#include "rrc_eNB_UE_context.h" #include "rrc_eNB_UE_context.h"
#include "RRC/NR/rrc_gNB_UE_context.h" #include "RRC/NR/rrc_gNB_UE_context.h"
#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h" #include "MAC/NR_SCD_gNB/nr_mac_gNB.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <openair3/ocp-gtpu/gtp_itf.h>
boolean_t lteDURecvCb( protocol_ctxt_t *ctxt_pP, boolean_t lteDURecvCb( protocol_ctxt_t *ctxt_pP,
......
File moved
...@@ -43,7 +43,7 @@ Description Contains global common definitions ...@@ -43,7 +43,7 @@ Description Contains global common definitions
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
/* boolean_t is also defined in openair2/COMMON/platform_types.h /* boolean_t is also defined in MAC/COMMON/platform_types.h
* let's protect potential redefinition * let's protect potential redefinition
*/ */
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#define RRC_MAC_DRX_CONFIG_REQ(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_drx_config_req #define RRC_MAC_DRX_CONFIG_REQ(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_drx_config_req
// Some constants from "LAYER2/MAC/defs.h" // Some constants from "MAC/SCD/defs.h"
#define BCCH_SDU_SIZE (512) #define BCCH_SDU_SIZE (512)
#define BCCH_SDU_MBMS_SIZE (512) #define BCCH_SDU_MBMS_SIZE (512)
#define CCCH_SDU_SIZE (512) #define CCCH_SDU_SIZE (512)
......
...@@ -52,7 +52,7 @@ in a suspended state or to indicate the current buffer occupancy to MAC. ...@@ -52,7 +52,7 @@ in a suspended state or to indicate the current buffer occupancy to MAC.
*/ */
# include "list.h" # include "list.h"
# include "rrm_constants.h" # include "rrm_constants.h"
//# include "LAYER2/MAC/defs.h" //# include "MAC/SCD/defs.h"
# define MAC_DCCH 0xCC # define MAC_DCCH 0xCC
# define MAC_DTCH 0xDC # define MAC_DTCH 0xDC
......
...@@ -258,7 +258,7 @@ typedef struct { ...@@ -258,7 +258,7 @@ typedef struct {
*@{ *@{
*/ */
//#include "LAYER2/MAC/defs.h" //#include "MAC/SCD/defs.h"
......
File moved
...@@ -41,7 +41,7 @@ typedef void * intptr_t; ...@@ -41,7 +41,7 @@ typedef void * intptr_t;
// GENERIC TYPES // GENERIC TYPES
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/* boolean_t is also defined in openair2/COMMON/commonDef.h, /* boolean_t is also defined in MAC/COMMON/commonDef.h,
* let's protect potential redefinition * let's protect potential redefinition
*/ */
#ifndef _BOOLEAN_T_DEFINED_ #ifndef _BOOLEAN_T_DEFINED_
......
File moved
...@@ -67,12 +67,12 @@ WARN_LOGFILE = ...@@ -67,12 +67,12 @@ WARN_LOGFILE =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options related to the input files # configuration options related to the input files
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = $(OPENAIR2_DIR)/LAYER2/MAC/defs.h \ INPUT = $(OPENAIR_DIR)/SCD/defs.h \
$(OPENAIR2_DIR)/COMMON/mac_rrc_primitives.h \ $(OPENAIR_DIR)/COMMON/mac_rrc_primitives.h \
$(OPENAIR2_DIR)/COMMON/mac_rlc_primitives.h \ $(OPENAIR_DIR)/COMMON/mac_rlc_primitives.h \
$(OPENAIR2_DIR)/LAYER2/MAC/lchan_interface.h \ $(OPENAIR_DIR)/SCD/lchan_interface.h \
$(OPENAIR2_DIR)/PHY_INTERFACE/defs.h \ $(OPENAIR_DIR)/PHY_INTERFACE/defs.h \
$(OPENAIR2_DIR)/NAS/DRIVER/MESH/proto_extern.h \ $(OPENAIR_DIR)/NAS/DRIVER/MESH/proto_extern.h \
FILE_PATTERNS = *.h FILE_PATTERNS = *.h
......
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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