Merge branch 'feature-68-enb-agent' into feature-merge-f68
Try to merge feature-68-enb-agent into develop develop should be fast-forwarded later to this branch to complete the merge This code does not compile yet. Among other things: - the scheduler structure needs to be reworked for FlexRAN - the config is structured differently. The files enb_config.{c,h} from develop have been copied in here, the files with merge annotations are in enb_config.{c,h}.before_merge - the restart needs to be restructured, since the PHY vars data structure lives in RC now
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 12 additions, 2 deletionscmake_targets/CMakeLists.txt
- common/utils/itti/intertask_interface.c 6 additions, 2 deletionscommon/utils/itti/intertask_interface.c
- common/utils/msc/msc.c 1 addition, 0 deletionscommon/utils/msc/msc.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c 539 additions, 782 deletionsopenair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h 8 additions, 40 deletionsopenair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h 8 additions, 3 deletions...air2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c 115 additions, 5 deletions.../ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h 4 additions, 0 deletions.../ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h
- openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c 171 additions, 0 deletionsopenair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c
- openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.h 64 additions, 0 deletionsopenair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.h
- openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp_defs.h 63 additions, 0 deletions...r2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp_defs.h
- openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c 672 additions, 0 deletionsopenair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
- openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.h 70 additions, 0 deletionsopenair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.h
- openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h 70 additions, 0 deletions...air2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
- openair2/ENB_APP/MESSAGES/V2/config_messages.proto 5 additions, 0 deletionsopenair2/ENB_APP/MESSAGES/V2/config_messages.proto
- openair2/ENB_APP/MESSAGES/V2/control_delegation.proto 1 addition, 1 deletionopenair2/ENB_APP/MESSAGES/V2/control_delegation.proto
- openair2/ENB_APP/MESSAGES/V2/controller_commands.proto 7 additions, 1 deletionopenair2/ENB_APP/MESSAGES/V2/controller_commands.proto
- openair2/ENB_APP/MESSAGES/V2/flexran.proto 17 additions, 1 deletionopenair2/ENB_APP/MESSAGES/V2/flexran.proto
- openair2/ENB_APP/MESSAGES/V2/header.proto 2 additions, 0 deletionsopenair2/ENB_APP/MESSAGES/V2/header.proto
- openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto 34 additions, 1 deletionopenair2/ENB_APP/MESSAGES/V2/mac_primitives.proto
Loading
Please register or sign in to comment