From 52aefd095af70fe04ebd987e4139366a4e80b4e6 Mon Sep 17 00:00:00 2001
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Sun, 25 Sep 2016 15:16:58 +0200
Subject: [PATCH] OMK template example applications print APP_VER_ID instead of
 common SW_VER_ID.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---
 rtems-omk-template/appdl/app_def.h       | 2 ++
 rtems-omk-template/appdl/init.c          | 2 +-
 rtems-omk-template/appfoo/app_def.h      | 2 ++
 rtems-omk-template/appfoo/init.c         | 2 +-
 rtems-omk-template/applwiptest/app_def.h | 2 ++
 rtems-omk-template/applwiptest/init.c    | 2 +-
 rtems-omk-template/appnet/app_def.h      | 2 ++
 rtems-omk-template/appnet/init.c         | 2 +-
 rtems-omk-template/appsmptest/app_def.h  | 2 ++
 rtems-omk-template/appsmptest/init.c     | 2 +-
 rtems-tests/prioinh_check/app_def.h      | 2 ++
 rtems-tests/prioinh_check/init.c         | 2 +-
 rtems-tests/prioinh_posix/app_def.h      | 1 +
 rtems-tests/prioinh_posix/init.c         | 2 +-
 14 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/rtems-omk-template/appdl/app_def.h b/rtems-omk-template/appdl/app_def.h
index 6527316..bf1d18c 100644
--- 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 55e3e37..206e06b 100644
--- 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 6527316..2fef75f 100644
--- 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 6326b66..0f5452c 100644
--- 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 6527316..29629f7 100644
--- 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 3811aa2..c05b0f5 100644
--- 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 6527316..ba79149 100644
--- 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 181e43c..15ac555 100644
--- 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 b077ba5..17bff7c 100644
--- 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 0773fce..f75cb73 100644
--- 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 2d5b015..e67c3e7 100644
--- 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 7968847..0807ad7 100644
--- 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 c900ba4..a79c118 100644
--- 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 d2a3353..f8afa64 100644
--- 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" );
-- 
2.39.2