From 073c57dc3d43b9d0aced72b7af339e194e5d2930 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Tue, 7 Jan 2020 20:40:48 +0100 Subject: [PATCH] add NB-IoT DCI formats and move define to phy_common --- lib/include/srslte/phy/common/phy_common.h | 2 ++ lib/include/srslte/phy/sync/nsss.h | 2 -- lib/src/phy/phch/dci.c | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/include/srslte/phy/common/phy_common.h b/lib/include/srslte/phy/common/phy_common.h index 45166a6e2..7bb07cdfc 100644 --- a/lib/include/srslte/phy/common/phy_common.h +++ b/lib/include/srslte/phy/common/phy_common.h @@ -45,6 +45,8 @@ #define SRSLTE_PC_MAX 23 // Maximum TX power for Category 1 UE (in dBm) +#define SRSLTE_NUM_PCI 504 + #define SRSLTE_MAX_RADIOS 3 // Maximum number of supported RF devices #define SRSLTE_MAX_CARRIERS 5 // Maximum number of supported simultaneous carriers #define SRSLTE_MAX_PORTS 4 diff --git a/lib/include/srslte/phy/sync/nsss.h b/lib/include/srslte/phy/sync/nsss.h index 1c1f46b85..d8c96822c 100644 --- a/lib/include/srslte/phy/sync/nsss.h +++ b/lib/include/srslte/phy/sync/nsss.h @@ -50,8 +50,6 @@ #define SRSLTE_NSSS_CORR_FILTER_LEN 1508 #define SRSLTE_NSSS_CORR_OFFSET 412 -#define SRSLTE_NUM_PCI 504 - #define SRSLTE_NSSS_PERIOD 2 #define SRSLTE_NSSS_NUM_SF_DETECT (SRSLTE_NSSS_PERIOD) diff --git a/lib/src/phy/phch/dci.c b/lib/src/phy/phch/dci.c index 9af176e41..51fa8a027 100644 --- a/lib/src/phy/phch/dci.c +++ b/lib/src/phy/phch/dci.c @@ -1414,6 +1414,12 @@ srslte_dci_format_t srslte_dci_format_from_string(char* str) return SRSLTE_DCI_FORMAT2A; } else if (!strcmp(str, "Format2B")) { return SRSLTE_DCI_FORMAT2B; + } else if (!strcmp(str, "FormatN0")) { + return SRSLTE_DCI_FORMATN0; + } else if (!strcmp(str, "FormatN1")) { + return SRSLTE_DCI_FORMATN1; + } else if (!strcmp(str, "FormatN2")) { + return SRSLTE_DCI_FORMATN2; } else { return SRSLTE_DCI_NOF_FORMATS; }