OMK template example applications print APP_VER_ID instead of common SW_VER_ID.

[rtems-devel.git] / rtems-omk-template / appfoo / init.c

diff --git a/rtems-omk-template/appfoo/init.c b/rtems-omk-template/appfoo/init.c
index 06f57dcd4f94bef1b0c1fb556843f05f53c08f91..0f5452cdc5651928fb3974b0cc03a095323e64b9 100644 (file)
--- a/rtems-omk-template/appfoo/init.c
+++ b/rtems-omk-template/appfoo/init.c
@@ -30,9 +30,26 @@
 #include <rtems/monitor.h>
 #include <rtems/shell.h>
 
+#define CONFIGURE_SHELL_COMMANDS_INIT
+#define CONFIGURE_SHELL_COMMANDS_ALL
+#define CONFIGURE_SHELL_MOUNT_MSDOS
+
+#include <rtems/shellconfig.h>
+
 #define BUILD_VERSION_STRING(major,minor,patch) \
         __XSTRING(major) "." __XSTRING(minor) "." __XSTRING(patch)
 
+#define RTEMS_VER_CODE VER_CODE(__RTEMS_MAJOR__ ,__RTEMS_MINOR__ ,__RTEMS_REVISION__)
+
+#if RTEMS_VER_CODE < VER_CODE(4,7,99)
+  #define rtems_shell_add_cmd shell_add_cmd
+  #define rtems_shell_init(m_task_name,m_task_stacksize,m_task_priority,m_devname,m_forever,m_wait,m_login_check) \
+                shell_init(m_task_name,m_task_stacksize,m_task_priority,m_devname,B19200 | CS8,m_forever)
+#elif RTEMS_VER_CODE < VER_CODE(4,9,99)
+  #define rtems_shell_init(m_task_name,m_task_stacksize,m_task_priority,m_devname,m_forever,m_wait,m_login_check) \
+          rtems_shell_init(m_task_name,m_task_stacksize,m_task_priority,m_devname,m_forever,m_wait)
+#endif
+
 void 
 bad_rtems_status(rtems_status_code status, int fail_level, const char *text)
 {
@@ -63,8 +80,8 @@ 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" );
 
@@ -83,10 +100,10 @@ rtems_task Init(
   status = rtems_task_start( Task_1_id, Task_1, 0 );
   check_rtems_status(status, 0, "rtems_task_start of Task_1\n");
 
-  shell_init("SHLL",RTEMS_MINIMUM_STACK_SIZE+0x1000,
-              SHELL_TASK_PRIORITY,"/dev/console",B19200 | CS8, 0);
+  rtems_shell_init("SHLL",RTEMS_MINIMUM_STACK_SIZE+0x1000,
+              SHELL_TASK_PRIORITY,"/dev/console",1,0, NULL);
 
-  shell_add_cmd("testcmd", "app",
+  rtems_shell_add_cmd("testcmd", "app",
                 "test command for shell",
                 testcmd_forshell);