5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moved pdu to common mac folder

Browse Source
master
Francisco Paisana 5 years ago committed by Francisco Paisana
parent c26a70c8da
commit 6ddedd5972
30 changed files with 84 additions and 33 deletions
Show Stats Download Patch File Download Diff File

0
lib/include/srslte/common/mac_nr_pdu.h → lib/include/srslte/mac/mac_nr_pdu.h
Unescape Escape View File

0
lib/include/srslte/common/pdu.h → lib/include/srslte/mac/pdu.h
Unescape Escape View File

2
lib/include/srslte/common/pdu_queue.h → lib/include/srslte/mac/pdu_queue.h
Unescape Escape View File

@ -25,8 +25,8 @@
#include "srslte/common/block_queue.h"
#include "srslte/common/buffer_pool.h"
#include "srslte/common/log.h"
#include "srslte/common/pdu.h"
#include "srslte/common/timers.h"
#include "srslte/mac/pdu.h"
/* Logical Channel Demultiplexing and MAC CE dissassemble */

1
lib/src/CMakeLists.txt
Unescape Escape View File

@ -20,6 +20,7 @@
add_subdirectory(asn1)
add_subdirectory(common)
add_subdirectory(mac)
add_subdirectory(phy)
add_subdirectory(radio)
add_subdirectory(upper)

4
lib/src/common/CMakeLists.txt
Unescape Escape View File

@ -32,8 +32,6 @@ set(SOURCES arch_select.cc
nas_pcap.cc
network_utils.cc
pcap.c
pdu.cc
pdu_queue.cc
rlc_pcap.cc
s1ap_pcap.cc
security.cc
@ -46,7 +44,7 @@ set(SOURCES arch_select.cc
zuc.cc)
if (ENABLE_5GNR)
set(SOURCES ${SOURCES} mac_nr_pcap.cc mac_nr_pdu.cc)
set(SOURCES ${SOURCES} mac_nr_pcap.cc)
endif(ENABLE_5GNR)
# Avoid warnings caused by libmbedtls about deprecated functions

28
lib/src/mac/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,28 @@
#
# Copyright 2013-2020 Software Radio Systems Limited
#
# This file is part of srsLTE
#
# srsLTE is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of
# the License, or (at your option) any later version.
#
# srsLTE is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# A copy of the GNU Affero General Public License can be found in
# the LICENSE file in the top-level directory of this distribution
# and at http://www.gnu.org/licenses/.
#
SET(SOURCES pdu.cc pdu_queue.cc)
if (ENABLE_5GNR)
set(SOURCES ${SOURCES} mac_nr_pdu.cc)
endif(ENABLE_5GNR)
add_library(srslte_mac STATIC ${SOURCES})

2
lib/src/common/mac_nr_pdu.cc → lib/src/mac/mac_nr_pdu.cc
Unescape Escape View File

@ -19,7 +19,7 @@
*
*/
#include "srslte/common/mac_nr_pdu.h"
#include "srslte/mac/mac_nr_pdu.h"
namespace srslte {

2
lib/src/common/pdu.cc → lib/src/mac/pdu.cc
Unescape Escape View File

@ -24,7 +24,7 @@
#include <string.h>
#include <strings.h>
#include "srslte/common/pdu.h"
#include "srslte/mac/pdu.h"
#include "srslte/srslte.h"
// Table 6.1.3.1-1 Buffer size levels for BSR

2
lib/src/common/pdu_queue.cc → lib/src/mac/pdu_queue.cc
Unescape Escape View File

@ -19,7 +19,7 @@
*
*/
#include "srslte/common/pdu_queue.h"
#include "srslte/mac/pdu_queue.h"
#include "srslte/common/log_helper.h"
namespace srslte {

1
lib/test/CMakeLists.txt
Unescape Escape View File

@ -20,5 +20,6 @@
add_subdirectory(asn1)
add_subdirectory(common)
add_subdirectory(mac)
add_subdirectory(phy)
add_subdirectory(upper)

10
lib/test/common/CMakeLists.txt
Unescape Escape View File

@ -63,16 +63,6 @@ target_link_libraries(timeout_test srslte_phy ${CMAKE_THREAD_LIBS_INIT})
add_executable(bcd_helpers_test bcd_helpers_test.cc)
add_executable(pdu_test pdu_test.cc)
target_link_libraries(pdu_test srslte_phy srslte_common ${CMAKE_THREAD_LIBS_INIT})
add_test(pdu_test pdu_test)
if (ENABLE_5GNR)
add_executable(mac_nr_pdu_test mac_nr_pdu_test.cc)
target_link_libraries(mac_nr_pdu_test srslte_phy srslte_common ${CMAKE_THREAD_LIBS_INIT})
add_test(mac_nr_pdu_test mac_nr_pdu_test)
endif (ENABLE_5GNR)
add_executable(stack_procedure_test stack_procedure_test.cc)
add_test(stack_procedure_test stack_procedure_test)

29
lib/test/mac/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,29 @@
#
# Copyright 2013-2020 Software Radio Systems Limited
#
# This file is part of srsLTE
#
# srsLTE is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of
# the License, or (at your option) any later version.
#
# srsLTE is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# A copy of the GNU Affero General Public License can be found in
# the LICENSE file in the top-level directory of this distribution
# and at http://www.gnu.org/licenses/.
#
add_executable(pdu_test pdu_test.cc)
target_link_libraries(pdu_test srslte_phy srslte_common srslte_mac ${CMAKE_THREAD_LIBS_INIT})
add_test(pdu_test pdu_test)
if (ENABLE_5GNR)
add_executable(mac_nr_pdu_test mac_nr_pdu_test.cc)
target_link_libraries(mac_nr_pdu_test srslte_phy srslte_common srslte_mac ${CMAKE_THREAD_LIBS_INIT})
add_test(mac_nr_pdu_test mac_nr_pdu_test)
endif (ENABLE_5GNR)

2
lib/test/common/mac_nr_pdu_test.cc → lib/test/mac/mac_nr_pdu_test.cc
Unescape Escape View File

@ -21,8 +21,8 @@
#include "srslte/common/log_filter.h"
#include "srslte/common/mac_nr_pcap.h"
#include "srslte/common/mac_nr_pdu.h"
#include "srslte/config.h"
#include "srslte/mac/mac_nr_pdu.h"
#include <array>
#include <iostream>

2
lib/test/common/pdu_test.cc → lib/test/mac/pdu_test.cc
Unescape Escape View File

@ -23,9 +23,9 @@
#include "srslte/common/interfaces_common.h"
#include "srslte/common/logmap.h"
#include "srslte/common/mac_pcap.h"
#include "srslte/common/pdu.h"
#include "srslte/common/test_common.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/mac/pdu.h"
#include <bitset>
#include <iostream>
#include <map>

4
srsenb/hdr/stack/mac/ue.h
Unescape Escape View File

@ -26,10 +26,10 @@
#include "srslte/common/block_queue.h"
#include "srslte/common/log.h"
#include "srslte/common/mac_pcap.h"
#include "srslte/common/pdu.h"
#include "srslte/common/pdu_queue.h"
#include "srslte/interfaces/enb_interfaces.h"
#include "srslte/interfaces/sched_interface.h"
#include "srslte/mac/pdu.h"
#include "srslte/mac/pdu_queue.h"
#include "ta.h"
#include <pthread.h>
#include <vector>

1
srsenb/src/CMakeLists.txt
Unescape Escape View File

@ -41,6 +41,7 @@ target_link_libraries(srsenb srsenb_phy
srsenb_mac
srsenb_rrc
srslte_common
srslte_mac
srslte_phy
srslte_upper
srslte_radio

2
srsenb/src/stack/mac/scheduler_harq.cc
Unescape Escape View File

@ -23,7 +23,7 @@
#include "srsenb/hdr/stack/mac/scheduler.h"
#include "srslte/common/log_helper.h"
#include "srslte/common/pdu.h"
#include "srslte/mac/pdu.h"
#include "srslte/srslte.h"
using srslte::tti_point;

2
srsenb/src/stack/mac/scheduler_ue.cc
Unescape Escape View File

@ -25,7 +25,7 @@
#include "srsenb/hdr/stack/mac/scheduler_ue.h"
#include "srslte/common/log_helper.h"
#include "srslte/common/logmap.h"
#include "srslte/common/pdu.h"
#include "srslte/mac/pdu.h"
#include "srslte/srslte.h"
/******************************************************

1
srsenb/test/mac/CMakeLists.txt
Unescape Escape View File

@ -25,6 +25,7 @@ add_executable(sched_grid_test sched_grid_test.cc)
target_link_libraries(sched_grid_test srsenb_mac
srsenb_phy
srslte_common
srslte_mac
scheduler_test_common
${CMAKE_THREAD_LIBS_INIT}
${Boost_LIBRARIES})

2
srsenb/test/mac/scheduler_ca_test.cc
Unescape Escape View File

@ -19,10 +19,10 @@
*
*/
#include "lib/include/srslte/common/pdu.h"
#include "scheduler_test_common.h"
#include "scheduler_test_utils.h"
#include "srsenb/hdr/stack/mac/scheduler.h"
#include "srslte/mac/pdu.h"
using namespace srsenb;

2
srsenb/test/mac/scheduler_test_common.cc
Unescape Escape View File

@ -20,8 +20,8 @@
*/
#include "scheduler_test_common.h"
#include "lib/include/srslte/common/pdu.h"
#include "srsenb/hdr/stack/mac/scheduler.h"
#include "srslte/mac/pdu.h"
#include "srslte/common/test_common.h"

4
srsue/hdr/stack/mac/demux.h
Unescape Escape View File

@ -23,10 +23,10 @@
#define SRSUE_DEMUX_H
#include "srslte/common/log.h"
#include "srslte/common/pdu.h"
#include "srslte/common/pdu_queue.h"
#include "srslte/common/timers.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/mac/pdu.h"
#include "srslte/mac/pdu_queue.h"
/* Logical Channel Demultiplexing and MAC CE dissassemble */

2
srsue/hdr/stack/mac/mux.h
Unescape Escape View File

@ -30,8 +30,8 @@
#include "proc_phr.h"
#include "srslte/common/common.h"
#include "srslte/common/log.h"
#include "srslte/common/pdu.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/mac/pdu.h"
#include <mutex>
/* Logical Channel Multiplexing and Prioritization + Msg3 Buffer */

2
srsue/hdr/stack/mac/proc_ra.h
Unescape Escape View File

@ -29,8 +29,8 @@
#include "mux.h"
#include "srslte/common/log.h"
#include "srslte/common/mac_pcap.h"
#include "srslte/common/pdu.h"
#include "srslte/common/timers.h"
#include "srslte/mac/pdu.h"
/* Random access procedure as specified in Section 5.1 of 36.321 */

1
srsue/src/CMakeLists.txt
Unescape Escape View File

@ -37,6 +37,7 @@ target_link_libraries(srsue srsue_phy
srsue_mac
srsue_rrc
srslte_common
srslte_mac
srslte_phy
srslte_radio
srslte_upper

2
srsue/test/CMakeLists.txt
Unescape Escape View File

@ -30,5 +30,5 @@ target_link_libraries(metrics_test srslte_phy srslte_common)
add_test(metrics_test metrics_test -o ${CMAKE_CURRENT_BINARY_DIR}/ue_metrics.csv)
add_executable(mac_test mac_test.cc)
target_link_libraries(mac_test srsue_mac srsue_phy srslte_common srslte_phy srslte_radio srslte_asn1 rrc_asn1 ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
target_link_libraries(mac_test srsue_mac srsue_phy srslte_common srslte_mac srslte_phy srslte_radio srslte_asn1 rrc_asn1 ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
add_test(mac_test mac_test)

2
srsue/test/ttcn3/hdr/ttcn3_drb_interface.h
Unescape Escape View File

@ -24,7 +24,7 @@
#include "srslte/common/buffer_pool.h"
#include "srslte/common/common.h"
#include "srslte/common/pdu.h"
#include "srslte/mac/pdu.h"
#include "ttcn3_interfaces.h"
#include "ttcn3_port_handler.h"
#include <srslte/interfaces/ue_interfaces.h>

2
srsue/test/ttcn3/hdr/ttcn3_srb_interface.h
Unescape Escape View File

@ -24,7 +24,7 @@
#include "srslte/common/buffer_pool.h"
#include "srslte/common/common.h"
#include "srslte/common/pdu.h"
#include "srslte/mac/pdu.h"
#include "ttcn3_interfaces.h"
#include "ttcn3_port_handler.h"
#include <srslte/interfaces/ue_interfaces.h>

2
srsue/test/ttcn3/hdr/ttcn3_syssim.h
Unescape Escape View File

@ -23,7 +23,7 @@
#define SRSUE_TTCN3_SYSSIM_H
#include "dut_utils.h"
#include "srslte/common/pdu_queue.h"
#include "srslte/mac/pdu_queue.h"
#include "srslte/test/ue_test_interfaces.h"
#include "srslte/upper/pdcp.h"
#include "srslte/upper/rlc.h"

1
srsue/test/ttcn3/src/CMakeLists.txt
Unescape Escape View File

@ -24,6 +24,7 @@ target_link_libraries(ttcn3_dut srsue_stack
srsue_rrc
srslte_upper
srslte_common
srslte_mac
srslte_phy
srslte_radio
srslte_upper

Write Preview
Loading…
Cancel
Save