From: Martin Hořeňovský <Martin.Horenovsky@gmail.com>
Date: Mon, 16 Sep 2013 18:49:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-benchmark
X-Git-Tag: fix-allnoconfig~135
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/8eef03acb9747a40aaf92175c49e43397b872404?hp=fb33b0cdebbe4aa11f3abd4e5e8e701302d00a17

Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-benchmark
---

diff --git a/.gitignore b/.gitignore
index b045105..a41a5c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /ocera-can/
-/_build/
-/_compiled/
+*_build/
+*_compiled/
 /socketcan/
 /config.omk-default
 *~
diff --git a/rtems/gw/cangw/app_def.h b/rtems/gw/cangw/app_def.h
deleted file mode 100644
index 79a8a28..0000000
--- a/rtems/gw/cangw/app_def.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _APP_DEF_H
-#define _APP_DEF_H
-
-#ifndef COND_EXTERN
-  #ifdef CONFIGURE_INIT
-    #define COND_EXTERN
-  #else
-    #define COND_EXTERN extern
-  #endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void bad_rtems_status(rtems_status_code status, int fail_level, const char *text);
-
-static inline
-void check_rtems_status(rtems_status_code status, int fail_level, const char *text)
-{
-   if(!rtems_is_status_successful(status))
-     bad_rtems_status(status, fail_level, text);
-}
-
-#define SHELL_TASK_PRIORITY 50
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_APP_DEF_H*/
diff --git a/rtems/gw/system_opt/Makefile.omk b/rtems/gw/system_opt/Makefile.omk
index 532eb88..6ecec4c 100644
--- a/rtems/gw/system_opt/Makefile.omk
+++ b/rtems/gw/system_opt/Makefile.omk
@@ -1,3 +1,3 @@
 #SUBDIRS = 
 
-include_HEADERS = system_def.h networkconfig.h
+include_HEADERS = system_def.h networkconfig.h app_def.h
diff --git a/rtems/gw/system_opt/app_def.h b/rtems/gw/system_opt/app_def.h
new file mode 100644
index 0000000..4bf7317
--- /dev/null
+++ b/rtems/gw/system_opt/app_def.h
@@ -0,0 +1,9 @@
+#ifndef _APP_DEF_H
+#define _APP_DEF_H
+
+//#define BENCH_BUILD /* Uncomment this to get "bench build" -> build that starts can gateway and net driver right after start. */
+//#define LOAD_BUILD /* Uncomment this to get "load build" -> build that spawns and has running both load threads right after start. */
+//#define HIGH_PRIO /* Uncomment this to get "high prio build" -> build that has increased (decreased) priority for the GW threads. */
+
+
+#endif /*_APP_DEF_H*/
\ No newline at end of file