| /trunk/uspace/app/tester/console/console1.c |
|---|
| 32,7 → 32,7 |
| #include <async.h> |
| #include "../tester.h" |
| #include <ipc/console.h> |
| #include "../../../srv/console/console.h" |
| static void set_style(int fgcolor, int bgcolor) |
| { |
| /trunk/uspace/app/trace/trace.c |
|---|
| 49,7 → 49,7 |
| #include "proto.h" |
| #include <ipc/services.h> |
| #include "../../srv/vfs/vfs.h" |
| #include <ipc/console.h> |
| #include "../../srv/console/console.h" |
| #include "syscalls.h" |
| #include "ipcp.h" |
| /trunk/uspace/app/tetris/input.c |
|---|
| 57,7 → 57,7 |
| #include "tetris.h" |
| #include <async.h> |
| #include <ipc/console.h> |
| #include "../../srv/console/console.h" |
| /* return true iff the given timeval is positive */ |
| #define TV_POS(tv) \ |
| /trunk/uspace/app/tetris/screen.c |
|---|
| 56,7 → 56,7 |
| #include <async.h> |
| #include "screen.h" |
| #include "tetris.h" |
| #include <ipc/console.h> |
| #include "../../srv/console/console.h" |
| static cell curscreen[B_SIZE]; /* 1 => standout (or otherwise marked) */ |
| static int curscore; |
| /trunk/uspace/srv/console/console.c |
|---|
| 41,7 → 41,6 |
| #include <errno.h> |
| #include <key_buffer.h> |
| #include <console.h> |
| #include <ipc/console.h> |
| #include <unistd.h> |
| #include <async.h> |
| #include <libadt/fifo.h> |
| /trunk/uspace/srv/console/console.h |
|---|
| 39,6 → 39,15 |
| #define CONSOLE_COUNT 12 |
| #define CONSOLE_GETCHAR 1026 |
| #define CONSOLE_PUTCHAR 1027 |
| #define CONSOLE_CLEAR 1028 |
| #define CONSOLE_GOTO 1029 |
| #define CONSOLE_GETSIZE 1030 |
| #define CONSOLE_FLUSH 1031 |
| #define CONSOLE_SET_STYLE 1032 |
| #define CONSOLE_CURSOR_VISIBILITY 1033 |
| #endif |
| /** @} |
| /trunk/uspace/lib/libc/include/ipc/console.h |
|---|
| File deleted |
| Property changes: |
| Deleted: svn:mergeinfo |
| /trunk/uspace/lib/libc/generic/vfs/vfs.c |
|---|
| 49,7 → 49,7 |
| #include <errno.h> |
| #include <string.h> |
| #include <ipc/devmap.h> |
| #include "../../../srv/vfs/vfs.h" |
| #include "../../srv/vfs/vfs.h" |
| int vfs_phone = -1; |
| futex_t vfs_phone_futex = FUTEX_INITIALIZER; |
| /trunk/uspace/lib/libc/generic/io/stream.c |
|---|
| 42,7 → 42,7 |
| #include <ipc/ns.h> |
| #include <ipc/fb.h> |
| #include <ipc/services.h> |
| #include <ipc/console.h> |
| #include <console.h> |
| #include <unistd.h> |
| #include <async.h> |
| #include <sys/types.h> |
| /trunk/uspace/lib/libc/Makefile |
|---|
| 33,6 → 33,7 |
| LIBC_PREFIX = $(shell pwd) |
| SOFTINT_PREFIX = ../softint |
| CONSOLE_PREFIX = ../../srv/console |
| ## Setup toolchain |
| # |
| 39,6 → 40,8 |
| include $(LIBC_PREFIX)/Makefile.toolchain |
| CFLAGS += -I$(CONSOLE_PREFIX) |
| ## Sources |
| # |