Changeset d3e6935 in mainline


Ignore:
Timestamp:
2008-12-26T19:37:21Z (16 years ago)
Author:
Jiri Svoboda <jirik.svoboda@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b755225
Parents:
713e6f2d
Message:

Put console IPC method numbers under libc.

Location:
uspace
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/console/console1.c

    r713e6f2d rd3e6935  
    3333#include "../tester.h"
    3434
    35 #include "../../../srv/console/console.h"
     35#include <ipc/console.h>
    3636
    3737static void set_style(int fgcolor, int bgcolor)

  • uspace/app/tetris/input.c

    r713e6f2d rd3e6935  
    5858
    5959#include <async.h>
    60 #include "../../srv/console/console.h"
     60#include <ipc/console.h>
    6161
    6262/* return true iff the given timeval is positive */

  • uspace/app/tetris/screen.c

    r713e6f2d rd3e6935  
    5757#include "screen.h"
    5858#include "tetris.h"
    59 #include "../../srv/console/console.h"
     59#include <ipc/console.h>
    6060
    6161static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */

  • uspace/app/trace/trace.c

    r713e6f2d rd3e6935  
    5050#include <ipc/services.h>
    5151#include "../../srv/vfs/vfs.h"
    52 #include "../../srv/console/console.h"
     52#include <ipc/console.h>
    5353
    5454#include "syscalls.h"

  • uspace/lib/libc/Makefile

    r713e6f2d rd3e6935  
    3434LIBC_PREFIX = $(shell pwd)
    3535SOFTINT_PREFIX = ../softint
    36 CONSOLE_PREFIX = ../../srv/console
    3736
    3837## Setup toolchain
    … …  
    4039
    4140include $(LIBC_PREFIX)/Makefile.toolchain
    42 
    43 CFLAGS += -I$(CONSOLE_PREFIX)
    4441
    4542## Sources

  • uspace/lib/libc/generic/io/stream.c

    r713e6f2d rd3e6935  
    4343#include <ipc/fb.h>
    4444#include <ipc/services.h>
    45 #include <console.h>
     45#include <ipc/console.h>
    4646#include <unistd.h>
    4747#include <async.h>

  • uspace/lib/libc/generic/vfs/vfs.c

    r713e6f2d rd3e6935  
    5050#include <string.h>
    5151#include <ipc/devmap.h>
    52 #include "../../srv/vfs/vfs.h"
     52#include "../../../srv/vfs/vfs.h"
    5353
    5454int vfs_phone = -1;

  • uspace/srv/console/console.c

    r713e6f2d rd3e6935  
    4242#include <key_buffer.h>
    4343#include <console.h>
     44#include <ipc/console.h>
    4445#include <unistd.h>
    4546#include <async.h>

  • uspace/srv/console/console.h

    r713e6f2d rd3e6935  
    4040#define CONSOLE_COUNT 12
    4141
    42 #define CONSOLE_GETCHAR         1026
    43 #define CONSOLE_PUTCHAR         1027
    44 #define CONSOLE_CLEAR           1028
    45 #define CONSOLE_GOTO            1029
    46 #define CONSOLE_GETSIZE         1030
    47 #define CONSOLE_FLUSH           1031
    48 #define CONSOLE_SET_STYLE       1032
    49 #define CONSOLE_CURSOR_VISIBILITY       1033
    50 
    5142#endif
    5243 
Note: See TracChangeset for help on using the changeset viewer.