Commit 35b3a2af authored by Robert Schmidt's avatar Robert Schmidt

Reorganize TASK_L2L1 loop

parent 08464607
...@@ -451,47 +451,23 @@ void *l2l1_task(void *arg) { ...@@ -451,47 +451,23 @@ void *l2l1_task(void *arg) {
/* Wait for the initialize message */ /* Wait for the initialize message */
printf("Wait for the ITTI initialize message\n"); printf("Wait for the ITTI initialize message\n");
do { while (1) {
if (message_p != NULL) {
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
}
itti_receive_msg (TASK_L2L1, &message_p); itti_receive_msg (TASK_L2L1, &message_p);
switch (ITTI_MSG_ID(message_p)) { switch (ITTI_MSG_ID(message_p)) {
case INITIALIZE_MESSAGE: case INITIALIZE_MESSAGE:
/* Start eNB thread */ /* Start eNB thread */
printf("L2L1 TASK received %s\n", ITTI_MSG_NAME(message_p)); LOG_D(PHY, "L2L1 TASK received %s\n", ITTI_MSG_NAME(message_p));
start_eNB = 1; start_eNB = 1;
break; break;
case TERMINATE_MESSAGE: case TERMINATE_MESSAGE:
printf("received terminate message\n"); LOG_W(PHY, " *** Exiting L2L1 thread\n");
oai_exit=1; oai_exit=1;
start_eNB = 0; start_eNB = 0;
itti_exit_task (); itti_exit_task ();
break; break;
default:
printf("Received unexpected message %s\n", ITTI_MSG_NAME(message_p));
break;
}
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
/* ???? no else but seems to be UE only ???
do {
// Wait for a message
itti_receive_msg (TASK_L2L1, &message_p);
switch (ITTI_MSG_ID(message_p)) {
case TERMINATE_MESSAGE:
oai_exit=1;
itti_exit_task ();
break;
case ACTIVATE_MESSAGE: case ACTIVATE_MESSAGE:
start_UE = 1; start_UE = 1;
break; break;
...@@ -511,8 +487,9 @@ void *l2l1_task(void *arg) { ...@@ -511,8 +487,9 @@ void *l2l1_task(void *arg) {
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p); result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result); AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
} while(!oai_exit); message_p = NULL;
*/ };
return NULL; return NULL;
} }
#endif #endif
...@@ -788,7 +765,6 @@ extern void phy_free_RU(RU_t*); ...@@ -788,7 +765,6 @@ extern void phy_free_RU(RU_t*);
int stop_L1L2(module_id_t enb_id) int stop_L1L2(module_id_t enb_id)
{ {
LOG_W(ENB_APP, "stopping lte-softmodem\n"); LOG_W(ENB_APP, "stopping lte-softmodem\n");
oai_exit = 1;
if (!RC.ru) { if (!RC.ru) {
LOG_UI(ENB_APP, "no RU configured\n"); LOG_UI(ENB_APP, "no RU configured\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment