userspace/wrsw_hal: start IPC server after initializing the ports

97f30bb3 · Tomasz Wlostowski · 38ce673e · 97f30bb3
Commit 97f30bb3 authored Apr 25, 2012 by Tomasz Wlostowski
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

hal_main.c userspace/wrsw_hal/hal_main.c +8 -4

No files found.
--- a/userspace/wrsw_hal/hal_main.c
+++ b/userspace/wrsw_hal/hal_main.c
@@ -154,6 +154,8 @@ int hal_shutdown()
 	return 0;
 }

+void hal_deamonize();
+
 /* Main initialization function */
 int hal_init()
 {
@@ -188,11 +190,14 @@ int hal_init()

 	assert_init(hal_init_timing());

+/* Initialize port FSMs - see hal_ports.c */
+	assert_init(hal_init_ports());
+
 /* Create a WRIPC server for HAL public API */
 	assert_init(hal_init_wripc());

-/* Initialize port FSMs - see hal_ports.c */
-	assert_init(hal_init_ports());
+	if(daemon_mode)
+		hal_deamonize();

 	return 0;
 }
@@ -294,6 +299,7 @@ void hal_parse_cmdline(int argc, char *argv[])
 int main(int argc, char *argv[])
 {

+	trace_log_file("/hal_log");
 /* Prevent from running HAL twice - this will likely freeze the system */
 	if(hal_check_running())
 	{
@@ -305,8 +311,6 @@ int main(int argc, char *argv[])

 	hal_init();

-	if(daemon_mode)
-		hal_deamonize();

 	for(;;) hal_update();
 	hal_shutdown();