Changeset df747bd8 in mainline

Timestamp:

2009-12-16T01:59:07Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c26eb39

Parents:

47a350f

Message:

rename getvc to getterm, as the new name is more suitable for the generic nature of the binary
(virtual consoles are hopefully going to be accompanied by other terminal-like devices soon)

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/getterm/Makefile (moved) (moved from uspace/app/getvc/Makefile )
• uspace/app/getterm/Makefile.build (moved) (moved from uspace/app/getvc/Makefile.build ) (1 diff)
• uspace/app/getterm/Makefile.common (moved) (moved from uspace/app/getvc/Makefile.common ) (1 diff)
• uspace/app/getterm/getterm.c (moved) (moved from uspace/app/getvc/getvc.c ) (2 diffs)
• uspace/app/getterm/getterm.h (moved) (moved from uspace/app/getvc/getvc.h ) (2 diffs)
• uspace/app/getterm/version.c (moved) (moved from uspace/app/getvc/version.c ) (3 diffs)
• uspace/app/getterm/version.h (moved) (moved from uspace/app/getvc/version.h ) (2 diffs)
• uspace/app/init/init.c (modified) (4 diffs)

boot/Makefile.common

@@ -57 +57 @@
 RD_APPS = \
         $(USPACEDIR)/app/edit/edit \
-        $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/getterm/getterm \
         $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \

uspace/Makefile

@@ -55 +55 @@
         app/klog \
         app/init \
-        app/getvc \
+        app/getterm \
         app/redir \
         app/bdsh

uspace/app/getterm/Makefile.build

@@ -41 +41 @@
 
 SOURCES = \
-        getvc.c \
+        getterm.c \
         version.c
 

uspace/app/getterm/Makefile.common

@@ -37 +37 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
-OUTPUT = getvc
+OUTPUT = getterm

uspace/app/getterm/getterm.c

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc GetVC
+/** @addtogroup getterm GetTerm
  * @brief Console initialization task.
  * @{
@@ -44 +44 @@
 static void usage(void)
 {
-        printf("Usage: getvc <device> <path>\n");
+        printf("Usage: getterm <terminal> <path>\n");
 }
 

uspace/app/getterm/getterm.h

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc
+/** @addtogroup getterm
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef GETVC_H__
-#define GETVC_H__
+#ifndef GETTERM_H__
+#define GETTERM_H__
 
 #endif

uspace/app/getterm/version.c

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc
+/** @addtogroup getterm
  * @{
  */
@@ -37 +37 @@
 #include <stdio.h>
 #include <macros.h>
-#include "getvc.h"
+#include "getterm.h"
 #include "version.h"
 
@@ -57 +57 @@
 
 /** Print version information. */
-void version_print(const char *vc)
+void version_print(const char *term)
 {
         printf("HelenOS release %s (%s)%s%s\n", release, name, revision, timestamp);
-        printf("Running on %s (%s)\n", arch, vc);
+        printf("Running on %s (%s)\n", arch, term);
         printf("Copyright (c) 2001-2009 HelenOS project\n\n");
 }

uspace/app/getterm/version.h

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc
+/** @addtogroup getterm
  * @{
  */
@@ -37 +37 @@
 #define VERSION_H__
 
-extern void version_print(const char *vc);
+extern void version_print(const char *term);
 
 #endif

uspace/app/init/init.c

@@ -53 +53 @@
 
 #define SRV_CONSOLE  "/srv/console"
-#define APP_GETVC    "/app/getvc"
+#define APP_GETTERM  "/app/getterm"
 
 static void info_print(void)
@@ -206 +206 @@
 }
 
-static void getvc(char *dev, char *app)
+static void getterm(char *dev, char *app)
 {
         char *argv[4];
-        char vc[MAX_DEVICE_NAME];
+        char term[MAX_DEVICE_NAME];
         int rc;
         
-        snprintf(vc, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
-        
-        printf(NAME ": Spawning %s on %s\n", APP_GETVC, vc);
+        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        
+        printf(NAME ": Spawning %s with %s\n", APP_GETTERM, term);
         
         /* Wait for the terminal device to be ready */
@@ -221 +221 @@
         
         if (rc == EOK) {
-                argv[0] = APP_GETVC;
-                argv[1] = vc;
+                argv[0] = APP_GETTERM;
+                argv[1] = term;
                 argv[2] = app;
                 argv[3] = NULL;
                 
-                if (!task_spawn(APP_GETVC, argv))
-                        printf(NAME ": Error spawning %s on %s\n", APP_GETVC, vc);
+                if (!task_spawn(APP_GETTERM, argv))
+                        printf(NAME ": Error spawning %s with %s\n", APP_GETTERM, term);
         } else
-                printf(NAME ": Error waiting on %s\n", vc);
+                printf(NAME ": Error waiting on %s\n", term);
 }
 
@@ -287 +287 @@
 #endif
 
-        getvc("term/vc0", "/app/bdsh");
-        getvc("term/vc1", "/app/bdsh");
-        getvc("term/vc2", "/app/bdsh");
-        getvc("term/vc3", "/app/bdsh");
-        getvc("term/vc4", "/app/bdsh");
-        getvc("term/vc5", "/app/bdsh");
-        getvc("term/vc6", "/app/klog");
+        getterm("term/vc0", "/app/bdsh");
+        getterm("term/vc1", "/app/bdsh");
+        getterm("term/vc2", "/app/bdsh");
+        getterm("term/vc3", "/app/bdsh");
+        getterm("term/vc4", "/app/bdsh");
+        getterm("term/vc5", "/app/bdsh");
+        getterm("term/vc6", "/app/klog");
         
         return 0;