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
canghaiwuhen
OpenXG-RAN
Commits
22bcc7a5
Commit
22bcc7a5
authored
Oct 17, 2017
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add SIB19 support - eNB
parent
2de24be2
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
390 additions
and
100 deletions
+390
-100
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+31
-12
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+110
-13
openair2/ENB_APP/enb_paramdef.h
openair2/ENB_APP/enb_paramdef.h
+34
-6
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+93
-34
openair2/RRC/LITE/defs.h
openair2/RRC/LITE/defs.h
+1
-1
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+36
-3
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+65
-28
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
...ENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
+20
-3
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
22bcc7a5
...
...
@@ -41,6 +41,7 @@
#include "SubframeBitmapSL-r12.h"
#include "SL-CP-Len-r12.h"
#include "SL-PeriodComm-r12.h"
#include "SL-DiscResourcePool-r12.h"
//-------------------------------------------------------------------------------------------//
...
...
@@ -172,19 +173,37 @@ typedef struct RrcConfigurationReq_s {
long
ue_TimersAndConstants_n311
[
MAX_NUM_CCs
];
long
ue_TransmissionMode
[
MAX_NUM_CCs
];
//TTN - for D2D
e_SL_CP_Len_r12
rxPool_sc_CP_Len
[
MAX_NUM_CCs
];
e_SL_PeriodComm_r12
rxPool_sc_Period
[
MAX_NUM_CCs
];
e_SL_CP_Len_r12
rxPool_data_CP_Len
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_prb_Num
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_prb_Start
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_prb_End
[
MAX_NUM_CCs
];
//TTN - for D2D
//SIB18
e_SL_CP_Len_r12
rxPool_sc_CP_Len
[
MAX_NUM_CCs
];
e_SL_PeriodComm_r12
rxPool_sc_Period
[
MAX_NUM_CCs
];
e_SL_CP_Len_r12
rxPool_data_CP_Len
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_prb_Num
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_prb_Start
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_prb_End
[
MAX_NUM_CCs
];
SL_OffsetIndicator_r12_PR
rxPool_ResourceConfig_offsetIndicator_present
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_offsetIndicator_choice
[
MAX_NUM_CCs
];
SubframeBitmapSL_r12_PR
rxPool_ResourceConfig_subframeBitmap_present
[
MAX_NUM_CCs
];
char
*
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_offsetIndicator_choice
[
MAX_NUM_CCs
];
SubframeBitmapSL_r12_PR
rxPool_ResourceConfig_subframeBitmap_present
[
MAX_NUM_CCs
];
char
*
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
MAX_NUM_CCs
];
long
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
MAX_NUM_CCs
];
//SIB19
SL_CP_Len_r12_t
discRxPool_cp_Len
[
MAX_NUM_CCs
];
e_SL_DiscResourcePool_r12__discPeriod_r12
discRxPool_discPeriod
[
MAX_NUM_CCs
];
long
discRxPool_numRetx
[
MAX_NUM_CCs
];
long
discRxPool_numRepetition
[
MAX_NUM_CCs
];
long
discRxPool_ResourceConfig_prb_Num
[
MAX_NUM_CCs
];
long
discRxPool_ResourceConfig_prb_Start
[
MAX_NUM_CCs
];
long
discRxPool_ResourceConfig_prb_End
[
MAX_NUM_CCs
];
SL_OffsetIndicator_r12_PR
discRxPool_ResourceConfig_offsetIndicator_present
[
MAX_NUM_CCs
];
long
discRxPool_ResourceConfig_offsetIndicator_choice
[
MAX_NUM_CCs
];
SubframeBitmapSL_r12_PR
discRxPool_ResourceConfig_subframeBitmap_present
[
MAX_NUM_CCs
];
char
*
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
MAX_NUM_CCs
];
long
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
MAX_NUM_CCs
];
long
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
MAX_NUM_CCs
];
...
...
openair2/ENB_APP/enb_config.c
View file @
22bcc7a5
...
...
@@ -439,18 +439,34 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
int32_t
ue_TransmissionMode
=
0
;
//TTN - for D2D
const
char
*
rxPool_sc_CP_Len
=
NULL
;
const
char
*
rxPool_sc_Period
=
NULL
;
const
char
*
rxPool_data_CP_Len
=
NULL
;
libconfig_int
rxPool_ResourceConfig_prb_Num
=
0
;
libconfig_int
rxPool_ResourceConfig_prb_Start
=
0
;
libconfig_int
rxPool_ResourceConfig_prb_End
=
0
;
const
char
*
rxPool_ResourceConfig_offsetIndicator_present
=
NULL
;
libconfig_int
rxPool_ResourceConfig_offsetIndicator_choice
=
0
;
const
char
*
rxPool_ResourceConfig_subframeBitmap_present
=
NULL
;
const
char
*
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf
=
NULL
;
libconfig_int
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
=
0
;
//SIB18
const
char
*
rxPool_sc_CP_Len
=
NULL
;
const
char
*
rxPool_sc_Period
=
NULL
;
const
char
*
rxPool_data_CP_Len
=
NULL
;
libconfig_int
rxPool_ResourceConfig_prb_Num
=
0
;
libconfig_int
rxPool_ResourceConfig_prb_Start
=
0
;
libconfig_int
rxPool_ResourceConfig_prb_End
=
0
;
const
char
*
rxPool_ResourceConfig_offsetIndicator_present
=
NULL
;
libconfig_int
rxPool_ResourceConfig_offsetIndicator_choice
=
0
;
const
char
*
rxPool_ResourceConfig_subframeBitmap_present
=
NULL
;
const
char
*
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf
=
NULL
;
libconfig_int
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
=
0
;
libconfig_int
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
=
0
;
//SIB19
const
char
*
discRxPool_cp_Len
=
NULL
;
const
char
*
discRxPool_discPeriod
=
NULL
;
libconfig_int
discRxPool_numRetx
=
0
;
libconfig_int
discRxPool_numRepetition
=
0
;
libconfig_int
discRxPool_ResourceConfig_prb_Num
=
0
;
libconfig_int
discRxPool_ResourceConfig_prb_Start
=
0
;
libconfig_int
discRxPool_ResourceConfig_prb_End
=
0
;
const
char
*
discRxPool_ResourceConfig_offsetIndicator_present
=
NULL
;
libconfig_int
discRxPool_ResourceConfig_offsetIndicator_choice
=
0
;
const
char
*
discRxPool_ResourceConfig_subframeBitmap_present
=
NULL
;
const
char
*
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
=
NULL
;
libconfig_int
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
=
0
;
libconfig_int
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
=
0
;
...
...
@@ -1734,6 +1750,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
}
//TTN - for D2D
//SIB18
if
(
strcmp
(
rxPool_sc_CP_Len
,
"normal"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_sc_CP_Len
[
j
]
=
SL_CP_Len_r12_normal
;
}
else
if
(
strcmp
(
rxPool_sc_CP_Len
,
"extended"
)
==
0
)
{
...
...
@@ -1753,7 +1770,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_sc_Period
[
j
]
=
SL_PeriodComm_r12_sf80
;
}
else
if
(
strcmp
(
rxPool_sc_Period
,
"sf120"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_sc_Period
[
j
]
=
SL_PeriodComm_r12_sf120
;
}
else
if
(
strcmp
(
rxPool_sc_Period
,
"sf40"
)
==
0
)
{
}
else
if
(
strcmp
(
rxPool_sc_Period
,
"sf
1
40"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_sc_Period
[
j
]
=
SL_PeriodComm_r12_sf140
;
}
else
if
(
strcmp
(
rxPool_sc_Period
,
"sf160"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_sc_Period
[
j
]
=
SL_PeriodComm_r12_sf160
;
...
...
@@ -1777,7 +1794,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_sc_Period
[
j
]
=
SL_PeriodComm_r12_spare
;
}
else
AssertFatal
(
0
,
"Failed to parse eNB configuration file %s, enb %d unknown value
\"
%s
\"
for rxPool_sc_Period choice:
prNothing,prSmal,prLarg
e!
\n
"
,
"Failed to parse eNB configuration file %s, enb %d unknown value
\"
%s
\"
for rxPool_sc_Period choice:
sf40,sf60,sf70,sf80,sf120,sf140,sf160,sf240,sf280,sf320,spare6,spare5,spare4,spare3,spare2,spar
e!
\n
"
,
RC
.
config_file_name
,
i
,
rxPool_sc_Period
);
if
(
strcmp
(
rxPool_data_CP_Len
,
"normal"
)
==
0
)
{
...
...
@@ -1831,6 +1848,86 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
j
]
=
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
;
RRC_CONFIGURATION_REQ
(
msg_p
).
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
j
]
=
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
;
//SIB19
if
(
strcmp
(
discRxPool_cp_Len
,
"normal"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_cp_Len
[
j
]
=
SL_CP_Len_r12_normal
;
}
else
if
(
strcmp
(
discRxPool_cp_Len
,
"extended"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_cp_Len
[
j
]
=
SL_CP_Len_r12_extended
;
}
else
AssertFatal
(
0
,
"Failed to parse eNB configuration file %s, enb %d unknown value
\"
%s
\"
for discRxPool_cp_Len choice: normal,extended!
\n
"
,
RC
.
config_file_name
,
i
,
discRxPool_cp_Len
);
if
(
strcmp
(
discRxPool_discPeriod
,
"rf32"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf32
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"rf64"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf64
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"rf128"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf128
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"rf256"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf256
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"rf512"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf512
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"rf1024"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf1024
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"rf16"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_rf16_v1310
;
}
else
if
(
strcmp
(
discRxPool_discPeriod
,
"spare"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_discPeriod
[
j
]
=
SL_DiscResourcePool_r12__discPeriod_r12_spare
;
}
else
AssertFatal
(
0
,
"Failed to parse eNB configuration file %s, enb %d unknown value
\"
%s
\"
for discRxPool_discPeriod choice: rf32,rf64,rf128,rf512,rf1024,rf16,spare!
\n
"
,
RC
.
config_file_name
,
i
,
discRxPool_discPeriod
);
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_numRetx
[
j
]
=
discRxPool_numRetx
;
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_numRepetition
[
j
]
=
discRxPool_numRepetition
;
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_prb_Num
[
j
]
=
discRxPool_ResourceConfig_prb_Num
;
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_prb_Start
[
j
]
=
discRxPool_ResourceConfig_prb_Start
;
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_prb_End
[
j
]
=
discRxPool_ResourceConfig_prb_End
;
if
(
strcmp
(
discRxPool_ResourceConfig_offsetIndicator_present
,
"prNothing"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_offsetIndicator_present
[
j
]
=
SL_OffsetIndicator_r12_PR_NOTHING
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_offsetIndicator_present
,
"prSmall"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_offsetIndicator_present
[
j
]
=
SL_OffsetIndicator_r12_PR_small_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_offsetIndicator_present
,
"prLarge"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_offsetIndicator_present
[
j
]
=
SL_OffsetIndicator_r12_PR_large_r12
;
}
else
AssertFatal
(
0
,
"Failed to parse eNB configuration file %s, enb %d unknown value
\"
%s
\"
for discRxPool_ResourceConfig_offsetIndicator_present choice: prNothing,prSmal,prLarge!
\n
"
,
RC
.
config_file_name
,
i
,
discRxPool_ResourceConfig_offsetIndicator_present
);
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_offsetIndicator_choice
[
j
]
=
discRxPool_ResourceConfig_offsetIndicator_choice
;
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prNothing"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_NOTHING
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs4"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs4_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs8"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs8_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs12"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs12_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs16"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs16_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs30"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs30_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs40"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs40_r12
;
}
else
if
(
strcmp
(
discRxPool_ResourceConfig_subframeBitmap_present
,
"prBs42"
)
==
0
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_present
[
j
]
=
SubframeBitmapSL_r12_PR_bs42_r12
;
}
else
AssertFatal
(
0
,
"Failed to parse eNB configuration file %s, enb %d unknown value
\"
%s
\"
for discRxPool_ResourceConfig_subframeBitmap_present choice: prNothing,prBs4,prBs8,prBs12,prBs16,prBs30,prBs40,prBs42!
\n
"
,
RC
.
config_file_name
,
i
,
discRxPool_ResourceConfig_subframeBitmap_present
);
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
j
]
=
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
;
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
j
]
=
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
;
RRC_CONFIGURATION_REQ
(
msg_p
).
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
j
]
=
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
;
}
}
...
...
openair2/ENB_APP/enb_paramdef.h
View file @
22bcc7a5
...
...
@@ -373,6 +373,7 @@ static int DEFENBS[] = {0};
#define ENB_CONFIG_STRING_UE_TRANSMISSION_MODE "ue_TransmissionMode"
//TTN - for D2D
//SIB18
#define ENB_CONFIG_STRING_RXPOOL_SC_CP_LEN "rxPool_sc_CP_Len"
#define ENB_CONFIG_STRING_RXPOOL_SC_PRIOD "rxPool_sc_Period"
#define ENB_CONFIG_STRING_RXPOOL_DATA_CP_LEN "rxPool_data_CP_Len"
...
...
@@ -380,11 +381,25 @@ static int DEFENBS[] = {0};
#define ENB_CONFIG_STRING_RXPOOL_RC_PRB_START "rxPool_ResourceConfig_prb_Start"
#define ENB_CONFIG_STRING_RXPOOL_RC_PRB_END "rxPool_ResourceConfig_prb_End"
#define ENB_CONFIG_STRING_RXPOOL_RC_OFFSETIND_PRESENT "rxPool_ResourceConfig_offsetIndicator_present"
#define ENB_CONFIG_STRING_RXPOOL_RC_OFFSETIND_CHOICE "rxPool_ResourceConfig_offsetIndicator_choice"
#define ENB_CONFIG_STRING_RXPOOL_RC_OFFSETIND_CHOICE
"rxPool_ResourceConfig_offsetIndicator_choice"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_PRESENT "rxPool_ResourceConfig_subframeBitmap_present"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_BUF "rxPool_ResourceConfig_subframeBitmap_choice_bs_buf"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_SIZE "rxPool_ResourceConfig_subframeBitmap_choice_bs_size"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_ASN_BITS_UNUSED "rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_BUF "rxPool_ResourceConfig_subframeBitmap_choice_bs_buf"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_SIZE "rxPool_ResourceConfig_subframeBitmap_choice_bs_size"
#define ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_ASN_BITS_UNUSED "rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused"
//SIB19
#define ENB_CONFIG_STRING_DISCRXPOOL_CP_LEN "discRxPool_cp_Len"
#define ENB_CONFIG_STRING_DISCRXPOOL_DISCPERIOD "discRxPool_discPeriod"
#define ENB_CONFIG_STRING_DISCRXPOOL_NUMRETX "discRxPool_numRetx"
#define ENB_CONFIG_STRING_DISCRXPOOL_NUMREPETITION "discRxPool_numRepetition"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_PRB_NUM "discRxPool_ResourceConfig_prb_Num"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_PRB_START "discRxPool_ResourceConfig_prb_Start"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_PRB_END "discRxPool_ResourceConfig_prb_End"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_OFFSETIND_PRESENT "discRxPool_ResourceConfig_offsetIndicator_present"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_OFFSETIND_CHOICE "discRxPool_ResourceConfig_offsetIndicator_choice"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_PRESENT "discRxPool_ResourceConfig_subframeBitmap_present"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_CHOICE_BS_BUF "discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_CHOICE_BS_SIZE "discRxPool_ResourceConfig_subframeBitmap_choice_bs_size"
#define ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_CHOICE_BS_ASN_BITS_UNUSED "discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused"
...
...
@@ -471,8 +486,21 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_RXPOOL_RC_OFFSETIND_CHOICE, NULL, 0, iptr:&rxPool_ResourceConfig_offsetIndicator_choice, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_PRESENT, NULL, 0, strptr:&rxPool_ResourceConfig_subframeBitmap_present, defstrval:"prNothing", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_BUF, NULL, 0, strptr:&rxPool_ResourceConfig_subframeBitmap_choice_bs_buf, defstrval:"001001", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_SIZE, NULL, 0, iptr:&rxPool_ResourceConfig_subframeBitmap_choice_bs_size, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_ASN_BITS_UNUSED,NULL, 0, iptr:&rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused, defintval:1, TYPE_UINT, 0} \
{ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_SIZE, NULL, 0, iptr:&rxPool_ResourceConfig_subframeBitmap_choice_bs_size, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RXPOOL_RC_SFBITMAP_CHOICE_BS_ASN_BITS_UNUSED, NULL, 0, iptr:&rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_CP_LEN, NULL, 0, strptr:&discRxPool_cp_Len, defstrval:"normal", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_DISCPERIOD, NULL, 0, strptr:&discRxPool_discPeriod, defstrval:"rf32", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_NUMRETX, NULL, 0, iptr:&discRxPool_numRetx, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_NUMREPETITION, NULL, 0, iptr:&discRxPool_numRepetition, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_PRB_NUM, NULL, 0, iptr:&discRxPool_ResourceConfig_prb_Num, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_PRB_START, NULL, 0, iptr:&discRxPool_ResourceConfig_prb_Start, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_PRB_END, NULL, 0, iptr:&discRxPool_ResourceConfig_prb_End, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_OFFSETIND_PRESENT, NULL, 0, strptr:&discRxPool_ResourceConfig_offsetIndicator_present, defstrval:"prNothing", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_OFFSETIND_CHOICE, NULL, 0, iptr:&discRxPool_ResourceConfig_offsetIndicator_choice, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_PRESENT, NULL, 0, strptr:&discRxPool_ResourceConfig_subframeBitmap_present, defstrval:"prNothing", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_CHOICE_BS_BUF, NULL, 0, strptr:&discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf, defstrval:"001001", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_CHOICE_BS_SIZE, NULL, 0, iptr:&discRxPool_ResourceConfig_subframeBitmap_choice_bs_size, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_DISCRXPOOL_RC_SFBITMAP_CHOICE_BS_ASN_BITS_UNUSED,NULL, 0, iptr:&discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused, defintval:1, TYPE_UINT, 0} \
}
/*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
...
...
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
22bcc7a5
...
...
@@ -432,6 +432,11 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
ASN_SEQUENCE_ADD
(
&
schedulingInfo
.
sib_MappingInfo
.
list
,
&
sib_type
);
ASN_SEQUENCE_ADD
(
&
(
*
sib1
)
->
schedulingInfoList
.
list
,
&
schedulingInfo
);
//TTN - This is for SIB19
sib_type
=
SIB_Type_sibType19_v1250
;
ASN_SEQUENCE_ADD
(
&
schedulingInfo
.
sib_MappingInfo
.
list
,
&
sib_type
);
ASN_SEQUENCE_ADD
(
&
(
*
sib1
)
->
schedulingInfoList
.
list
,
&
schedulingInfo
);
// ASN_SEQUENCE_ADD(&schedulingInfo.sib_MappingInfo.list,NULL);
#if defined(ENABLE_ITTI)
...
...
@@ -536,7 +541,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
//TTN - for D2D
SystemInformationBlockType18_r12_t
**
sib18
=
&
RC
.
rrc
[
Mod_id
]
->
carrier
[
CC_id
].
sib18
;
//
SystemInformationBlockType19_r12_t **sib19 = &RC.rrc[Mod_id]->carrier[CC_id].sib19;
SystemInformationBlockType19_r12_t
**
sib19
=
&
RC
.
rrc
[
Mod_id
]
->
carrier
[
CC_id
].
sib19
;
//SystemInformationBlockType21_r14_t **sib21 = &RC.rrc[Mod_id]->carrier[CC_id].sib21;
if
(
bcch_message
)
{
...
...
@@ -585,18 +590,18 @@ uint8_t do_SIB23(uint8_t Mod_id,
//TTN - for D2D
sib18_part
=
CALLOC
(
1
,
sizeof
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
));
//
sib19_part = CALLOC(1,sizeof(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member));
sib19_part
=
CALLOC
(
1
,
sizeof
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
));
//sib21_part = CALLOC(1,sizeof(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member));
memset
(
sib18_part
,
0
,
sizeof
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
));
//
memset(sib19_part,0,sizeof(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member));
memset
(
sib19_part
,
0
,
sizeof
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
));
//memset(sib21_part,0,sizeof(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member));
sib18_part
->
present
=
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib18_v1250
;
//
sib19_part->present = SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib19_v1250;
sib19_part
->
present
=
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib19_v1250
;
//sib21_part->present = SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib21_v14x0;
*
sib18
=
&
sib18_part
->
choice
.
sib18_v1250
;
//
*sib19 = &sib19_part->choice.sib19_v1250;
*
sib19
=
&
sib19_part
->
choice
.
sib19_v1250
;
//*sib21 = &sib19_part->choice.sib21_v14x0;
...
...
@@ -999,14 +1004,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
// fill in all elements of SIB18 if present
//later we can read the parameters from the configuration file as for eNB's parameters
asn_struct_ctx_t
asn_ctx_default
;
asn_ctx_default
.
phase
=
0
;
//Decoding phase
asn_ctx_default
.
step
=
0
;
//Elementary step of a phase
asn_ctx_default
.
context
=
0
;
//Other context information
asn_ctx_default
.
ptr
=
NULL
;
//Decoder-specific stuff (stack elements)
asn_ctx_default
.
left
=
0
;
//Number of bytes left, -1 for indefinite
//commRxPool_r12 - should be filled with
real values
//commRxPool_r12 - should be filled with
the parameters from the configuration file
(
*
sib18
)
->
commConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib18
)
->
commConfig_r12
));
SL_CommRxPoolList
=
&
(
*
sib18
)
->
commConfig_r12
->
commRxPool_r12
;
memset
(
SL_CommRxPoolList
,
0
,
sizeof
(
*
SL_CommRxPoolList
));
...
...
@@ -1068,7 +1067,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
SL_CommResourcePool
->
dataHoppingConfig_r12
.
hoppingParameter_r12
=
0
;
SL_CommResourcePool
->
dataHoppingConfig_r12
.
numSubbands_r12
=
SL_HoppingConfigComm_r12__numSubbands_r12_ns1
;
SL_CommResourcePool
->
dataHoppingConfig_r12
.
rb_Offset_r12
=
0
;
SL_CommResourcePool
->
dataHoppingConfig_r12
.
_asn_ctx
=
asn_ctx_default
;
//
SL_CommResourcePool->dataHoppingConfig_r12._asn_ctx = asn_ctx_default;
//ue_SelectedResourceConfig_r12
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
));
...
...
@@ -1077,68 +1076,128 @@ uint8_t do_SIB23(uint8_t Mod_id,
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
prb_End_r12
=
0
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
present
=
SL_OffsetIndicator_r12_PR_NOTHING
;
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
.
_asn_ctx
.
phase
=
0
;
//Decoding phase
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
_asn_ctx
.
step
=
0
;
//Elementary step of a phase
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
_asn_ctx
.
context
=
0
;
//Other context information
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
_asn_ctx
.
ptr
=
NULL
;
//Decoder-specific stuff (stack elements)
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
_asn_ctx
.
left
=
0
;
//Number of bytes left, -1 for indefinite
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
present
=
SubframeBitmapSL_r12_PR_NOTHING
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
size
=
0
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
buf
=
NULL
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
bits_unused
=
0
;
SL_CommResourcePool
->
ue_SelectedResourceConfig_r12
->
data_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs4_r12
.
_asn_ctx
=
asn_ctx_default
;
//
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
->
_asn_ctx
=
asn_ctx_default
;
//
SL_CommResourcePool->ue_SelectedResourceConfig_r12->_asn_ctx = asn_ctx_default;
//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
->
subframeAssignment
=
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->tdd_Config_r12->_asn_ctx = asn_ctx_default;
SL_CommResourcePool
->
rxParametersNCell_r12
->
syncConfigIndex_r12
=
0
;
SL_CommResourcePool
->
rxParametersNCell_r12
->
_asn_ctx
=
asn_ctx_default
;
//
SL_CommResourcePool->rxParametersNCell_r12->_asn_ctx = asn_ctx_default;
//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
.
p0_r12
=
0
;
SL_CommResourcePool
->
txParameters_r12
->
sc_TxParameters_r12
.
_asn_ctx
=
asn_ctx_default
;
//
SL_CommResourcePool->txParameters_r12->sc_TxParameters_r12._asn_ctx = asn_ctx_default;
//SL_CommResourcePool->ext1->priorityList_r13 ;//optional
SL_CommResourcePool
->
ext1
=
NULL
;
//Context for parsing across buffer boundaries
SL_CommResourcePool
->
_asn_ctx
=
asn_ctx_default
;
//
SL_CommResourcePool->_asn_ctx = asn_ctx_default;
//end SL_CommResourcePool
//add SL_CommResourcePool to SL_CommRxPoolList
ASN_SEQUENCE_ADD
(
&
SL_CommRxPoolList
->
list
,
SL_CommResourcePool
);
SL_CommRxPoolList
->
_asn_ctx
=
asn_ctx_default
;
//
SL_CommRxPoolList->_asn_ctx = asn_ctx_default;
//end commRxPool_r12
//TODO: commTxPoolNormalCommon_r12, similar to commRxPool_r12
//TODO: commTxPoolExceptional_r12
//TODO: commSyncConfig_r12
(
*
sib18
)
->
commConfig_r12
->
_asn_ctx
=
asn_ctx_default
;
//
(*sib18)->commConfig_r12->_asn_ctx = asn_ctx_default;
// may add commTxResourceUC-ReqAllowed with Ext1
(
*
sib18
)
->
ext1
=
NULL
;
(
*
sib18
)
->
lateNonCriticalExtension
=
NULL
;
(
*
sib18
)
->
_asn_ctx
=
asn_ctx_default
;
//(*sib18)->_asn_ctx = asn_ctx_default;
// end SIB18
// SIB19
// fill in all elements of SIB19 if present
/*
SL_DiscRxPoolList= &(*sib19)->discConfig_r12->discRxPool_r12;
//discConfig_r12 - should be filled with the parameters from the configuration file
(
*
sib19
)
->
discConfig_r12
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib19
)
->
discConfig_r12
));
SL_DiscRxPoolList
=
&
(
*
sib19
)
->
discConfig_r12
->
discRxPool_r12
;
memset
(
SL_DiscRxPoolList
,
0
,
sizeof
(
*
SL_DiscRxPoolList
));
//fill SL_DiscResourcePool
//SL_DiscResourcePool->
//add SL_DiscResourcePool to SL_DiscRxPoolList
SL_DiscResourcePool
=
CALLOC
(
1
,
sizeof
(
*
SL_DiscResourcePool
));
SL_DiscResourcePool
->
cp_Len_r12
=
configuration
->
discRxPool_cp_Len
[
CC_id
];
SL_DiscResourcePool
->
discPeriod_r12
=
configuration
->
discRxPool_discPeriod
[
CC_id
];
//sc_TF_ResourceConfig_r12
SL_DiscResourcePool
->
numRetx_r12
=
configuration
->
discRxPool_numRetx
[
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_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
.
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
)
{
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
){
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
];
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
==
SubframeBitmapSL_r12_PR_bs4_r12
){
//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
.
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
];
}
else
if
(
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
present
==
SubframeBitmapSL_r12_PR_bs8_r12
){
//for BS8
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs8_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs8_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs8_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_bs12_r12
){
//for BS12
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs12_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs12_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs12_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_bs16_r12
){
//for BS16
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs16_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs16_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs16_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_bs30_r12
){
//for BS30
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs30_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs30_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs30_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_bs40_r12
){
//for BS40
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs40_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs40_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs40_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_bs42_r12
){
//for BS42
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs42_r12
.
size
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
[
CC_id
];
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs42_r12
.
buf
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
[
CC_id
];;
SL_DiscResourcePool
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs42_r12
.
bits_unused
=
configuration
->
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
[
CC_id
];
}
//add SL_DiscResourcePool to SL_DiscRxPoolList
ASN_SEQUENCE_ADD
(
&
SL_DiscRxPoolList
->
list
,
SL_DiscResourcePool
);
*/
(
*
sib19
)
->
ext1
=
NULL
;
(
*
sib19
)
->
lateNonCriticalExtension
=
NULL
;
//end SIB19
bcch_message
->
message
.
present
=
BCCH_DL_SCH_MessageType_PR_c1
;
...
...
@@ -1168,7 +1227,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
//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, 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);
...
...
openair2/RRC/LITE/defs.h
View file @
22bcc7a5
...
...
@@ -591,7 +591,7 @@ typedef struct UE_RRC_INST_s {
SystemInformationBlockType11_t
*
sib11
[
NB_CNX_UE
];
//TTN - SIB18
SystemInformationBlockType18_r12_t
*
sib18
[
NB_CNX_UE
];
SystemInformationBlockType19_r12_t
*
sib19
[
NB_CNX_UE
];
#if defined(Rel10) || defined(Rel14)
uint8_t
MBMS_flag
;
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
22bcc7a5
...
...
@@ -3520,7 +3520,7 @@ static void dump_sib13( SystemInformationBlockType13_r9_t *sib13 )
}
#endif
//TTN
//TTN
- SIB18
//-----------------------------------------------------------------------------
static
void
dump_sib18
(
SystemInformationBlockType18_r12_t
*
sib18
){
LOG_I
(
RRC
,
"[UE] Dumping SIB18
\n
"
);
...
...
@@ -3533,11 +3533,26 @@ static void dump_sib18(SystemInformationBlockType18_r12_t *sib18){
LOG_I
(
RRC
,
" SIB18 prb_Start_r12: %d
\n
"
,
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
i
]
->
sc_TF_ResourceConfig_r12
.
prb_Start_r12
);
LOG_I
(
RRC
,
" SIB18 prb_End_r12: %d
\n
"
,
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
i
]
->
sc_TF_ResourceConfig_r12
.
prb_End_r12
);
//to add more log
}
}
//TTN - SIB19
//-----------------------------------------------------------------------------
static
void
dump_sib19
(
SystemInformationBlockType19_r12_t
*
sib19
){
LOG_I
(
RRC
,
"[UE] Dumping SIB19
\n
"
);
for
(
int
i
=
0
;
i
<
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
count
;
i
++
)
{
LOG_I
(
RRC
,
" Contents of SIB18 %d/%d
\n
"
,
i
+
1
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
count
);
LOG_I
(
RRC
,
" SIB19 cp_Len_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
cp_Len_r12
);
LOG_I
(
RRC
,
" SIB19 discPeriod_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
discPeriod_r12
);
LOG_I
(
RRC
,
" SIB19 numRetx_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
numRetx_r12
);
LOG_I
(
RRC
,
" SIB19 numRepetition_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
numRepetition_r12
);
LOG_I
(
RRC
,
" SIB19 prb_Num_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
tf_ResourceConfig_r12
.
prb_Num_r12
);
LOG_I
(
RRC
,
" SIB19 prb_Start_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
tf_ResourceConfig_r12
.
prb_Start_r12
);
LOG_I
(
RRC
,
" SIB19 prb_End_r12: %d
\n
"
,
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
i
]
->
tf_ResourceConfig_r12
.
prb_End_r12
);
//to add more log
}
}
//-----------------------------------------------------------------------------
static
int
decode_SI
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
const
uint8_t
eNB_index
)
{
...
...
@@ -3806,6 +3821,24 @@ static int decode_SI( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_in
}
break
;
//TTN - SIB19
case
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib19_v1250
:
if
((
UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
eNB_index
].
SIStatus
&
16384
)
==
0
)
{
UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
eNB_index
].
SIStatus
|=
16384
;
new_sib
=
1
;
memcpy
(
UE_rrc_inst
[
ctxt_pP
->
module_id
].
sib19
[
eNB_index
],
&
typeandinfo
->
choice
.
sib19_v1250
,
sizeof
(
SystemInformationBlockType19_r12_t
)
);
LOG_I
(
RRC
,
"[UE %"
PRIu8
"] Frame %"
PRIu32
" Found SIB19 from eNB %"
PRIu8
"
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
eNB_index
);
dump_sib19
(
UE_rrc_inst
[
ctxt_pP
->
module_id
].
sib19
[
eNB_index
]
);
// adding here function to store necessary parameters to transfer to PHY layer
LOG_I
(
RRC
,
"[FRAME %05"
PRIu32
"][RRC_UE][MOD %02"
PRIu8
"][][--- MAC_CONFIG_REQ (SIB19 params eNB %"
PRIu8
") --->][MAC_UE][MOD %02"
PRIu8
"][]
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
module_id
,
eNB_index
,
ctxt_pP
->
module_id
);
//should modify function rrc_mac_config_req_ue() to transfer SL-related parameters to PHY
//rrc_mac_config_req_ue();
}
break
;
default:
break
;
}
...
...
openair2/RRC/LITE/rrc_eNB.c
View file @
22bcc7a5
...
...
@@ -225,37 +225,74 @@ init_SI(
//TTN - SIB 18
for
(
int
j
=
0
;
j
<
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
count
;
j
++
)
{
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" Contents of SIB18 %d/%d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
j
+
1
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
count
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 rxPool_sc_CP_Len: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_CP_Len_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 sc_Period_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_Period_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 data_CP_Len_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
data_CP_Len_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 prb_Num_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
prb_Num_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 prb_Start_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
prb_Start_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 prb_End_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
prb_End_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 offsetIndicator: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 subframeBitmap_choice_bs_buf: %s
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs16_r12
.
buf
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" Contents of SIB18 %d/%d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
j
+
1
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
count
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 rxPool_sc_CP_Len: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_CP_Len_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 sc_Period_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_Period_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 data_CP_Len_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
data_CP_Len_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 prb_Num_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
prb_Num_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 prb_Start_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
prb_Start_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 prb_End_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
prb_End_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 offsetIndicator: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB18 subframeBitmap_choice_bs_buf: %s
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib18
->
commConfig_r12
->
commRxPool_r12
.
list
.
array
[
j
]
->
sc_TF_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs16_r12
.
buf
);
}
//TTN - SIB 19
for
(
int
j
=
0
;
j
<
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
count
;
j
++
)
{
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" Contents of SIB19 %d/%d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
j
+
1
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
count
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 cp_Len_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
cp_Len_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 discPeriod_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
discPeriod_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 numRetx_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
numRetx_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 numRepetition_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
numRepetition_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 tf_ResourceConfig_r12 prb_Num_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
tf_ResourceConfig_r12
.
prb_Num_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 tf_ResourceConfig_r12 prb_Start_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
tf_ResourceConfig_r12
.
prb_Start_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 tf_ResourceConfig_r12 prb_End_r12: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
tf_ResourceConfig_r12
.
prb_End_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 tf_ResourceConfig_r12 offsetIndicator: %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
tf_ResourceConfig_r12
.
offsetIndicator_r12
.
choice
.
small_r12
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB19 tf_ResourceConfig_r12 subframeBitmap_choice_bs_buf: %s
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sib19
->
discConfig_r12
->
discRxPool_r12
.
list
.
array
[
j
]
->
tf_ResourceConfig_r12
.
subframeBitmap_r12
.
choice
.
bs16_r12
.
buf
);
}
#if defined(Rel10) || defined(Rel14)
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
MBMS_flag
>
0
)
{
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
View file @
22bcc7a5
...
...
@@ -106,6 +106,7 @@ eNBs =
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
//
Parameters
for
SIB18
rxPool_sc_CP_Len
=
"normal"
;
rxPool_sc_Period
=
"sf80"
;
rxPool_data_CP_Len
=
"normal"
;
...
...
@@ -118,9 +119,25 @@ eNBs =
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf
=
"1100110011001100"
;
rxPool_ResourceConfig_subframeBitmap_choice_bs_size
=
16
;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused
=
0
;
rxPool_ResourceConfig_dataHoppingConfig_hoppingParameter
=
0
;
/*
rxPool_dataHoppingConfig_hoppingParameter
=
0
;
rxPool_dataHoppingConfig_numSubbands
=
"ns1"
;
rxPool_dataHoppingConfig_rbOffset
=
0
;
rxPool_commTxResourceUC
-
ReqAllowed
=
"TRUE"
;
*/
//
Parameters
for
SIB19
discRxPool_cp_Len
=
"normal"
discRxPool_discPeriod
=
"rf64"
discRxPool_numRetx
=
1
;
discRxPool_numRepetition
=
2
;
discRxPool_ResourceConfig_prb_Num
=
3
;
discRxPool_ResourceConfig_prb_Start
=
4
;
discRxPool_ResourceConfig_prb_End
=
5
;
discRxPool_ResourceConfig_offsetIndicator_present
=
"prSmall"
;
discRxPool_ResourceConfig_offsetIndicator_choice
=
4
;
discRxPool_ResourceConfig_subframeBitmap_present
=
"prBs16"
;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf
=
"1001100110011001"
;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size
=
16
;
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