OMK template example applications print APP_VER_ID instead of common SW_VER_ID.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/rtems-omk-template/appdl/app_def.h b/rtems-omk-template/appdl/app_def.h
index 6527316f7d6068b68585b820aa9fedb00d00d5ea..bf1d18c8fbe4b47b7a42d077924b6eae66b60e6d 100644 (file)
--- a/rtems-omk-template/appdl/app_def.h
+++ b/rtems-omk-template/appdl/app_def.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "appdl"
+
 COND_EXTERN rtems_id   Task_1_id;           /* Task 1 id */
 COND_EXTERN rtems_name Task_1_name;         /* Task 1 name */
 

diff --git a/rtems-omk-template/appdl/init.c b/rtems-omk-template/appdl/init.c
index 55e3e377843a373ad8e2737efac4f201da9cd108..206e06b7eaf398253cbeb3f10be6c3de13ad5af0 100644 (file)
--- a/rtems-omk-template/appdl/init.c
+++ b/rtems-omk-template/appdl/init.c
@@ -193,7 +193,7 @@ rtems_task Init(
  #endif /*CONFIG_OC_APP_APPDL_NET*/
 
 
-  printf( "Starting application " SW_VER_ID " v "
+  printf( "Starting application " APP_VER_ID " v "
           BUILD_VERSION_STRING(SW_VER_MAJOR,SW_VER_MINOR,SW_VER_PATCH)
           "\n" );
 

diff --git a/rtems-omk-template/appfoo/app_def.h b/rtems-omk-template/appfoo/app_def.h
index 6527316f7d6068b68585b820aa9fedb00d00d5ea..2fef75f0188245513ec38ada8307464b3847e685 100644 (file)
--- a/rtems-omk-template/appfoo/app_def.h
+++ b/rtems-omk-template/appfoo/app_def.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "appfoo"
+
 COND_EXTERN rtems_id   Task_1_id;           /* Task 1 id */
 COND_EXTERN rtems_name Task_1_name;         /* Task 1 name */
 

diff --git a/rtems-omk-template/appfoo/init.c b/rtems-omk-template/appfoo/init.c
index 6326b66fbdf071f00ba91737e62afdb004f9b7f9..0f5452cdc5651928fb3974b0cc03a095323e64b9 100644 (file)
--- a/rtems-omk-template/appfoo/init.c
+++ b/rtems-omk-template/appfoo/init.c
@@ -81,7 +81,7 @@ rtems_task Init(
   rtems_monitor_init(RTEMS_MONITOR_SUSPEND|RTEMS_MONITOR_GLOBAL);
   /*rtems_capture_cli_init (0);*/
 
-  printf( "Starting application " SW_VER_ID " v "
+  printf( "Starting application " APP_VER_ID " v "
           BUILD_VERSION_STRING(SW_VER_MAJOR,SW_VER_MINOR,SW_VER_PATCH)
          "\n" );
 

diff --git a/rtems-omk-template/applwiptest/app_def.h b/rtems-omk-template/applwiptest/app_def.h
index 6527316f7d6068b68585b820aa9fedb00d00d5ea..29629f7f3c6931ec48e49109ce0f0d0e6bc552aa 100644 (file)
--- a/rtems-omk-template/applwiptest/app_def.h
+++ b/rtems-omk-template/applwiptest/app_def.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "applwiptest"
+
 COND_EXTERN rtems_id   Task_1_id;           /* Task 1 id */
 COND_EXTERN rtems_name Task_1_name;         /* Task 1 name */
 

diff --git a/rtems-omk-template/applwiptest/init.c b/rtems-omk-template/applwiptest/init.c
index 3811aa2f86edb685103df1ed349f9db975d0813d..c05b0f5b93887435fc77cc2a36f093bd746faedd 100644 (file)
--- a/rtems-omk-template/applwiptest/init.c
+++ b/rtems-omk-template/applwiptest/init.c
@@ -82,7 +82,7 @@ rtems_task Init(
   rtems_monitor_init(RTEMS_MONITOR_SUSPEND|RTEMS_MONITOR_GLOBAL);
   /*rtems_capture_cli_init (0);*/
 
-  printf( "Starting application " SW_VER_ID " v "
+  printf( "Starting application " APP_VER_ID " v "
           BUILD_VERSION_STRING(SW_VER_MAJOR,SW_VER_MINOR,SW_VER_PATCH)
          "\n" );
     

diff --git a/rtems-omk-template/appnet/app_def.h b/rtems-omk-template/appnet/app_def.h
index 6527316f7d6068b68585b820aa9fedb00d00d5ea..ba7914988594380989a3a6bf85ad5343cd84f6e5 100644 (file)
--- a/rtems-omk-template/appnet/app_def.h
+++ b/rtems-omk-template/appnet/app_def.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "appnet"
+
 COND_EXTERN rtems_id   Task_1_id;           /* Task 1 id */
 COND_EXTERN rtems_name Task_1_name;         /* Task 1 name */
 

diff --git a/rtems-omk-template/appnet/init.c b/rtems-omk-template/appnet/init.c
index 181e43c35aab09133c60509604b7223ed5727f07..15ac555bb03d592618c436842effcf3d034f9e56 100644 (file)
--- a/rtems-omk-template/appnet/init.c
+++ b/rtems-omk-template/appnet/init.c
@@ -120,7 +120,7 @@ rtems_task Init(
     printf( "Network initialization OK\n");
 
 
-  printf( "Starting application " SW_VER_ID " v "
+  printf( "Starting application " APP_VER_ID " v "
           BUILD_VERSION_STRING(SW_VER_MAJOR,SW_VER_MINOR,SW_VER_PATCH)
          "\n" );
 

diff --git a/rtems-omk-template/appsmptest/app_def.h b/rtems-omk-template/appsmptest/app_def.h
index b077ba5e6a3d258b03ab29d9021bf0f7003080c6..17bff7cccfc95147bb954ae9119c42c5fb86d94b 100644 (file)
--- a/rtems-omk-template/appsmptest/app_def.h
+++ b/rtems-omk-template/appsmptest/app_def.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "appsmptest"
+
 COND_EXTERN rtems_id   Task_1_id;           /* Task 1 id */
 COND_EXTERN rtems_name Task_1_name;         /* Task 1 name */
 

diff --git a/rtems-omk-template/appsmptest/init.c b/rtems-omk-template/appsmptest/init.c
index 0773fcef0494aa45cd3b088b603fffebae5f0169..f75cb7391537eb04314fabf1ddee4ec02122e297 100644 (file)
--- a/rtems-omk-template/appsmptest/init.c
+++ b/rtems-omk-template/appsmptest/init.c
@@ -82,7 +82,7 @@ rtems_task Init(
   rtems_monitor_init(RTEMS_MONITOR_SUSPEND|RTEMS_MONITOR_GLOBAL);
   /*rtems_capture_cli_init (0);*/
 
-  printf( "Starting application " SW_VER_ID " v "
+  printf( "Starting application " APP_VER_ID " v "
           BUILD_VERSION_STRING(SW_VER_MAJOR,SW_VER_MINOR,SW_VER_PATCH)
   "\n" );
 

diff --git a/rtems-tests/prioinh_check/app_def.h b/rtems-tests/prioinh_check/app_def.h
index 2d5b01540511dcc085bcabc77a473dc7b0470558..e67c3e7e23f164f38dcc692f023103cac18956c2 100644 (file)
--- a/rtems-tests/prioinh_check/app_def.h
+++ b/rtems-tests/prioinh_check/app_def.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "prioinh_check"
+
 COND_EXTERN rtems_id   Task_1_id;           /* Task 1 id */
 COND_EXTERN rtems_name Task_1_name;         /* Task 1 name */
 

diff --git a/rtems-tests/prioinh_check/init.c b/rtems-tests/prioinh_check/init.c
index 7968847e3b29564beca0350f1fde9d8b5099190b..0807ad71ea1951b750bcabb7048bf71e32625353 100644 (file)
--- a/rtems-tests/prioinh_check/init.c
+++ b/rtems-tests/prioinh_check/init.c
@@ -76,7 +76,7 @@ rtems_task Init(
   rtems_monitor_init(RTEMS_MONITOR_SUSPEND|RTEMS_MONITOR_GLOBAL);
   /*rtems_capture_cli_init (0);*/
   
-  printf( "Starting application prioinh_check\n" );
+  printf( "Starting application " APP_VER_ID "\n" );
 
   Task_1_name = rtems_build_name( 'T', 'S', 'K', '1' );
     

diff --git a/rtems-tests/prioinh_posix/app_def.h b/rtems-tests/prioinh_posix/app_def.h
index c900ba44124128e8dd144f65f05fbeee6bcf4818..a79c1181a832da63f5aa54e2a7ff9cf2532b9cae 100644 (file)
--- a/rtems-tests/prioinh_posix/app_def.h
+++ b/rtems-tests/prioinh_posix/app_def.h
@@ -13,6 +13,7 @@
 extern "C" {
 #endif
 
+#define APP_VER_ID  "prioinh_posix"
 
 /* Posix style startup task */
 void *Task_1(void *argument);

diff --git a/rtems-tests/prioinh_posix/init.c b/rtems-tests/prioinh_posix/init.c
index d2a3353b91f7ea42f54106b6f8e2a8d44cdded5d..f8afa64a63375cd81041c5a0faaa20c38eb19ad1 100644 (file)
--- a/rtems-tests/prioinh_posix/init.c
+++ b/rtems-tests/prioinh_posix/init.c
@@ -80,7 +80,7 @@ rtems_task Init(
   rtems_monitor_init(RTEMS_MONITOR_SUSPEND|RTEMS_MONITOR_GLOBAL);
   /*rtems_capture_cli_init (0);*/
   
-  printf( "Starting application prioinh_check\n" );
+  printf( "Starting application " APP_VER_ID "\n" );
 
   status = pthread_attr_init(&taskattr);
   if(status!=0) bad_status(status, 0, "pthread_attr_init 1" );