Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
oai
openairinterface5G
Commits
be816fab
Commit
be816fab
authored
Apr 06, 2018
by
knopp
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
parents
9fa001c3
1272cabb
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
416 additions
and
163 deletions
+416
-163
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-1
cmake_targets/build_oai
cmake_targets/build_oai
+6
-1
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+1
-1
common/utils/itti/intertask_interface.c
common/utils/itti/intertask_interface.c
+15
-0
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+54
-34
openair2/ENB_APP/MESSAGES/V2/flexran.proto
openair2/ENB_APP/MESSAGES/V2/flexran.proto
+1
-1
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+100
-13
openair2/ENB_APP/flexran_agent.c
openair2/ENB_APP/flexran_agent.c
+3
-10
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+73
-78
openair2/ENB_APP/flexran_agent_defs.h
openair2/ENB_APP/flexran_agent_defs.h
+10
-7
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+3
-0
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+102
-12
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+32
-0
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+1
-1
openair2/RRC/LITE/defs_NB_IoT.h
openair2/RRC/LITE/defs_NB_IoT.h
+3
-0
openair3/GTPV1-U/gtpv1u_eNB.c
openair3/GTPV1-U/gtpv1u_eNB.c
+7
-0
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+3
-4
No files found.
cmake_targets/CMakeLists.txt
View file @
be816fab
...
...
@@ -280,7 +280,7 @@ set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
# RRC
######
add_list2_option
(
RRC_ASN1_VERSION
"Rel1
0
"
"ASN.1 version of RRC interface"
"Rel8"
"Rel10"
"CBA"
)
add_list2_option
(
RRC_ASN1_VERSION
"Rel1
4
"
"ASN.1 version of RRC interface"
"Rel8"
"Rel10"
"Rel14"
"CBA"
)
if
(
${
RRC_ASN1_VERSION
}
STREQUAL
"Rel8"
)
set
(
RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-86.asn
)
...
...
@@ -2239,6 +2239,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
${
XFORMS_SOURCE
}
${
T_SOURCE
}
${
CONFIG_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
target_link_libraries
(
${
myExe
}
...
...
cmake_targets/build_oai
View file @
be816fab
...
...
@@ -626,12 +626,17 @@ function main() {
if
[
"
$SIMUS_PHY
"
=
"1"
]
;
then
# lte unitary simulators compilation
echo_info
"Compiling unitary tests simulators"
simlist
=
"dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
# TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
#simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
simlist
=
"dlsim ulsim"
for
f
in
$simlist
;
do
compilations
\
lte-simulators
$f
\
$f
$dbin
/
$f
.
$REL
done
compilations
\
lte-simulators coding
\
libcoding.so
$dbin
/libcoding.so
fi
# Core simulators
...
...
cmake_targets/tools/build_helper
View file @
be816fab
...
...
@@ -210,7 +210,7 @@ install_protobuf_from_source(){
#cd protobuf-2.6.1/
rm -rf /tmp/protobuf-cpp-3.3.0.tar.gz* /tmp/protobuf-3.3.0
wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz
tar -xzvf protobuf-cpp-3.3.0.tar.gz --owner $USER --group $
USER
--no-same-owner
tar -xzvf protobuf-cpp-3.3.0.tar.gz --owner $USER --group $
(groups | cut -d" " -f1)
--no-same-owner
cd protobuf-3.3.0/
./configure
echo "Compiling protobuf"
...
...
common/utils/itti/intertask_interface.c
View file @
be816fab
...
...
@@ -328,8 +328,11 @@ int itti_send_msg_to_task(task_id_t destination_task_id, instance_t instance, Me
/* Increment the global message number */
message_number
=
itti_increment_message_number
();
#if 0
/* itti dump is disabled */
itti_dump_queue_message (origin_task_id, message_number, message, itti_desc.messages_info[message_id].name,
sizeof(MessageHeader) + message->ittiMsgHeader.ittiMsgSize);
#endif
if
(
destination_task_id
!=
TASK_UNKNOWN
)
{
...
...
@@ -426,8 +429,11 @@ int itti_try_send_msg_to_task(task_id_t destination_task_id, instance_t instance
/* Increment the global message number */
message_number
=
itti_increment_message_number
();
#if 0
/* itti dump is disabled */
itti_dump_queue_message (origin_task_id, message_number, message, itti_desc.messages_info[message_id].name,
sizeof(MessageHeader) + message->ittiMsgHeader.ittiMsgSize);
#endif
if
(
destination_task_id
!=
TASK_UNKNOWN
)
{
...
...
@@ -721,8 +727,11 @@ void itti_mark_task_ready(task_id_t task_id)
AssertFatal
(
thread_id
<
itti_desc
.
thread_max
,
"Thread id (%d) is out of range (%d)!
\n
"
,
thread_id
,
itti_desc
.
thread_max
);
#if 0
/* itti dump is disabled */
/* Register the thread in itti dump */
itti_dump_thread_use_ring_buffer();
#endif
/* Mark the thread as using LFDS queue */
lfds611_queue_use
(
itti_desc
.
tasks
[
task_id
].
message_queue
);
...
...
@@ -853,7 +862,10 @@ int itti_init(task_id_t task_max, thread_id_t thread_max, MessagesIds messages_i
itti_desc
.
wait_tasks
=
0
;
itti_desc
.
created_tasks
=
0
;
itti_desc
.
ready_tasks
=
0
;
#if 0
/* itti dump is disabled */
itti_dump_init (messages_definition_xml, dump_file_name);
#endif
CHECK_INIT_RETURN
(
timer_init
());
...
...
@@ -920,7 +932,10 @@ void itti_wait_tasks_end(void)
exit
(
0
);
}
#if 0
/* itti dump is disabled */
itti_dump_exit();
#endif
}
void
itti_send_terminate_message
(
task_id_t
task_id
)
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
be816fab
...
...
@@ -1489,7 +1489,9 @@ void fill_rx_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe)
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
}
void
release_harq
(
PHY_VARS_eNB
*
eNB
,
int
UE_id
,
int
tb
,
uint16_t
frame
,
uint8_t
subframe
,
uint16_t
mask
)
{
/* release the harq if its round is >= 'after_rounds' */
static
void
do_release_harq
(
PHY_VARS_eNB
*
eNB
,
int
UE_id
,
int
tb
,
uint16_t
frame
,
uint8_t
subframe
,
uint16_t
mask
,
int
after_rounds
)
{
LTE_eNB_DLSCH_t
*
dlsch0
=
NULL
,
*
dlsch1
=
NULL
;
LTE_DL_eNB_HARQ_t
*
dlsch0_harq
=
NULL
,
*
dlsch1_harq
=
NULL
;
...
...
@@ -1510,11 +1512,13 @@ void release_harq(PHY_VARS_eNB *eNB,int UE_id,int tb,uint16_t frame,uint8_t subf
dlsch1_harq
=
dlsch1
->
harq_processes
[
harq_pid
];
AssertFatal
(
dlsch0_harq
!=
NULL
,
"dlsch0_harq is null
\n
"
);
dlsch0_harq
->
status
=
SCH_IDLE
;
/*if ((dlsch1_harq == NULL)||
((dlsch1_harq!=NULL)&&
(dlsch1_harq->status == SCH_IDLE)))*/
dlsch0
->
harq_mask
&=
~
(
1
<<
harq_pid
);
if
(
dlsch0_harq
->
round
>=
after_rounds
)
{
dlsch0_harq
->
status
=
SCH_IDLE
;
/*if ((dlsch1_harq == NULL)||
((dlsch1_harq!=NULL)&&
(dlsch1_harq->status == SCH_IDLE)))*/
dlsch0
->
harq_mask
&=
~
(
1
<<
harq_pid
);
}
LOG_D
(
PHY
,
"Frame %d, subframe %d: Releasing harq %d for UE %x
\n
"
,
frame
,
subframe
,
harq_pid
,
dlsch0
->
rnti
);
}
...
...
@@ -1534,17 +1538,28 @@ void release_harq(PHY_VARS_eNB *eNB,int UE_id,int tb,uint16_t frame,uint8_t subf
dlsch1_harq
=
dlsch1
->
harq_processes
[
harq_pid
];
AssertFatal
(
dlsch0_harq
!=
NULL
,
"dlsch0_harq is null
\n
"
);
dlsch0_harq
->
status
=
SCH_IDLE
;
if
((
dlsch1_harq
==
NULL
)
||
((
dlsch1_harq
!=
NULL
)
&&
(
dlsch1_harq
->
status
==
SCH_IDLE
)))
dlsch0
->
harq_mask
&=
~
(
1
<<
harq_pid
);
if
(
dlsch0_harq
->
round
>=
after_rounds
)
{
dlsch0_harq
->
status
=
SCH_IDLE
;
if
((
dlsch1_harq
==
NULL
)
||
((
dlsch1_harq
!=
NULL
)
&&
(
dlsch1_harq
->
status
==
SCH_IDLE
)))
dlsch0
->
harq_mask
&=
~
(
1
<<
harq_pid
);
}
}
}
}
}
}
static
void
release_harq
(
PHY_VARS_eNB
*
eNB
,
int
UE_id
,
int
tb
,
uint16_t
frame
,
uint8_t
subframe
,
uint16_t
mask
,
int
is_ack
)
{
/* Maximum number of DL transmissions = 4.
* TODO: get the value from configuration.
* If is_ack is true then we release immediately. The value -1 can be used for that.
*/
do_release_harq
(
eNB
,
UE_id
,
tb
,
frame
,
subframe
,
mask
,
is_ack
?
-
1
:
4
);
}
int
getM
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
)
{
int
M
,
Mtx
=
0
;
...
...
@@ -1645,7 +1660,7 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
i
]
=
2
-
ulsch_harq
->
o_ACK
[
i
];
// release DLSCH if needed
if
(
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
//if (ulsch_harq->o_ACK[i] != 1)
//printf("got NACK %d.%d rnti %d harq %d\n", frame, subframe, rnti, eNB->dlsch[UE_id][0]->harq_ids[(subframe+6)%10]);
...
...
@@ -1674,13 +1689,17 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
multiplex
.
value_0
=
2
-
ulsch_harq
->
o_ACK
[
i
];
// release DLSCH if needed
if
(
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
);
if
(
M
==
1
&&
ulsch_harq
->
O_ACK
==
1
&&
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
else
if
(
M
==
1
&&
ulsch_harq
->
O_ACK
==
2
&&
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
);
/* TODO: review this code, it's most certainly wrong.
* We have to release the proper HARQ in case of ACK or NACK if max retransmission reached.
* Basically, call release_harq with 1 as last argument when ACK and 0 when NACK.
*/
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
if
(
M
==
1
&&
ulsch_harq
->
O_ACK
==
1
&&
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
else
if
(
M
==
1
&&
ulsch_harq
->
O_ACK
==
2
&&
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
else
if
(
M
>
1
&&
ulsch_harq
->
o_ACK
[
i
]
==
1
)
{
// spatial bundling
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
1
<<
i
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
1
<<
i
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
1
<<
i
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
1
<<
i
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
}
}
}
...
...
@@ -1742,7 +1761,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
AssertFatal
(
harq_ack
[
0
]
==
1
||
harq_ack
[
0
]
==
2
||
harq_ack
[
0
]
==
4
,
"harq_ack[0] is %d, should be 1,2 or 4
\n
"
,
harq_ack
[
0
]);
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
0
]
=
harq_ack
[
0
];
// release DLSCH if needed
if
(
harq_ack
[
0
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
//if (harq_ack[0] != 1)
//printf("got NACK %d.%d rnti %d harq %d\n", frame, subframe, uci->rnti, eNB->dlsch[UE_id][0]->harq_ids[(subframe+6)%10]);
...
...
@@ -1765,8 +1784,8 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
0
]
=
harq_ack
[
0
];
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
1
]
=
harq_ack
[
1
];
// release DLSCH if needed
if
(
harq_ack
[
0
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
if
(
harq_ack
[
1
]
==
1
)
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
,
harq_ack
[
1
]
==
1
);
}
else
AssertFatal
(
1
==
0
,
"only format 1a/b for now, received %d
\n
"
,
uci
->
pucch_fmt
);
}
...
...
@@ -1787,7 +1806,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
AssertFatal
(
harq_ack
[
0
]
==
1
||
harq_ack
[
0
]
==
2
||
harq_ack
[
0
]
==
4
,
"harq_ack[0] is %d, should be 1,2 or 4
\n
"
,
harq_ack
[
0
]);
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
bundling
.
value_0
=
harq_ack
[
0
];
// release all bundled DLSCH if needed
if
(
harq_ack
[
0
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
}
else
if
(
uci
->
pucch_fmt
==
pucch_format1b
)
{
pdu
->
harq_indication_tdd_rel13
.
number_of_ack_nack
=
2
;
...
...
@@ -1797,8 +1816,8 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
bundling
.
value_0
=
harq_ack
[
0
];
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
1
].
bundling
.
value_0
=
harq_ack
[
1
];
// release all DLSCH if needed
if
(
harq_ack
[
0
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
if
(
harq_ack
[
1
]
==
1
)
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
,
harq_ack
[
1
]
==
1
);
}
break
;
case
1
:
// multiplexing
...
...
@@ -1810,7 +1829,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
AssertFatal
(
harq_ack
[
0
]
==
1
||
harq_ack
[
0
]
==
2
||
harq_ack
[
0
]
==
4
,
"harq_ack[0] is %d, should be 1,2 or 4
\n
"
,
harq_ack
[
0
]);
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
multiplex
.
value_0
=
harq_ack
[
0
];
// release all DLSCH if needed
if
(
harq_ack
[
0
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
}
else
if
(
uci
->
num_pucch_resources
==
1
&&
uci
->
pucch_fmt
==
pucch_format1b
)
{
pdu
->
harq_indication_tdd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_TDD_REL13_TAG
;
...
...
@@ -1820,8 +1839,8 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
multiplex
.
value_0
=
harq_ack
[
0
];
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
1
].
multiplex
.
value_0
=
harq_ack
[
1
];
// release all DLSCH if needed
if
(
harq_ack
[
0
]
==
1
)
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
if
(
harq_ack
[
1
]
==
1
)
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
,
harq_ack
[
1
]
==
1
);
}
else
{
// num_pucch_resources (M) > 1
pdu
->
harq_indication_tdd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_TDD_REL13_TAG
;
...
...
@@ -1832,8 +1851,8 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
if
(
uci
->
num_pucch_resources
==
3
)
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
2
].
multiplex
.
value_0
=
harq_ack
[
2
];
if
(
uci
->
num_pucch_resources
==
4
)
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
3
].
multiplex
.
value_0
=
harq_ack
[
3
];
// spatial-bundling in this case so release both HARQ if necessary
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
tdd_multiplexing_mask
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
tdd_multiplexing_mask
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
tdd_multiplexing_mask
,
1
/* force release? previous code was unconditional */
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
tdd_multiplexing_mask
,
1
/* force release? previous code was unconditional */
);
}
break
;
case
2
:
// special bundling (SR collision)
...
...
@@ -1844,26 +1863,27 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
switch
(
harq_ack
[
0
])
{
case
0
:
/* TODO: release_harq here? this whole code looks suspicious */
break
;
case
1
:
// check if M=1,4,7
if
(
uci
->
num_pucch_resources
==
1
||
uci
->
num_pucch_resources
==
4
||
tdd_config5_sf2scheds
==
1
||
tdd_config5_sf2scheds
==
4
||
tdd_config5_sf2scheds
==
7
)
{
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
,
1
);
}
break
;
case
2
:
// check if M=2,5,8
if
(
uci
->
num_pucch_resources
==
2
||
tdd_config5_sf2scheds
==
2
||
tdd_config5_sf2scheds
==
5
||
tdd_config5_sf2scheds
==
8
)
{
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
,
1
);
}
break
;
case
3
:
// check if M=3,6,9
if
(
uci
->
num_pucch_resources
==
3
||
tdd_config5_sf2scheds
==
3
||
tdd_config5_sf2scheds
==
6
||
tdd_config5_sf2scheds
==
9
)
{
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
1
);
release_harq
(
eNB
,
UE_id
,
1
,
frame
,
subframe
,
0xffff
,
1
);
}
break
;
}
...
...
openair2/ENB_APP/MESSAGES/V2/flexran.proto
View file @
be816fab
...
...
@@ -131,7 +131,7 @@ message flex_enb_config_request {
message
flex_enb_config_reply
{
optional
flex_header
header
=
1
;
optional
uint
32
eNB_id
=
2
;
// Unique id to distinguish the eNB
optional
uint
64
eNB_id
=
2
;
// Unique id to distinguish the eNB
repeated
flex_cell_config
cell_config
=
3
;
optional
uint32
device_spec
=
4
;
}
...
...
openair2/ENB_APP/enb_config.c
View file @
be816fab
...
...
@@ -60,37 +60,124 @@
extern
uint16_t
sf_ahead
;
void
RCconfig_flexran
()
{
int
i
;
uint16_t
i
;
uint16_t
num_enbs
;
char
aprefix
[
MAX_OPTNAME_SIZE
*
2
+
8
];
/* this will possibly truncate the cell id (RRC assumes int32_t).
* Both Nid_cell and enb_id are signed in RRC case, but we use unsigned for
* the bitshifting to work properly */
int32_t
Nid_cell
=
0
;
uint16_t
Nid_cell_tr
=
0
;
uint32_t
enb_id
=
0
;
/*
* the only reason for all these variables is, that they are "hard-encoded"
* into the CCPARAMS_DESC macro and we need it for the Nid_cell variable ...
*/
char
*
frame_type
,
*
prefix_type
,
*
pbch_repetition
,
*
prach_high_speed
,
*
pusch_hoppingMode
,
*
pusch_enable64QAM
,
*
pusch_groupHoppingEnabled
,
*
pusch_sequenceHoppingEnabled
,
*
phich_duration
,
*
phich_resource
,
*
srs_enable
,
*
srs_ackNackST
,
*
srs_MaxUpPts
,
*
pusch_alpha
,
*
pucch_deltaF_Format1
,
*
pucch_deltaF_Format1b
,
*
pucch_deltaF_Format2
,
*
pucch_deltaF_Format2a
,
*
pucch_deltaF_Format2b
,
*
rach_preamblesGroupAConfig
,
*
rach_messagePowerOffsetGroupB
,
*
pcch_nB
;
long
long
int
downlink_frequency
;
int32_t
tdd_config
,
tdd_config_s
,
eutra_band
,
uplink_frequency_offset
,
Nid_cell_mbsfn
,
N_RB_DL
,
nb_antenna_ports
,
prach_root
,
prach_config_index
,
prach_zero_correlation
,
prach_freq_offset
,
pucch_delta_shift
,
pucch_nRB_CQI
,
pucch_nCS_AN
,
pucch_n1_AN
,
pdsch_referenceSignalPower
,
pdsch_p_b
,
pusch_n_SB
,
pusch_hoppingOffset
,
pusch_groupAssignment
,
pusch_nDMRS1
,
srs_BandwidthConfig
,
srs_SubframeConfig
,
pusch_p0_Nominal
,
pucch_p0_Nominal
,
msg3_delta_Preamble
,
rach_numberOfRA_Preambles
,
rach_sizeOfRA_PreamblesGroupA
,
rach_messageSizeGroupA
,
rach_powerRampingStep
,
rach_preambleInitialReceivedTargetPower
,
rach_preambleTransMax
,
rach_raResponseWindowSize
,
rach_macContentionResolutionTimer
,
rach_maxHARQ_Msg3Tx
,
pcch_defaultPagingCycle
,
bcch_modificationPeriodCoeff
,
ue_TimersAndConstants_t300
,
ue_TimersAndConstants_t301
,
ue_TimersAndConstants_t310
,
ue_TimersAndConstants_t311
,
ue_TimersAndConstants_n310
,
ue_TimersAndConstants_n311
,
ue_TransmissionMode
;
/* get number of eNBs */
paramdef_t
ENBSParams
[]
=
ENBSPARAMS_DESC
;
config_get
(
ENBSParams
,
sizeof
(
ENBSParams
)
/
sizeof
(
paramdef_t
),
NULL
);
num_enbs
=
ENBSParams
[
ENB_ACTIVE_ENBS_IDX
].
numelt
;
/* for eNB ID */
paramdef_t
ENBParams
[]
=
ENBPARAMS_DESC
;
paramlist_def_t
ENBParamList
=
{
ENB_CONFIG_STRING_ENB_LIST
,
NULL
,
0
};
/* for Nid_cell */
checkedparam_t
config_check_CCparams
[]
=
CCPARAMS_CHECK
;
paramdef_t
CCsParams
[]
=
CCPARAMS_DESC
;
paramlist_def_t
CCsParamList
=
{
ENB_CONFIG_STRING_COMPONENT_CARRIERS
,
NULL
,
0
};
/* map parameter checking array instances to parameter definition array instances */
for
(
int
I
=
0
;
I
<
(
sizeof
(
CCsParams
)
/
sizeof
(
paramdef_t
));
I
++
)
{
CCsParams
[
I
].
chkPptr
=
&
(
config_check_CCparams
[
I
]);
}
paramdef_t
flexranParams
[]
=
FLEXRANPARAMS_DESC
;
config_get
(
flexranParams
,
sizeof
(
flexranParams
)
/
sizeof
(
paramdef_t
),
CONFIG_STRING_NETWORK_CONTROLLER_CONFIG
);
if
(
!
RC
.
flexran
)
{
RC
.
flexran
=
calloc
(
RC
.
nb_L1_inst
,
sizeof
(
flexran_agent_info_t
*
));
AssertFatal
(
RC
.
flexran
!=
NULL
,
RC
.
flexran
=
calloc
(
num_enbs
,
sizeof
(
flexran_agent_info_t
*
));
AssertFatal
(
RC
.
flexran
,
"can't ALLOCATE %zu Bytes for %d flexran agent info with size %zu
\n
"
,
RC
.
nb_L1_inst
*
sizeof
(
flexran_agent_info_t
*
),
RC
.
nb_L1_inst
,
sizeof
(
flexran_agent_info_t
*
));
num_enbs
*
sizeof
(
flexran_agent_info_t
*
),
num_enbs
,
sizeof
(
flexran_agent_info_t
*
));
}
/* For all agent instance, fill in the same controller configuration. */
for
(
i
=
0
;
i
<
RC
.
nb_L1_inst
;
i
++
)
{
for
(
i
=
0
;
i
<
num_enbs
;
i
++
)
{
RC
.
flexran
[
i
]
=
calloc
(
1
,
sizeof
(
flexran_agent_info_t
));
AssertFatal
(
RC
.
flexran
[
i
]
!=
NULL
,
AssertFatal
(
RC
.
flexran
[
i
],
"can't ALLOCATE %zu Bytes for flexran agent info (iteration %d/%d)
\n
"
,
sizeof
(
flexran_agent_info_t
),
i
+
1
,
RC
.
nb_L1_inst
);
sizeof
(
flexran_agent_info_t
),
i
+
1
,
num_enbs
);
/* if config says "yes", enable Agent, in all other cases it's like "no" */
RC
.
flexran
[
i
]
->
enabled
=
strcmp
(
*
(
flexranParams
[
FLEXRAN_ENABLED
].
strptr
),
"yes"
)
==
0
;
RC
.
flexran
[
i
]
->
enabled
=
strcasecmp
(
*
(
flexranParams
[
FLEXRAN_ENABLED
].
strptr
),
"yes"
)
==
0
;
/* if not enabled, simply skip the rest, it is not needed anyway */
if
(
!
RC
.
flexran
[
i
]
->
enabled
)
continue
;
RC
.
flexran
[
i
]
->
interface_name
=
strdup
(
*
(
flexranParams
[
FLEXRAN_INTERFACE_NAME_IDX
].
strptr
));
//inet_ntop(AF_INET, &(enb_properties->properties[mod_id]->flexran_agent_ipv4_address), in_ip, INET_ADDRSTRLEN);
RC
.
flexran
[
i
]
->
remote_ipv4_addr
=
strdup
(
*
(
flexranParams
[
FLEXRAN_IPV4_ADDRESS_IDX
].
strptr
));
RC
.
flexran
[
i
]
->
remote_port
=
*
(
flexranParams
[
FLEXRAN_PORT_IDX
].
uptr
);
RC
.
flexran
[
i
]
->
cache_name
=
strdup
(
*
(
flexranParams
[
FLEXRAN_CACHE_IDX
].
strptr
));
RC
.
flexran
[
i
]
->
node_ctrl_state
=
strcmp
(
*
(
flexranParams
[
FLEXRAN_AWAIT_RECONF_IDX
].
strptr
),
"yes"
)
==
0
?
ENB_WAIT
:
ENB_NORMAL_OPERATION
;
RC
.
flexran
[
i
]
->
enb_id
=
i
;
RC
.
flexran
[
i
]
->
node_ctrl_state
=
strcasecmp
(
*
(
flexranParams
[
FLEXRAN_AWAIT_RECONF_IDX
].
strptr
),
"yes"
)
==
0
?
ENB_WAIT
:
ENB_NORMAL_OPERATION
;
config_getlist
(
&
ENBParamList
,
ENBParams
,
sizeof
(
ENBParams
)
/
sizeof
(
paramdef_t
),
NULL
);
/* eNB ID from configuration, as read in by RCconfig_RRC() */
if
(
!
ENBParamList
.
paramarray
[
i
][
ENB_ENB_ID_IDX
].
uptr
)
{
// Calculate a default eNB ID
# if defined(ENABLE_USE_MME)
enb_id
=
i
+
(
s1ap_generate_eNB_id
()
&
0xFFFF8
);
# else
enb_id
=
i
;
# endif
}
else
{
enb_id
=
*
(
ENBParamList
.
paramarray
[
i
][
ENB_ENB_ID_IDX
].
uptr
);
}
/* cell ID */
sprintf
(
aprefix
,
"%s.[%i]"
,
ENB_CONFIG_STRING_ENB_LIST
,
i
);
config_getlist
(
&
CCsParamList
,
NULL
,
0
,
aprefix
);
if
(
CCsParamList
.
numelt
>
0
)
{
sprintf
(
aprefix
,
"%s.[%i].%s.[%i]"
,
ENB_CONFIG_STRING_ENB_LIST
,
i
,
ENB_CONFIG_STRING_COMPONENT_CARRIERS
,
0
);
config_get
(
CCsParams
,
sizeof
(
CCsParams
)
/
sizeof
(
paramdef_t
),
aprefix
);
Nid_cell_tr
=
(
uint16_t
)
Nid_cell
;
}
RC
.
flexran
[
i
]
->
mod_id
=
i
;
RC
.
flexran
[
i
]
->
agent_id
=
(((
uint64_t
)
i
)
<<
48
)
|
(((
uint64_t
)
enb_id
)
<<
16
)
|
((
uint64_t
)
Nid_cell_tr
);
/* assume for the moment the monolithic case, i.e. agent can provide
* information for all layers */
RC
.
flexran
[
i
]
->
capability_mask
=
FLEXRAN_CAP_LOPHY
|
FLEXRAN_CAP_HIPHY
|
FLEXRAN_CAP_LOMAC
|
FLEXRAN_CAP_HIMAC
|
FLEXRAN_CAP_RLC
|
FLEXRAN_CAP_PDCP
|
FLEXRAN_CAP_SDAP
|
FLEXRAN_CAP_RRC
;
}
}
...
...
openair2/ENB_APP/flexran_agent.c
View file @
be816fab
...
...
@@ -114,12 +114,12 @@ void *receive_thread(void *args) {
while
(
1
)
{
while
(
flexran_agent_msg_recv
(
d
->
enb
_id
,
FLEXRAN_AGENT_DEFAULT
,
&
data
,
&
size
,
&
priority
)
==
0
)
{
while
(
flexran_agent_msg_recv
(
d
->
mod
_id
,
FLEXRAN_AGENT_DEFAULT
,
&
data
,
&
size
,
&
priority
)
==
0
)
{
LOG_D
(
FLEXRAN_AGENT
,
"received message with size %d
\n
"
,
size
);
// Invoke the message handler
msg
=
flexran_agent_handle_message
(
d
->
enb
_id
,
data
,
size
);
msg
=
flexran_agent_handle_message
(
d
->
mod
_id
,
data
,
size
);
free
(
data
);
...
...
@@ -127,7 +127,7 @@ void *receive_thread(void *args) {
if
(
msg
!=
NULL
){
data
=
flexran_agent_pack_message
(
msg
,
&
size
);
if
(
flexran_agent_msg_send
(
d
->
enb
_id
,
FLEXRAN_AGENT_DEFAULT
,
data
,
size
,
priority
))
{
if
(
flexran_agent_msg_send
(
d
->
mod
_id
,
FLEXRAN_AGENT_DEFAULT
,
data
,
size
,
priority
))
{
err_code
=
PROTOCOL__FLEXRAN_ERR__MSG_ENQUEUING
;
goto
error
;
}
...
...
@@ -190,13 +190,6 @@ int flexran_agent_start(mid_t mod_id)
LOG_I
(
FLEXRAN_AGENT
,
"FlexRAN Agent for eNB %d is DISABLED
\n
"
,
mod_id
);
return
100
;
}
flexran
->
enb_id
=
mod_id
;
/* assume for the moment the monolithic case, i.e. agent can provide
* information for all layers */
flexran
->
capability_mask
=
FLEXRAN_CAP_LOL1
|
FLEXRAN_CAP_HIL1
|
FLEXRAN_CAP_LOL2
|
FLEXRAN_CAP_HIL2
|
FLEXRAN_CAP_PDCP
|
FLEXRAN_CAP_RRC
;
/*
* Initialize the channel container
...
...
openair2/ENB_APP/flexran_agent_common.c
View file @
be816fab
...
...
@@ -804,7 +804,6 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
xid
=
(
enb_config_req_msg
->
header
)
->
xid
;
int
i
,
j
;
int
enb_id
=
mod_id
;
Protocol__FlexEnbConfigReply
*
enb_config_reply_msg
;
enb_config_reply_msg
=
malloc
(
sizeof
(
Protocol__FlexEnbConfigReply
));
...
...
@@ -816,10 +815,10 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
goto
error
;
enb_config_reply_msg
->
header
=
header
;
enb_config_reply_msg
->
enb_id
=
mod
_id
;
enb_config_reply_msg
->
enb_id
=
RC
.
flexran
[
mod_id
]
->
agent
_id
;
enb_config_reply_msg
->
has_enb_id
=
1
;
enb_config_reply_msg
->
n_cell_config
=
MAX_NUM_CCs
;
Protocol__FlexCellConfig
**
cell_conf
;
...
...
@@ -832,61 +831,60 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
protocol__flex_cell_config__init
(
cell_conf
[
i
]);
cell_conf
[
i
]
->
phy_cell_id
=
1
;
cell_conf
[
i
]
->
has_phy_cell_id
=
flexran_get_cell_id
(
enb
_id
,
i
);
cell_conf
[
i
]
->
has_phy_cell_id
=
flexran_get_cell_id
(
mod
_id
,
i
);
cell_conf
[
i
]
->
cell_id
=
i
;
cell_conf
[
i
]
->
has_cell_id
=
1
;
cell_conf
[
i
]
->
pusch_hopping_offset
=
flexran_get_hopping_offset
(
enb
_id
,
i
);
cell_conf
[
i
]
->
pusch_hopping_offset
=
flexran_get_hopping_offset
(
mod
_id
,
i
);
cell_conf
[
i
]
->
has_pusch_hopping_offset
=
1
;
if
(
flexran_get_hopping_mode
(
enb
_id
,
i
)
==
0
)
{
if
(
flexran_get_hopping_mode
(
mod
_id
,
i
)
==
0
)
{
cell_conf
[
i
]
->
hopping_mode
=
PROTOCOL__FLEX_HOPPING_MODE__FLHM_INTER
;
}
else
if
(
flexran_get_hopping_mode
(
enb
_id
,
i
)
==
1
)
{
}
else
if
(
flexran_get_hopping_mode
(
mod
_id
,
i
)
==
1
)
{
cell_conf
[
i
]
->
hopping_mode
=
PROTOCOL__FLEX_HOPPING_MODE__FLHM_INTERINTRA
;
}
cell_conf
[
i
]
->
has_hopping_mode
=
1
;
cell_conf
[
i
]
->
n_sb
=
flexran_get_n_SB
(
enb
_id
,
i
);
cell_conf
[
i
]
->
n_sb
=
flexran_get_n_SB
(
mod
_id
,
i
);
cell_conf
[
i
]
->
has_n_sb
=
1
;
if
(
flexran_get_phich_resource
(
enb
_id
,
i
)
==
0
)
{
if
(
flexran_get_phich_resource
(
mod
_id
,
i
)
==
0
)
{
cell_conf
[
i
]
->
phich_resource
=
PROTOCOL__FLEX_PHICH_RESOURCE__FLPR_ONE_SIXTH
;
//0
}
else
if
(
flexran_get_phich_resource
(
enb
_id
,
i
)
==
1
)
{
}
else
if
(
flexran_get_phich_resource
(
mod
_id
,
i
)
==
1
)
{
cell_conf
[
i
]
->
phich_resource
=
PROTOCOL__FLEX_PHICH_RESOURCE__FLPR_HALF
;
//1
}
else
if
(
flexran_get_phich_resource
(
enb
_id
,
i
)
==
2
)
{
}
else
if
(
flexran_get_phich_resource
(
mod
_id
,
i
)
==
2
)
{
cell_conf
[
i
]
->
phich_resource
=
PROTOCOL__FLEX_PHICH_RESOURCE__FLPR_ONE
;
// 2
}
else
if
(
flexran_get_phich_resource
(
enb
_id
,
i
)
==
3
)
{
}
else
if
(
flexran_get_phich_resource
(
mod
_id
,
i
)
==
3
)
{
cell_conf
[
i
]
->
phich_resource
=
PROTOCOL__FLEX_PHICH_RESOURCE__FLPR_TWO
;
//3
}
cell_conf
[
i
]
->
has_phich_resource
=
1
;
if
(
flexran_get_phich_duration
(
enb
_id
,
i
)
==
0
)
{
if
(
flexran_get_phich_duration
(
mod
_id
,
i
)
==
0
)
{
cell_conf
[
i
]
->
phich_duration
=
PROTOCOL__FLEX_PHICH_DURATION__FLPD_NORMAL
;
}
else
if
(
flexran_get_phich_duration
(
enb
_id
,
i
)
==
1
)
{
}
else
if
(
flexran_get_phich_duration
(
mod
_id
,
i
)
==
1
)
{
cell_conf
[
i
]
->
phich_duration
=
PROTOCOL__FLEX_PHICH_DURATION__FLPD_EXTENDED
;
}
cell_conf
[
i
]
->
has_phich_duration
=
1
;
//TODO: Fill in with actual value, See TS 36.211, section 6.9
cell_conf
[
i
]
->
init_nr_pdcch_ofdm_sym
=
flexran_get_num_pdcch_symb
(
enb_id
,
i
);
cell_conf
[
i
]
->
has_init_nr_pdcch_ofdm_sym
=
0
;
//TODO: Fill in with actual value
/* Protocol__FlexSiConfig *si_config; */
/* si_config = malloc(sizeof(Protocol__FlexSiConfig)); */
/* if(si_config == NULL) */
/* goto error; */
/* protocol__flex_si_config__init(si_config); */
/* //TODO: Fill in with actual value, Frame number to apply the SI configuration */
/* si_config->sfn = 1; */
/* si_config->has_sfn = 1; */
/* //TODO: Fill in with actual value, the length of SIB1 in bytes */
/* si_config->sib1_length = get_sib1_length(enb_id,i); */
/* si_config->has_sib1_length = 1; */
/* //TODO: Fill in with actual value, Scheduling window for all SIs in SF */
/* si_config->si_window_length = (uint32_t) get_si_window_length(enb_id,i); */
/* si_config->has_si_window_length = 1; */
/* //TODO: Fill in with actual value, the number of SI messages */
/* si_config->n_si_message=1; */
cell_conf
[
i
]
->
init_nr_pdcch_ofdm_sym
=
flexran_get_num_pdcch_symb
(
mod_id
,
i
);
cell_conf
[
i
]
->
has_init_nr_pdcch_ofdm_sym
=
1
;
Protocol__FlexSiConfig
*
si_config
;
si_config
=
malloc
(
sizeof
(
Protocol__FlexSiConfig
));