From c0b0ed5a5760c4d7bd93834926aa5e73e30f931d Mon Sep 17 00:00:00 2001
From: "islam.galal" <igalal.ext@orange.com>
Date: Wed, 16 Aug 2017 12:54:13 +0200
Subject: [PATCH] SIB2-BR configuration parameters
---
openair1/PHY/impl_defs_lte.h | 6 +++--
openair2/ENB_APP/enb_config.c | 19 +-------------
openair2/RRC/LITE/MESSAGES/asn1_msg.c | 1 -
.../CONF/enb.band13.tm1.50PRB.emtc.conf | 26 +++++++++----------
4 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/openair1/PHY/impl_defs_lte.h b/openair1/PHY/impl_defs_lte.h
index fea33a77072..e11f8edb894 100755
--- a/openair1/PHY/impl_defs_lte.h
+++ b/openair1/PHY/impl_defs_lte.h
@@ -802,11 +802,13 @@ typedef struct {
uint8_t harq_pid;
/// Narrowband index
uint8_t narrowband;
+ /// number of repetitions
+ uint8_t reps;
/// number of PRB pairs for MPDCCH
uint8_t number_of_prb_pairs;
- /// mpdcch resource assignement (0=localized,1=distributed)
+ /// mpdcch resource assignement (combinatorial index r)
uint8_t resource_block_assignment;
- /// transmission type
+ /// transmission type (0=localized,1=distributed)
uint8_t transmission_type;
/// mpdcch start symbol
uint8_t start_symbol;
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 6ec38b3bb97..b99aacbf234 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -2830,7 +2830,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
if (setting_freq_hoppingParameters_r13 != NULL)
{
RRC_CONFIGURATION_REQ(msg_p).sib2_freq_hoppingParameters_r13_exists[j] = TRUE;
- if (config_setting_lookup_int(setting_freq_hoppingParameters_r13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_NB_R13, sib2_mpdcch_pdsch_hoppingNB_r13))
+ if (config_setting_lookup_int(setting_freq_hoppingParameters_r13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_NB_R13, &sib2_mpdcch_pdsch_hoppingNB_r13))
{
RRC_CONFIGURATION_REQ(msg_p).sib2_mpdcch_pdsch_hoppingNB_r13[j] = CALLOC(1, sizeof(long));
@@ -2924,23 +2924,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
}
-
-
- printf("[DEBUGGING][KOGO][CONF]: 0 = %d\n", RRC_CONFIGURATION_REQ(msg_p).sib2_freq_hoppingParameters_r13_exists[j]);
- printf("[DEBUGGING][KOGO][CONF]: 1 = %d\n", *RRC_CONFIGURATION_REQ(msg_p).sib2_mpdcch_pdsch_hoppingNB_r13[j]);
-
- printf("[DEBUGGING][KOGO][CONF]: 2 = %d\n", *RRC_CONFIGURATION_REQ(msg_p).sib2_interval_DLHoppingConfigCommonModeA_r13[j]);
- printf("[DEBUGGING][KOGO][CONF]: 3 = %d\n", RRC_CONFIGURATION_REQ(msg_p).sib2_interval_DLHoppingConfigCommonModeA_r13_val[j]);
- printf("[DEBUGGING][KOGO][CONF]: 4 = %d\n", *RRC_CONFIGURATION_REQ(msg_p).sib2_interval_DLHoppingConfigCommonModeB_r13[j]);
- printf("[DEBUGGING][KOGO][CONF]: 5 = %d\n", RRC_CONFIGURATION_REQ(msg_p).sib2_interval_DLHoppingConfigCommonModeB_r13_val[j]);
-
- printf("[DEBUGGING][KOGO][CONF]: 6 = %d\n", *RRC_CONFIGURATION_REQ(msg_p).sib2_interval_ULHoppingConfigCommonModeA_r13[j]);
- printf("[DEBUGGING][KOGO][CONF]: 7 = %d\n", RRC_CONFIGURATION_REQ(msg_p).sib2_interval_ULHoppingConfigCommonModeA_r13_val[j]);
- printf("[DEBUGGING][KOGO][CONF]: 8 = %d\n", *RRC_CONFIGURATION_REQ(msg_p).sib2_interval_ULHoppingConfigCommonModeB_r13[j]);
- printf("[DEBUGGING][KOGO][CONF]: 9 = %d\n", RRC_CONFIGURATION_REQ(msg_p).sib2_interval_ULHoppingConfigCommonModeB_r13_val[j]);
-
- printf("[DEBUGGING][KOGO][CONF]: 10 = %d\n", *RRC_CONFIGURATION_REQ(msg_p).sib2_mpdcch_pdsch_hoppingNB_r13[j]);
-
// Rel8 RadioResourceConfigCommon Parameters
if (!(config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
index 30b7ee8d794..e683cf86de3 100755
--- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
@@ -1390,7 +1390,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
}
PRACH_ParametersCE_r13_t *prach_parametersce_r13;
- memset(prach_parametersce_r13, 0, sizeof(PRACH_ParametersCE_r13_t));
int num_prach_parameters_ce = configuration->prach_parameters_list_size[CC_id];
int prach_parameters_index;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
index 906c3cae305..c345d71db6a 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
@@ -121,7 +121,7 @@ eNBs =
(
{
si_Narrowband_r13 = 5;
- si_TBS_r13 = 4;
+ si_TBS_r13 = 5;
}
);
si_WindowLength_BR_r13 = 0;
@@ -207,18 +207,18 @@ eNBs =
sib2_freq_hoppingParameters_r13 :
{
- sib2_mpdcch_pdsch_hoppingNB_r13 = 1;
- sib2_interval_DLHoppingConfigCommonModeA_r13 = 2; # choice -> (0, FDD) (1, TDD)
- sib2_interval_DLHoppingConfigCommonModeA_r13_val = 3;
- sib2_interval_DLHoppingConfigCommonModeB_r13 = 4; # choice -> (0, FDD) (1, TDD)
- sib2_interval_DLHoppingConfigCommonModeB_r13_val = 5;
-
- sib2_interval_ULHoppingConfigCommonModeA_r13 = 6; # choice -> (0, FDD) (1, TDD)
- sib2_interval_ULHoppingConfigCommonModeA_r13_val = 7;
- sib2_interval_ULHoppingConfigCommonModeB_r13 = 8; # choice -> (0, FDD) (1, TDD)
- sib2_interval_ULHoppingConfigCommonModeB_r13_val = 9;
-
- sib2_mpdcch_pdsch_hoppingOffset_r13 = 10;
+ sib2_mpdcch_pdsch_hoppingNB_r13 = 0;
+ sib2_interval_DLHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD)
+ sib2_interval_DLHoppingConfigCommonModeA_r13_val = 0;
+ sib2_interval_DLHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD)
+ sib2_interval_DLHoppingConfigCommonModeB_r13_val = 0;
+
+ sib2_interval_ULHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD)
+ sib2_interval_ULHoppingConfigCommonModeA_r13_val = 0;
+ sib2_interval_ULHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD)
+ sib2_interval_ULHoppingConfigCommonModeB_r13_val = 0;
+
+ sib2_mpdcch_pdsch_hoppingOffset_r13 = 1;
}
--
GitLab