From 0b3cbb0740bf6c77120c901e2cc551498b707a27 Mon Sep 17 00:00:00 2001 From: ismagom Date: Fri, 17 Oct 2014 20:16:20 +0200 Subject: [PATCH] BCCH-BCH test compiling ok --- CMakeLists.txt | 2 ++ lte/CMakeLists.txt | 1 + lte/phy/include/liblte/phy/common/phy_common.h | 8 +++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8abc0c063..58d95f281 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,8 @@ MESSAGE(STATUS "Building for version: ${VERSION}") ######################################################################## INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/common/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/lte/phy/include/) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/lte/rrc/include/) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/lte/rrc/asn/) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cuhd/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/graphics/include) diff --git a/lte/CMakeLists.txt b/lte/CMakeLists.txt index a20e90685..83bc98dce 100644 --- a/lte/CMakeLists.txt +++ b/lte/CMakeLists.txt @@ -25,4 +25,5 @@ ADD_SUBDIRECTORY(phy) ADD_SUBDIRECTORY(mac) ADD_SUBDIRECTORY(rlc) +ADD_SUBDIRECTORY(rrc) ADD_SUBDIRECTORY(pdcp) diff --git a/lte/phy/include/liblte/phy/common/phy_common.h b/lte/phy/include/liblte/phy/common/phy_common.h index 52dc3a3b6..7ae251baf 100644 --- a/lte/phy/include/liblte/phy/common/phy_common.h +++ b/lte/phy/include/liblte/phy/common/phy_common.h @@ -107,20 +107,22 @@ typedef enum {CPNORM, CPEXT} lte_cp_t; #define NOF_TC_CB_SIZES 188 +typedef enum LIBLTE_API { PHICH_NORM, PHICH_EXT} phich_length_t; +typedef enum LIBLTE_API { R_1_6, R_1_2, R_1, R_2} phich_resources_t; + typedef struct LIBLTE_API { uint32_t nof_prb; uint32_t nof_ports; uint32_t id; lte_cp_t cp; + phich_length_t phich_length; + phich_resources_t phich_resources; }lte_cell_t; typedef enum LIBLTE_API { SINGLE_ANTENNA,TX_DIVERSITY, SPATIAL_MULTIPLEX } lte_mimo_type_t; -typedef enum LIBLTE_API { PHICH_NORM, PHICH_EXT} phich_length_t; -typedef enum LIBLTE_API { R_1_6, R_1_2, R_1, R_2} phich_resources_t; - typedef enum LIBLTE_API { LTE_BPSK = 1, LTE_QPSK = 2, LTE_QAM16 = 4, LTE_QAM64 = 6 } lte_mod_t;