Changeset 37458472 in mainline

Timestamp:

2006-06-02T14:11:10Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

6b5111a

Parents:

bb51e9a8

Message:

Ia64 uspace keuboard uspace part

Files:

• Makefile (modified) (1 diff)
• kbd/arch/ia64/include/kbd.h (added)
• kbd/arch/ia64/src/kbd.c (added)
• kbd/generic/kbd.c (modified) (3 diffs)
• libc/generic/io/stream.c (modified) (2 diffs)
• libc/include/stdio.h (modified) (1 diff)

Makefile

@@ -55 +55 @@
         DIRS += kbd
 endif
+ifeq ($(ARCH), ia64)
+        DIRS += kbd
+endif
 
 BUILDS := $(addsuffix .build,$(DIRS))

kbd/generic/kbd.c

@@ -32 +32 @@
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <ipc/ns.h>
 #include <errno.h>
@@ -47 +48 @@
         int res;
         ipcarg_t phonead;
-        int phoneid;
+        ipcarg_t phoneid;
         char connected = 0;
         keybuffer_t keybuffer;  
         ipcarg_t retval, arg1, arg2;
-
+        
+        //open("null",0);
+        //open("stdout",0);
+        
         /* Initialize arch dependent parts */
         if (!(res = kbd_arch_init())) {
@@ -65 +69 @@
                 return -1;
         };
-        
         while (1) {
                 callid = ipc_wait_for_call(&call);

libc/generic/io/stream.c

@@ -118 +118 @@
 }
 
+static ssize_t write_null(void *param, const void *buf, size_t count)
+{
+        return count;
+}
+
+
 fd_t open(const char *fname, int flags)
 {
@@ -143 +149 @@
                 return c;
         }
+        if (!strcmp(fname, "null")) {
+                streams[c].w = write_null;
+                return c;
+        }
 }
 

libc/include/stdio.h

@@ -35 +35 @@
 #define EOF (-1)
 
+#include <io/stream.h>
+
 extern int getchar(void);