Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZhouShuya
OpenXG-RAN
Commits
c5f26acd
Commit
c5f26acd
authored
Aug 25, 2017
by
Matthieu Kanj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renaming structures and variables in file:openair2/RRC/LITE/defs_NB_IoT.h
parent
b93275b6
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
100 additions
and
100 deletions
+100
-100
openair2/LAYER2/MAC/defs_NB_IoT.h
openair2/LAYER2/MAC/defs_NB_IoT.h
+1
-1
openair2/RRC/LITE/L2_interface_NB_IoT.c
openair2/RRC/LITE/L2_interface_NB_IoT.c
+20
-20
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c
+61
-61
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.h
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.h
+1
-1
openair2/RRC/LITE/defs_NB_IoT.h
openair2/RRC/LITE/defs_NB_IoT.h
+5
-5
openair2/RRC/LITE/rrc_eNB_NB_IoT.c
openair2/RRC/LITE/rrc_eNB_NB_IoT.c
+12
-12
No files found.
openair2/LAYER2/MAC/defs_NB_IoT.h
View file @
c5f26acd
...
@@ -460,7 +460,7 @@ typedef struct {
...
@@ -460,7 +460,7 @@ typedef struct {
int
Ncp_UL
;
int
Ncp_UL
;
int
eutra_band
;
int
eutra_band
;
uint32_t
dl_CarrierFreq
;
uint32_t
dl_CarrierFreq
;
BCCH_BCH_Message_NB_t
*
mib_NB
;
BCCH_BCH_Message_NB_t
*
mib_NB
_IoT
;
RadioResourceConfigCommonSIB_NB_r13_t
*
radioResourceConfigCommon
;
RadioResourceConfigCommonSIB_NB_r13_t
*
radioResourceConfigCommon
;
ARFCN_ValueEUTRA_r9_t
ul_CarrierFreq
;
ARFCN_ValueEUTRA_r9_t
ul_CarrierFreq
;
struct
MasterInformationBlock_NB__operationModeInfo_r13
operationModeInfo
;
struct
MasterInformationBlock_NB__operationModeInfo_r13
operationModeInfo
;
...
...
openair2/RRC/LITE/L2_interface_NB_IoT.c
View file @
c5f26acd
...
@@ -224,7 +224,7 @@ int32_t get_uldl_offset_NB_IoT(int eutra_band) {
...
@@ -224,7 +224,7 @@ int32_t get_uldl_offset_NB_IoT(int eutra_band) {
void
config_mib_
NB_fapi
(
void
config_mib_
fapi_NB_IoT
(
int
rntiP
,
int
rntiP
,
int
physCellId
,
int
physCellId
,
uint8_t
eutra_band
,
uint8_t
eutra_band
,
...
@@ -235,7 +235,7 @@ void config_mib_NB_fapi(
...
@@ -235,7 +235,7 @@ void config_mib_NB_fapi(
int
dl_CarrierFreq
,
int
dl_CarrierFreq
,
int
ul_CarrierFreq
,
int
ul_CarrierFreq
,
long
*
eutraControlRegionSize
,
long
*
eutraControlRegionSize
,
BCCH_BCH_Message_NB_t
*
mib_NB
BCCH_BCH_Message_NB_t
*
mib_NB
_IoT
)
)
{
{
...
@@ -261,12 +261,12 @@ void config_mib_NB_fapi(
...
@@ -261,12 +261,12 @@ void config_mib_NB_fapi(
//The prb index allowed are the one specified in R&shwarz pag 9 NB-IoT white papaer
//The prb index allowed are the one specified in R&shwarz pag 9 NB-IoT white papaer
switch
(
mib_NB
->
message
.
operationModeInfo_r13
.
present
)
switch
(
mib_NB
_IoT
->
message
.
operationModeInfo_r13
.
present
)
{
{
//FAPI specs pag 135
//FAPI specs pag 135
case
MasterInformationBlock_NB__operationModeInfo_r13_PR_inband_SamePCI_r13
:
case
MasterInformationBlock_NB__operationModeInfo_r13_PR_inband_SamePCI_r13
:
config_INFO
->
cfg
->
nb_iot_config
.
operating_mode
.
value
=
0
;
config_INFO
->
cfg
->
nb_iot_config
.
operating_mode
.
value
=
0
;
config_INFO
->
cfg
->
nb_iot_config
.
prb_index
.
value
=
mib_NB
->
message
.
operationModeInfo_r13
.
choice
.
inband_SamePCI_r13
.
eutra_CRS_SequenceInfo_r13
;
//see TS 36.213 ch 16.0
config_INFO
->
cfg
->
nb_iot_config
.
prb_index
.
value
=
mib_NB
_IoT
->
message
.
operationModeInfo_r13
.
choice
.
inband_SamePCI_r13
.
eutra_CRS_SequenceInfo_r13
;
//see TS 36.213 ch 16.0
config_INFO
->
cfg
->
nb_iot_config
.
assumed_crs_aps
.
value
=
-
1
;
//is not defined so we put a negative value
config_INFO
->
cfg
->
nb_iot_config
.
assumed_crs_aps
.
value
=
-
1
;
//is not defined so we put a negative value
if
(
eutraControlRegionSize
==
NULL
)
if
(
eutraControlRegionSize
==
NULL
)
...
@@ -286,7 +286,7 @@ void config_mib_NB_fapi(
...
@@ -286,7 +286,7 @@ void config_mib_NB_fapi(
//XXX should pass the prb_index may defined by configuration file depending on the LTE band we are considering (see Rhode&Shwartz whitepaper pag9)
//XXX should pass the prb_index may defined by configuration file depending on the LTE band we are considering (see Rhode&Shwartz whitepaper pag9)
//config_INFO->nb_iot_config.prb_index.value =
//config_INFO->nb_iot_config.prb_index.value =
config_INFO
->
cfg
->
nb_iot_config
.
assumed_crs_aps
.
value
=
mib_NB
->
message
.
operationModeInfo_r13
.
choice
.
inband_DifferentPCI_r13
.
eutra_NumCRS_Ports_r13
;
config_INFO
->
cfg
->
nb_iot_config
.
assumed_crs_aps
.
value
=
mib_NB
_IoT
->
message
.
operationModeInfo_r13
.
choice
.
inband_DifferentPCI_r13
.
eutra_NumCRS_Ports_r13
;
if
(
eutraControlRegionSize
==
NULL
)
if
(
eutraControlRegionSize
==
NULL
)
LOG_E
(
RRC
,
"rrc_mac_config_req_eNB_NB_IoT: operation mode is in-band but eutraControlRegionSize is not defined"
);
LOG_E
(
RRC
,
"rrc_mac_config_req_eNB_NB_IoT: operation mode is in-band but eutraControlRegionSize is not defined"
);
...
@@ -577,7 +577,7 @@ int rrc_mac_config_req_eNB_NB_IoT(
...
@@ -577,7 +577,7 @@ int rrc_mac_config_req_eNB_NB_IoT(
long
*
nrs_CRS_PoweSIwindowsizerOffset
,
//optional
long
*
nrs_CRS_PoweSIwindowsizerOffset
,
//optional
uint32_t
dl_CarrierFreq
,
uint32_t
dl_CarrierFreq
,
uint32_t
ul_CarrierFreq
,
uint32_t
ul_CarrierFreq
,
BCCH_BCH_Message_NB_t
*
mib_NB
,
BCCH_BCH_Message_NB_t
*
mib_NB
_IoT
,
RadioResourceConfigCommonSIB_NB_r13_t
*
radioResourceConfigCommon
,
RadioResourceConfigCommonSIB_NB_r13_t
*
radioResourceConfigCommon
,
struct
PhysicalConfigDedicated_NB_r13
*
physicalConfigDedicated
,
struct
PhysicalConfigDedicated_NB_r13
*
physicalConfigDedicated
,
MAC_MainConfig_NB_r13_t
*
mac_MainConfig
,
//most probably not needed since only used at UE side
MAC_MainConfig_NB_r13_t
*
mac_MainConfig
,
//most probably not needed since only used at UE side
...
@@ -604,14 +604,14 @@ int rrc_mac_config_req_eNB_NB_IoT(
...
@@ -604,14 +604,14 @@ int rrc_mac_config_req_eNB_NB_IoT(
if
(
mib_NB
!=
NULL
)
{
if
(
mib_NB
_IoT
!=
NULL
)
{
//XXX possible alternative implementation (as RU-RAU splitting)
//XXX possible alternative implementation (as RU-RAU splitting)
//if(eNB_mac_inst == NULL) l2_init_eNB(); //TODO MP: to be included in the MAC/main.c
//if(eNB_mac_inst == NULL) l2_init_eNB(); //TODO MP: to be included in the MAC/main.c
//mac_top_init_eNB(); //TODO MP: to be included in the MAC/main.c
//mac_top_init_eNB(); //TODO MP: to be included in the MAC/main.c
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
mib_NB
=
mib_NB
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
mib_NB
_IoT
=
mib_NB_IoT
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
physCellId
=
physCellId
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
physCellId
=
physCellId
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
p_eNB
=
p_eNB
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
p_eNB
=
p_eNB
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
p_rx_eNB
=
p_rx_eNB
;
eNB_mac_inst_NB_IoT
[
Mod_idP
].
common_channels
[
CC_idP
].
p_rx_eNB
=
p_rx_eNB
;
...
@@ -641,7 +641,7 @@ int rrc_mac_config_req_eNB_NB_IoT(
...
@@ -641,7 +641,7 @@ int rrc_mac_config_req_eNB_NB_IoT(
//Mapping OAI params into FAPI params
//Mapping OAI params into FAPI params
config_mib_
NB_fapi
(
config_mib_
fapi_NB_IoT
(
rntiP
,
rntiP
,
physCellId
,
physCellId
,
eutra_band
,
eutra_band
,
...
@@ -652,12 +652,12 @@ int rrc_mac_config_req_eNB_NB_IoT(
...
@@ -652,12 +652,12 @@ int rrc_mac_config_req_eNB_NB_IoT(
dl_CarrierFreq
,
dl_CarrierFreq
,
ul_CarrierFreq
,
ul_CarrierFreq
,
eutraControlRegionSize
,
eutraControlRegionSize
,
mib_NB
mib_NB
_IoT
);
);
}
//mib_NB!=NULL
}
//mib_NB
_IoT
!=NULL
if
(
radioResourceConfigCommon
!=
NULL
)
{
if
(
radioResourceConfigCommon
!=
NULL
)
{
...
@@ -1130,28 +1130,28 @@ int8_t mac_rrc_data_req_eNB_NB_IoT(
...
@@ -1130,28 +1130,28 @@ int8_t mac_rrc_data_req_eNB_NB_IoT(
if
(
mib_flag
==
MIB_FLAG_YES
){
if
(
mib_flag
==
MIB_FLAG_YES
){
//XXX to be check when MIB-NB should be initialized
//XXX to be check when MIB-NB should be initialized
if
(
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
==
255
)
{
if
(
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
==
255
)
{
LOG_E
(
RRC
,
"[eNB %d] MAC Request for MIB-NB and MIB-NB not initialized
\n
"
,
Mod_idP
);
LOG_E
(
RRC
,
"[eNB %d] MAC Request for MIB-NB and MIB-NB not initialized
\n
"
,
Mod_idP
);
mac_xface
->
macphy_exit
(
"mac_rrc_data_req_eNB_NB_IoT: MAC Request for MIB-NB and MIB-NB not initialized"
);
mac_xface
->
macphy_exit
(
"mac_rrc_data_req_eNB_NB_IoT: MAC Request for MIB-NB and MIB-NB not initialized"
);
}
}
memcpy
(
&
buffer_pP
[
0
],
memcpy
(
&
buffer_pP
[
0
],
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
MIB_NB
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
MIB_NB
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
);
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
);
//XXX RRC_MAC_BCCH_DATA_REQ message not implemented in MAC layer (eNB_scheduler.c under ITTI)
//XXX RRC_MAC_BCCH_DATA_REQ message not implemented in MAC layer (eNB_scheduler.c under ITTI)
#ifdef DEBUG_RRC
#ifdef DEBUG_RRC
LOG_T
(
RRC
,
"[eNB %d] Frame %d : BCCH request => MIB_NB
\n
"
,
Mod_idP
,
frameP
);
LOG_T
(
RRC
,
"[eNB %d] Frame %d : BCCH request => MIB_NB
\n
"
,
Mod_idP
,
frameP
);
for
(
i
=
0
;
i
<
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
;
i
++
)
{
for
(
i
=
0
;
i
<
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
;
i
++
)
{
LOG_T
(
RRC
,
"%x."
,
buffer_pP
[
i
]);
LOG_T
(
RRC
,
"%x."
,
buffer_pP
[
i
]);
}
}
LOG_T
(
RRC
,
"
\n
"
);
LOG_T
(
RRC
,
"
\n
"
);
#endif
#endif
return
(
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
);
//exit from the function
return
(
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
);
//exit from the function
}
}
//Requesting for SI Message
//Requesting for SI Message
...
@@ -1207,12 +1207,12 @@ int8_t mac_rrc_data_req_eNB_NB_IoT(
...
@@ -1207,12 +1207,12 @@ int8_t mac_rrc_data_req_eNB_NB_IoT(
//check for SIB23-Transmission
//check for SIB23-Transmission
for
(
int
i
=
0
;
i
<
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
->
schedulingInfoList_r13
.
list
.
count
;
i
++
){
for
(
int
i
=
0
;
i
<
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
schedulingInfoList_r13
.
list
.
count
;
i
++
){
if
(
is_SIB23_NB_IoT
(
frameP
,
h_frameP
,
if
(
is_SIB23_NB_IoT
(
frameP
,
h_frameP
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
->
schedulingInfoList_r13
.
list
.
array
[
i
]
->
si_Periodicity_r13
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
schedulingInfoList_r13
.
list
.
array
[
i
]
->
si_Periodicity_r13
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
->
si_WindowLength_r13
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
si_WindowLength_r13
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
->
si_RadioFrameOffset_r13
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
si_RadioFrameOffset_r13
,
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
->
schedulingInfoList_r13
.
list
.
array
[
i
]
->
si_RepetitionPattern_r13
))
eNB_rrc_inst_NB_IoT
[
Mod_idP
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
schedulingInfoList_r13
.
list
.
array
[
i
]
->
si_RepetitionPattern_r13
))
{
{
memcpy
(
&
buffer_pP
[
0
],
memcpy
(
&
buffer_pP
[
0
],
...
...
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c
View file @
c5f26acd
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.h
View file @
c5f26acd
...
@@ -86,7 +86,7 @@ uint8_t do_SIB1_NB(uint8_t Mod_id, int CC_id,
...
@@ -86,7 +86,7 @@ uint8_t do_SIB1_NB(uint8_t Mod_id, int CC_id,
\brief Generate a default configuration for SIB2/SIB3-NB in one System Information PDU (eNB).
\brief Generate a default configuration for SIB2/SIB3-NB in one System Information PDU (eNB).
@param Mod_id Index of eNB (used to derive some parameters)
@param Mod_id Index of eNB (used to derive some parameters)
@param buffer Pointer to PER-encoded ASN.1 description of SI-NB PDU
@param buffer Pointer to PER-encoded ASN.1 description of SI-NB PDU
@param systemInformation_NB Pointer to asn1c C representation of SI-NB PDU
@param systemInformation_NB
_IoT
Pointer to asn1c C representation of SI-NB PDU
@param sib2_NB Pointer (returned) to sib2_NB component withing SI-NB PDU
@param sib2_NB Pointer (returned) to sib2_NB component withing SI-NB PDU
@param sib3_NB Pointer (returned) to sib3_NB component withing SI-NB PDU
@param sib3_NB Pointer (returned) to sib3_NB component withing SI-NB PDU
@return size of encoded bit stream in bytes*/
@return size of encoded bit stream in bytes*/
...
...
openair2/RRC/LITE/defs_NB_IoT.h
View file @
c5f26acd
...
@@ -460,7 +460,7 @@ typedef struct {
...
@@ -460,7 +460,7 @@ typedef struct {
// buffer that contains the encoded messages
// buffer that contains the encoded messages
uint8_t
*
MIB_NB
;
uint8_t
*
MIB_NB
;
uint8_t
sizeof_MIB_NB
;
uint8_t
sizeof_MIB_NB
_IoT
;
uint8_t
*
SIB1_NB
;
uint8_t
*
SIB1_NB
;
uint8_t
sizeof_SIB1_NB
;
uint8_t
sizeof_SIB1_NB
;
...
@@ -496,11 +496,11 @@ typedef struct {
...
@@ -496,11 +496,11 @@ typedef struct {
uint16_t
physCellId
;
//not stored in the MIB-NB but is getting through NPSS/NSSS
uint16_t
physCellId
;
//not stored in the MIB-NB but is getting through NPSS/NSSS
//are the only static one (memory has been already allocated)
//are the only static one (memory has been already allocated)
BCCH_BCH_Message_NB_t
mib_NB
;
BCCH_BCH_Message_NB_t
mib_NB
_IoT
;
BCCH_DL_SCH_Message_NB_t
siblock1_NB
;
//SIB1-NB
BCCH_DL_SCH_Message_NB_t
siblock1_NB
_IoT
;
//SIB1-NB
BCCH_DL_SCH_Message_NB_t
systemInformation_NB
;
//SI
BCCH_DL_SCH_Message_NB_t
systemInformation_NB
_IoT
;
//SI
SystemInformationBlockType1_NB_t
*
sib1_NB
;
SystemInformationBlockType1_NB_t
*
sib1_NB
_IoT
;
SystemInformationBlockType2_NB_r13_t
*
sib2_NB
;
SystemInformationBlockType2_NB_r13_t
*
sib2_NB
;
SystemInformationBlockType3_NB_r13_t
*
sib3_NB
;
SystemInformationBlockType3_NB_r13_t
*
sib3_NB
;
//not implemented yet
//not implemented yet
...
...
openair2/RRC/LITE/rrc_eNB_NB_IoT.c
View file @
c5f26acd
...
@@ -1626,11 +1626,11 @@ init_SI_NB(
...
@@ -1626,11 +1626,11 @@ init_SI_NB(
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
ul_CarrierFreq
=
configuration
->
downlink_frequency
[
CC_id
]
+
configuration
->
uplink_frequency_offset
[
CC_id
];
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
ul_CarrierFreq
=
configuration
->
downlink_frequency
[
CC_id
]
+
configuration
->
uplink_frequency_offset
[
CC_id
];
//TODO: verify who allocate memory for sib1_NB, sib2_NB, sib3_NB and mib_nb in the carrier before being passed as parameter
//TODO: verify who allocate memory for sib1_NB
_IoT
, sib2_NB, sib3_NB and mib_nb in the carrier before being passed as parameter
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_SIB1_NB
=
0
;
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_SIB1_NB
=
0
;
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_SIB23_NB
=
0
;
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_SIB23_NB
=
0
;
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_MIB_NB
=
0
;
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
=
0
;
//MIB
//MIB
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
MIB_NB
=
(
uint8_t
*
)
malloc16
(
32
);
//MIB is 34 bits=5bytes needed
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
MIB_NB
=
(
uint8_t
*
)
malloc16
(
32
);
//MIB is 34 bits=5bytes needed
...
@@ -1638,7 +1638,7 @@ init_SI_NB(
...
@@ -1638,7 +1638,7 @@ init_SI_NB(
if
(
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
MIB_NB
)
if
(
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
MIB_NB
)
{
{
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_MIB_NB
=
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
=
do_MIB_NB_IoT
(
&
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
],
do_MIB_NB_IoT
(
&
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
],
configuration
->
N_RB_DL
[
CC_id
],
configuration
->
N_RB_DL
[
CC_id
],
0
//FIXME is correct to pass frame = 0??
0
//FIXME is correct to pass frame = 0??
...
@@ -1651,8 +1651,8 @@ init_SI_NB(
...
@@ -1651,8 +1651,8 @@ init_SI_NB(
}
}
if
(
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_MIB_NB
==
255
)
{
if
(
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sizeof_MIB_NB
_IoT
==
255
)
{
mac_xface
->
macphy_exit
(
"[RRC][init_SI] FATAL, eNB_rrc_inst_NB[enb_mod_idP].carrier[CC_id].sizeof_MIB_NB == 255"
);
mac_xface
->
macphy_exit
(
"[RRC][init_SI] FATAL, eNB_rrc_inst_NB[enb_mod_idP].carrier[CC_id].sizeof_MIB_NB
_IoT
== 255"
);
}
}
//SIB1_NB
//SIB1_NB
...
@@ -1721,18 +1721,18 @@ init_SI_NB(
...
@@ -1721,18 +1721,18 @@ init_SI_NB(
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
p_rx_eNB
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
p_rx_eNB
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
Ncp
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
Ncp
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
Ncp_UL
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
Ncp_UL
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
->
freqBandIndicator_r13
,
//eutra_band
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
freqBandIndicator_r13
,
//eutra_band
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
->
freqBandInfo_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
freqBandInfo_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
->
multiBandInfoList_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
multiBandInfoList_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
->
downlinkBitmap_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
downlinkBitmap_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
->
eutraControlRegionSize_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
eutraControlRegionSize_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
->
nrs_CRS_PowerOffset_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib1_NB
_IoT
->
nrs_CRS_PowerOffset_r13
,
// &SIwindowsize,
// &SIwindowsize,
// &SIperiod,
// &SIperiod,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
dl_CarrierFreq
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
dl_CarrierFreq
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
ul_CarrierFreq
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
ul_CarrierFreq
,
(
BCCH_BCH_Message_NB_t
*
)
&
(
BCCH_BCH_Message_NB_t
*
)
&
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
mib_NB
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
mib_NB
_IoT
,
(
RadioResourceConfigCommonSIB_NB_r13_t
*
)
&
(
RadioResourceConfigCommonSIB_NB_r13_t
*
)
&
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib2_NB
->
radioResourceConfigCommon_r13
,
eNB_rrc_inst_NB_IoT
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
sib2_NB
->
radioResourceConfigCommon_r13
,
(
struct
PhysicalConfigDedicated_NB_r13
*
)
NULL
,
(
struct
PhysicalConfigDedicated_NB_r13
*
)
NULL
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment