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
93052033
Commit
93052033
authored
Mar 01, 2018
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[RRC] add sIB19 support (partially)
parent
907b4f80
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
37 deletions
+26
-37
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+8
-32
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+1
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
...JECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
+17
-3
No files found.
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
93052033
...
@@ -1059,10 +1059,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1059,10 +1059,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
#if defined(Rel10) || defined(Rel14)
#if defined(Rel10) || defined(Rel14)
//TTN - for D2D
//TTN - for D2D
// SIB18
// SIB18
// fill in all elements of SIB18 if present
//later we can read the parameters from the configuration file as for eNB's parameters
//commRxPool_r12
- should be filled with the parameters from the configuration file
//commRxPool_r12
(
*
sib18
)
->
commConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib18
)
->
commConfig_r12
));
(
*
sib18
)
->
commConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib18
)
->
commConfig_r12
));
SL_CommRxPoolList
=
&
(
*
sib18
)
->
commConfig_r12
->
commRxPool_r12
;
SL_CommRxPoolList
=
&
(
*
sib18
)
->
commConfig_r12
->
commRxPool_r12
;
memset
(
SL_CommRxPoolList
,
0
,
sizeof
(
*
SL_CommRxPoolList
));
memset
(
SL_CommRxPoolList
,
0
,
sizeof
(
*
SL_CommRxPoolList
));
...
@@ -1128,8 +1126,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1128,8 +1126,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
SL_CommResourcePool
->
dataHoppingConfig_r12
.
numSubbands_r12
=
SL_HoppingConfigComm_r12__numSubbands_r12_ns1
;
SL_CommResourcePool
->
dataHoppingConfig_r12
.
numSubbands_r12
=
SL_HoppingConfigComm_r12__numSubbands_r12_ns1
;
SL_CommResourcePool
->
dataHoppingConfig_r12
.
rb_Offset_r12
=
0
;
SL_CommResourcePool
->
dataHoppingConfig_r12
.
rb_Offset_r12
=
0
;
//SL_CommResourcePool->dataHoppingConfig_r12._asn_ctx = asn_ctx_default;
//ue_SelectedResourceConfig_r12
//ue_SelectedResourceConfig_r12
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
));
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
));
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
prb_Num_r12
=
20
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
prb_Num_r12
=
20
;
...
@@ -1137,7 +1133,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1137,7 +1133,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
prb_End_r12
=
44
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
prb_End_r12
=
44
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
present
=
SL_OffsetIndicator_r12_PR_small_r12
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
present
=
SL_OffsetIndicator_r12_PR_small_r12
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
=
0
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
=
0
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
present
=
SubframeBitmapSL_r12_PR_bs40_r12
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
present
=
SubframeBitmapSL_r12_PR_bs40_r12
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
size
=
5
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
size
=
5
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
=
CALLOC
(
1
,
5
);
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
=
CALLOC
(
1
,
5
);
...
@@ -1147,56 +1142,39 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1147,56 +1142,39 @@ uint8_t do_SIB23(uint8_t Mod_id,
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
[
2
]
=
0xFF
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
[
2
]
=
0xFF
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
[
3
]
=
0xFF
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
[
3
]
=
0xFF
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
[
4
]
=
0xFF
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
[
4
]
=
0xFF
;
//SL_CommResourcePool->ue_SelectedResourceConfig_r12->data_TF_ResourceConfig_r12.subframeBitmap_r12.choice.bs4_r12._asn_ctx = asn_ctx_default;
//SL_CommResourcePool->ue_SelectedResourceConfig_r12->trpt_Subset_r12 = CALLOC (1, sizeof(*SL_CommResourcePool->ue_SelectedResourceConfig_r12->trpt_Subset_r12));
//SL_CommResourcePool->ue_SelectedResourceConfig_r12->trpt_Subset_r12 = CALLOC (1, sizeof(*SL_CommResourcePool->ue_SelectedResourceConfig_r12->trpt_Subset_r12));
//SL_CommResourcePool->ue_SelectedResourceConfig_r12->_asn_ctx = asn_ctx_default;
//rxParametersNCell_r12
//rxParametersNCell_r12
SL_CommResourcePool
->
rxParametersNCell_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
rxParametersNCell_r12
));
SL_CommResourcePool
->
rxParametersNCell_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
rxParametersNCell_r12
));
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
));
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
));
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
->
subframeAssignment
=
0
;
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
->
subframeAssignment
=
0
;
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
->
specialSubframePatterns
=
0
;
SL_CommResourcePool
->
rxParametersNCell_r12
->
tdd_Config_r12
->
specialSubframePatterns
=
0
;
//SL_CommResourcePool->rxParametersNCell_r12->tdd_Config_r12->_asn_ctx = asn_ctx_default;
SL_CommResourcePool
->
rxParametersNCell_r12
->
syncConfigIndex_r12
=
0
;
SL_CommResourcePool
->
rxParametersNCell_r12
->
syncConfigIndex_r12
=
0
;
//SL_CommResourcePool->rxParametersNCell_r12->_asn_ctx = asn_ctx_default;
//txParameters_r12
//txParameters_r12
SL_CommResourcePool
->
txParameters_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
txParameters_r12
));
SL_CommResourcePool
->
txParameters_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
txParameters_r12
));
SL_CommResourcePool
->
txParameters_r12
->
sc_TxParameters_r12
.
alpha_r12
=
Alpha_r12_al0
;
SL_CommResourcePool
->
txParameters_r12
->
sc_TxParameters_r12
.
alpha_r12
=
Alpha_r12_al0
;
SL_CommResourcePool
->
txParameters_r12
->
sc_TxParameters_r12
.
p0_r12
=
0
;
SL_CommResourcePool
->
txParameters_r12
->
sc_TxParameters_r12
.
p0_r12
=
0
;
//SL_CommResourcePool->txParameters_r12->sc_TxParameters_r12._asn_ctx = asn_ctx_default;
SL_CommResourcePool
->
ext1
=
NULL
;
SL_CommResourcePool
->
ext1
=
NULL
;
//Context for parsing across buffer boundaries
//SL_CommResourcePool->_asn_ctx = asn_ctx_default;
//end SL_CommResourcePool
//end SL_CommResourcePool
//add SL_CommResourcePool to SL_CommRxPoolList
//add SL_CommResourcePool to SL_CommRxPoolList
ASN_SEQUENCE_ADD
(
&
SL_CommRxPoolList
->
list
,
SL_CommResourcePool
);
ASN_SEQUENCE_ADD
(
&
SL_CommRxPoolList
->
list
,
SL_CommResourcePool
);
//SL_CommRxPoolList->_asn_ctx = asn_ctx_default;
//end commRxPool_r12
//end commRxPool_r12
//TODO: commTxPoolNormalCommon_r12, similar to commRxPool_r12
//TODO: commTxPoolNormalCommon_r12, similar to commRxPool_r12
//TODO: commTxPoolExceptional_r12
//TODO: commTxPoolExceptional_r12
//TODO: commSyncConfig_r12
//TODO: commSyncConfig_r12
//(*sib18)->commConfig_r12->_asn_ctx = asn_ctx_default;
// may add commTxResourceUC-ReqAllowed with Ext1
// may add commTxResourceUC-ReqAllowed with Ext1
(
*
sib18
)
->
ext1
=
NULL
;
(
*
sib18
)
->
ext1
=
NULL
;
(
*
sib18
)
->
lateNonCriticalExtension
=
NULL
;
(
*
sib18
)
->
lateNonCriticalExtension
=
NULL
;
//(*sib18)->_asn_ctx = asn_ctx_default;
// end SIB18
// end SIB18
// SIB19
// SIB19
// fill in all elements of SIB19 if present
// fill in all elements of SIB19 if present
//discConfig_r12
- should be filled with the parameters from the configuration file
//discConfig_r12
(
*
sib19
)
->
discConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib19
)
->
discConfig_r12
));
(
*
sib19
)
->
discConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib19
)
->
discConfig_r12
));
SL_DiscRxPoolList
=
&
(
*
sib19
)
->
discConfig_r12
->
discRxPool_r12
;
SL_DiscRxPoolList
=
&
(
*
sib19
)
->
discConfig_r12
->
discRxPool_r12
;
memset
(
SL_DiscRxPoolList
,
0
,
sizeof
(
*
SL_DiscRxPoolList
));
memset
(
SL_DiscRxPoolList
,
0
,
sizeof
(
*
SL_DiscRxPoolList
));
//fill SL_DiscResourcePool
//fill SL_DiscResourcePool
...
@@ -1206,25 +1184,21 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1206,25 +1184,21 @@ uint8_t do_SIB23(uint8_t Mod_id,
SL_DiscResourcePool
->
discPeriod_r12
=
configuration
->
discRxPool_discPeriod
[
CC_id
];
SL_DiscResourcePool
->
discPeriod_r12
=
configuration
->
discRxPool_discPeriod
[
CC_id
];
//sc_TF_ResourceConfig_r12
//sc_TF_ResourceConfig_r12
SL_DiscResourcePool
->
numRetx_r12
=
configuration
->
discRxPool_numRetx
[
CC_id
];
SL_DiscResourcePool
->
numRetx_r12
=
configuration
->
discRxPool_numRetx
[
CC_id
];
SL_DiscResourcePool
->
numRepetition_r12
=
configuration
->
discRxPool_numRepetition
[
CC_id
];
SL_DiscResourcePool
->
numRepetition_r12
=
configuration
->
discRxPool_numRepetition
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
prb_Num_r12
=
configuration
->
discRxPool_ResourceConfig_prb_Num
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
prb_Num_r12
=
configuration
->
discRxPool_ResourceConfig_prb_Num
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
prb_Start_r12
=
configuration
->
discRxPool_ResourceConfig_prb_Start
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
prb_Start_r12
=
configuration
->
discRxPool_ResourceConfig_prb_Start
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
prb_End_r12
=
configuration
->
discRxPool_ResourceConfig_prb_End
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
prb_End_r12
=
configuration
->
discRxPool_ResourceConfig_prb_End
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
present
=
configuration
->
discRxPool_ResourceConfig_offsetIndicator_present
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
present
=
configuration
->
discRxPool_ResourceConfig_offsetIndicator_present
[
CC_id
];
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
present
==
SL_OffsetIndicator_r12_PR_small_r12
)
{
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
present
==
SL_OffsetIndicator_r12_PR_small_r12
)
{
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
=
configuration
->
discRxPool_ResourceConfig_offsetIndicator_choice
[
CC_id
]
;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
=
configuration
->
discRxPool_ResourceConfig_offsetIndicator_choice
[
CC_id
]
;
}
else
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
present
==
SL_OffsetIndicator_r12_PR_large_r12
){
}
else
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
present
==
SL_OffsetIndicator_r12_PR_large_r12
){
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
large_r12
=
configuration
->
discRxPool_ResourceConfig_offsetIndicator_choice
[
CC_id
]
;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
large_r12
=
configuration
->
discRxPool_ResourceConfig_offsetIndicator_choice
[
CC_id
]
;
}
}
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_present
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_present
[
CC_id
];
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
==
SubframeBitmapSL_r12_PR_bs4_r12
){
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
==
SubframeBitmapSL_r12_PR_bs4_r12
){
//for BS4
//for BS4
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
bits_unused
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
bits_unused
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
CC_id
];
}
else
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
==
SubframeBitmapSL_r12_PR_bs8_r12
){
}
else
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
==
SubframeBitmapSL_r12_PR_bs8_r12
){
//for BS8
//for BS8
...
@@ -1261,6 +1235,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1261,6 +1235,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
//add SL_DiscResourcePool to SL_DiscRxPoolList
//add SL_DiscResourcePool to SL_DiscRxPoolList
ASN_SEQUENCE_ADD
(
&
SL_DiscRxPoolList
->
list
,
SL_DiscResourcePool
);
ASN_SEQUENCE_ADD
(
&
SL_DiscRxPoolList
->
list
,
SL_DiscResourcePool
);
/*
//for DiscRxPoolPS
//for DiscRxPoolPS
(*sib19)->ext1 = CALLOC (1, sizeof(*(*sib19)->ext1));
(*sib19)->ext1 = CALLOC (1, sizeof(*(*sib19)->ext1));
(*sib19)->ext1->discConfigPS_13 = CALLOC (1, sizeof(*((*sib19)->ext1->discConfigPS_13)));
(*sib19)->ext1->discConfigPS_13 = CALLOC (1, sizeof(*((*sib19)->ext1->discConfigPS_13)));
...
@@ -1327,6 +1302,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1327,6 +1302,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
//add SL_DiscResourcePool to SL_DiscRxPoolList
//add SL_DiscResourcePool to SL_DiscRxPoolList
ASN_SEQUENCE_ADD(&SL_DiscRxPoolPSList->list,SL_DiscResourcePoolPS);
ASN_SEQUENCE_ADD(&SL_DiscRxPoolPSList->list,SL_DiscResourcePoolPS);
*/
(
*
sib19
)
->
lateNonCriticalExtension
=
NULL
;
(
*
sib19
)
->
lateNonCriticalExtension
=
NULL
;
//end SIB19
//end SIB19
...
@@ -1362,8 +1338,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1362,8 +1338,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
//Panos: Careful here! You have commented TTN's next two lines
//Panos: Careful here! You have commented TTN's next two lines
//TTN - for D2D
//TTN - for D2D
ASN_SEQUENCE_ADD
(
&
bcch_message
->
message
.
choice
.
c1
.
choice
.
systemInformation
.
criticalExtensions
.
choice
.
systemInformation_r8
.
sib_TypeAndInfo
.
list
,
sib18_part
);
ASN_SEQUENCE_ADD
(
&
bcch_message
->
message
.
choice
.
c1
.
choice
.
systemInformation
.
criticalExtensions
.
choice
.
systemInformation_r8
.
sib_TypeAndInfo
.
list
,
sib18_part
);
//
ASN_SEQUENCE_ADD(&bcch_message->message.choice.c1.choice.systemInformation.criticalExtensions.choice.systemInformation_r8.sib_TypeAndInfo.list, sib19_part);
ASN_SEQUENCE_ADD
(
&
bcch_message
->
message
.
choice
.
c1
.
choice
.
systemInformation
.
criticalExtensions
.
choice
.
systemInformation_r8
.
sib_TypeAndInfo
.
list
,
sib19_part
);
//ASN_SEQUENCE_ADD(&bcch_message->message.choice.c1.choice.systemInformation.criticalExtensions.choice.systemInformation_r8.sib_TypeAndInfo.list, sib21_part);
//ASN_SEQUENCE_ADD(&bcch_message->message.choice.c1.choice.systemInformation.criticalExtensions.choice.systemInformation_r8.sib_TypeAndInfo.list, sib21_part);
#endif
#endif
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
93052033
...
@@ -5307,8 +5307,7 @@ rrc_ue_process_sidelink_radioResourceConfig(
...
@@ -5307,8 +5307,7 @@ rrc_ue_process_sidelink_radioResourceConfig(
//do not consider commTXPoolExceptional for the moment
//do not consider commTXPoolExceptional for the moment
//configure PHY/MAC to receive SL communication by using the RPs indicated by commRxPool
//configure PHY/MAC to receive SL communication by using the RPs indicated by commRxPool
//sib18->commConfig_r12->commRxPool_r12
//sib18->commConfig_r12->commRxPool_r12
//we can configure a default SLRB to receive one-to-many communication [should be verified]
//TODO
if
(
sib18
->
commConfig_r12
->
commTxPoolNormalCommon_r12
!=
NULL
)
{
//commTxPoolNormalCommon - to transmit SL communication in RRC_IDLE
if
(
sib18
->
commConfig_r12
->
commTxPoolNormalCommon_r12
!=
NULL
)
{
//commTxPoolNormalCommon - to transmit SL communication in RRC_IDLE
//maybe we don't consider this case for the moment since UE will immediately establish a RRC connection after receiving SIB messages
//maybe we don't consider this case for the moment since UE will immediately establish a RRC connection after receiving SIB messages
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
View file @
93052033
...
@@ -107,9 +107,9 @@ eNBs =
...
@@ -107,9 +107,9 @@ eNBs =
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
ue_TransmissionMode
=
1
;
//
Parameters
for
SIB18
//
Parameters
for
SIB18
rxPool_sc_CP_Len
=
"normal"
;
rxPool_sc_CP_Len
=
"normal"
;
rxPool_sc_Period
=
"sf40"
;
rxPool_sc_Period
=
"sf40"
;
rxPool_data_CP_Len
=
"normal"
;
rxPool_data_CP_Len
=
"normal"
;
...
@@ -127,7 +127,21 @@ eNBs =
...
@@ -127,7 +127,21 @@ eNBs =
rxPool_dataHoppingConfig_rbOffset
=
0
;
rxPool_dataHoppingConfig_rbOffset
=
0
;
rxPool_commTxResourceUC
-
ReqAllowed
=
"TRUE"
;
rxPool_commTxResourceUC
-
ReqAllowed
=
"TRUE"
;
*/
*/
//
Parameters
for
SIB19
discRxPool_cp_Len
=
"normal"
discRxPool_discPeriod
=
"rf32"
discRxPool_numRetx
=
1
;
discRxPool_numRepetition
=
2
;
discRxPool_ResourceConfig_prb_Num
=
5
;
discRxPool_ResourceConfig_prb_Start
=
3
;
discRxPool_ResourceConfig_prb_End
=
21
;
discRxPool_ResourceConfig_offsetIndicator_present
=
"prSmall"
;
discRxPool_ResourceConfig_offsetIndicator_choice
=
0
;
discRxPool_ResourceConfig_subframeBitmap_present
=
"prBs40"
;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
=
"f0ffffffff"
;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
=
5
;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
=
0
;
}
}
);
);
...
...
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