userspace/libwr: add printout to assert_init macro

--Move assert_init macro to libwr/wrs-msg.h --Add printout to assert_init macro to know which function fails. --Remove assert_init macro duplication from rsw_hal/hal_main.c --Remove #include <libwr/shw_io.h> from libwr/shw_io.h (no need to include file from itself) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/libwr: add printout to assert_init macro
--Move assert_init macro to libwr/wrs-msg.h --Add printout to assert_init macro to know which function fails. --Remove assert_init macro duplication from rsw_hal/hal_main.c --Remove #include <libwr/shw_io.h> from libwr/shw_io.h (no need to include file from itself) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
c0e1e056 · Adam Wujek · 1c1b97ff · c0e1e056 · c0e1e056 · c0e1e056
Commit c0e1e056 authored Jun 18, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

shw_io.h userspace/libwr/include/libwr/shw_io.h +0 -3

wrs-msg.h userspace/libwr/include/libwr/wrs-msg.h +8 -0

hal_main.c userspace/wrsw_hal/hal_main.c +0 -2

No files found.
--- a/userspace/libwr/include/libwr/shw_io.h
+++ b/userspace/libwr/include/libwr/shw_io.h
@@ -25,11 +25,8 @@

 #include <stdint.h>

-#include <libwr/shw_io.h>
 #include <libwr/pio.h>

-#define assert_init(proc) { int ret; if((ret = proc) < 0) return ret; }
-
 /**
 * List of type of IO.
 */

--- a/userspace/libwr/include/libwr/wrs-msg.h
+++ b/userspace/libwr/include/libwr/wrs-msg.h
@@ -54,4 +54,12 @@ extern void __wrs_msg(int level, const char *func, int line,
 #define pr_info(...)	wrs_msg(LOG_INFO, __VA_ARGS__)
 #define pr_debug(...)	wrs_msg(LOG_DEBUG, __VA_ARGS__)

+#define assert_init(proc) { \
+	int ret = proc; \
+	if (ret < 0) { \
+		pr_error("Error in function "#proc" ret = %d\n", ret); \
+		return ret; \
+	} \
+}
+
 #endif /* __WRS_MSG_H__ */
--- a/userspace/wrsw_hal/hal_main.c
+++ b/userspace/wrsw_hal/hal_main.c
@@ -23,8 +23,6 @@

 #define MAX_CLEANUP_CALLBACKS 16

-#define assert_init(proc) { int ret; if((ret = proc) < 0) return ret; }
-
 static int daemon_mode = 0;
 static hal_cleanup_callback_t cleanup_cb[MAX_CLEANUP_CALLBACKS];
 struct hal_shmem_header *hal_shmem;