maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: avoid cyclic header dependency, use FlexRAN variables instead

Browse Source
This commit is contained in:
Robert Schmidt
2018-01-31 16:48:36 +01:00
parent 6a6729bdac
commit 56d4d0ebef
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
-1
View File
@@ -31,7 +31,6 @@
#ifndef __FLEXRAN_AGENT_RRC_PRIMITIVES_H__ #ifndef __FLEXRAN_AGENT_RRC_PRIMITIVES_H__
#define __FLEXRAN_AGENT_RRC_PRIMITIVES_H__ #define __FLEXRAN_AGENT_RRC_PRIMITIVES_H__
#include "PHY/extern.h"
#include "flexran_agent_defs.h" #include "flexran_agent_defs.h"
#include "flexran.pb-c.h" #include "flexran.pb-c.h"
#include "header.pb-c.h" #include "header.pb-c.h"
openair2/ENB_APP/flexran_agent_extern.h
+3 -4
View File
@@ -30,11 +30,10 @@
#ifndef __FLEXRAN_AGENT_EXTERN_H__ #ifndef __FLEXRAN_AGENT_EXTERN_H__
#define __FLEXRAN_AGENT_EXTERN_H__ #define __FLEXRAN_AGENT_EXTERN_H__
// #include "flexran_agent_defs.h" #include "flexran_agent_defs.h"
#include "flexran_agent_mac_defs.h" #include "flexran_agent_mac_defs.h"
#include "flexran_agent_rrc_defs.h" #include "flexran_agent_rrc_defs.h"
#include "flexran_agent_pdcp_defs.h" #include "flexran_agent_pdcp_defs.h"
#include "common/ran_context.h"
/* Control module interface for the communication of the MAC Control Module with the agent */ /* Control module interface for the communication of the MAC Control Module with the agent */
extern AGENT_MAC_xface *agent_mac_xface[NUM_MAX_ENB]; extern AGENT_MAC_xface *agent_mac_xface[NUM_MAX_ENB];
@@ -55,7 +54,7 @@ extern AGENT_PDCP_xface *agent_pdcp_xface[NUM_MAX_ENB];
extern unsigned int pdcp_agent_registered[NUM_MAX_ENB]; extern unsigned int pdcp_agent_registered[NUM_MAX_ENB];
/* Requried to know which UEs had a harq updated over some subframe */ /* Requried to know which UEs had a harq updated over some subframe */
extern int harq_pid_updated[NUMBER_OF_UE_MAX][8]; extern int harq_pid_updated[NUM_MAX_UE][8];
extern int harq_pid_round[NUMBER_OF_UE_MAX][8]; extern int harq_pid_round[NUM_MAX_UE][8];
#endif #endif