Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset df747bd8 in mainline


Ignore:
Timestamp:
2009-12-16T01:59:07Z (12 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
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:
3 edited
7 moved

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r47a350f rdf747bd8  
    5757RD_APPS = \
    5858        $(USPACEDIR)/app/edit/edit \
    59         $(USPACEDIR)/app/getvc/getvc \
     59        $(USPACEDIR)/app/getterm/getterm \
    6060        $(USPACEDIR)/app/redir/redir \
    6161        $(USPACEDIR)/app/tetris/tetris \
  • uspace/Makefile

    r47a350f rdf747bd8  
    5555        app/klog \
    5656        app/init \
    57         app/getvc \
     57        app/getterm \
    5858        app/redir \
    5959        app/bdsh
  • uspace/app/getterm/Makefile.build

    r47a350f rdf747bd8  
    4141
    4242SOURCES = \
    43         getvc.c \
     43        getterm.c \
    4444        version.c
    4545
  • uspace/app/getterm/Makefile.common

    r47a350f rdf747bd8  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = getvc
     39OUTPUT = getterm
  • uspace/app/getterm/getterm.c

    r47a350f rdf747bd8  
    2727 */
    2828
    29 /** @addtogroup getvc GetVC
     29/** @addtogroup getterm GetTerm
    3030 * @brief Console initialization task.
    3131 * @{
     
    4444static void usage(void)
    4545{
    46         printf("Usage: getvc <device> <path>\n");
     46        printf("Usage: getterm <terminal> <path>\n");
    4747}
    4848
  • uspace/app/getterm/getterm.h

    r47a350f rdf747bd8  
    2727 */
    2828
    29 /** @addtogroup getvc
     29/** @addtogroup getterm
    3030 * @{
    3131 */
     
    3434 */
    3535
    36 #ifndef GETVC_H__
    37 #define GETVC_H__
     36#ifndef GETTERM_H__
     37#define GETTERM_H__
    3838
    3939#endif
  • uspace/app/getterm/version.c

    r47a350f rdf747bd8  
    2727 */
    2828
    29 /** @addtogroup getvc
     29/** @addtogroup getterm
    3030 * @{
    3131 */
     
    3737#include <stdio.h>
    3838#include <macros.h>
    39 #include "getvc.h"
     39#include "getterm.h"
    4040#include "version.h"
    4141
     
    5757
    5858/** Print version information. */
    59 void version_print(const char *vc)
     59void version_print(const char *term)
    6060{
    6161        printf("HelenOS release %s (%s)%s%s\n", release, name, revision, timestamp);
    62         printf("Running on %s (%s)\n", arch, vc);
     62        printf("Running on %s (%s)\n", arch, term);
    6363        printf("Copyright (c) 2001-2009 HelenOS project\n\n");
    6464}
  • uspace/app/getterm/version.h

    r47a350f rdf747bd8  
    2727 */
    2828
    29 /** @addtogroup getvc
     29/** @addtogroup getterm
    3030 * @{
    3131 */
     
    3737#define VERSION_H__
    3838
    39 extern void version_print(const char *vc);
     39extern void version_print(const char *term);
    4040
    4141#endif
  • uspace/app/init/init.c

    r47a350f rdf747bd8  
    5353
    5454#define SRV_CONSOLE  "/srv/console"
    55 #define APP_GETVC    "/app/getvc"
     55#define APP_GETTERM  "/app/getterm"
    5656
    5757static void info_print(void)
     
    206206}
    207207
    208 static void getvc(char *dev, char *app)
     208static void getterm(char *dev, char *app)
    209209{
    210210        char *argv[4];
    211         char vc[MAX_DEVICE_NAME];
     211        char term[MAX_DEVICE_NAME];
    212212        int rc;
    213213       
    214         snprintf(vc, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
    215        
    216         printf(NAME ": Spawning %s on %s\n", APP_GETVC, vc);
     214        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
     215       
     216        printf(NAME ": Spawning %s with %s\n", APP_GETTERM, term);
    217217       
    218218        /* Wait for the terminal device to be ready */
     
    221221       
    222222        if (rc == EOK) {
    223                 argv[0] = APP_GETVC;
    224                 argv[1] = vc;
     223                argv[0] = APP_GETTERM;
     224                argv[1] = term;
    225225                argv[2] = app;
    226226                argv[3] = NULL;
    227227               
    228                 if (!task_spawn(APP_GETVC, argv))
    229                         printf(NAME ": Error spawning %s on %s\n", APP_GETVC, vc);
     228                if (!task_spawn(APP_GETTERM, argv))
     229                        printf(NAME ": Error spawning %s with %s\n", APP_GETTERM, term);
    230230        } else
    231                 printf(NAME ": Error waiting on %s\n", vc);
     231                printf(NAME ": Error waiting on %s\n", term);
    232232}
    233233
     
    287287#endif
    288288
    289         getvc("term/vc0", "/app/bdsh");
    290         getvc("term/vc1", "/app/bdsh");
    291         getvc("term/vc2", "/app/bdsh");
    292         getvc("term/vc3", "/app/bdsh");
    293         getvc("term/vc4", "/app/bdsh");
    294         getvc("term/vc5", "/app/bdsh");
    295         getvc("term/vc6", "/app/klog");
     289        getterm("term/vc0", "/app/bdsh");
     290        getterm("term/vc1", "/app/bdsh");
     291        getterm("term/vc2", "/app/bdsh");
     292        getterm("term/vc3", "/app/bdsh");
     293        getterm("term/vc4", "/app/bdsh");
     294        getterm("term/vc5", "/app/bdsh");
     295        getterm("term/vc6", "/app/klog");
    296296       
    297297        return 0;
Note: See TracChangeset for help on using the changeset viewer.