Changeset 19f24fd in mainline for uspace/srv/hid

Timestamp:

2010-02-05T22:25:52Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv/hid

Files:

• adb_mouse/Makefile (added)
• adb_mouse/adb_dev.c (added)
• adb_mouse/adb_dev.h (added)
• adb_mouse/adb_mouse.c (added)
• adb_mouse/adb_mouse.h (added)
• char_mouse/Makefile (moved) (moved from uspace/srv/hid/c_mouse/Makefile ) (1 diff)
• char_mouse/char_mouse.c (moved) (moved from uspace/srv/hid/c_mouse/c_mouse.c ) (1 diff)
• char_mouse/chardev.c (moved) (moved from uspace/srv/hid/c_mouse/chardev.c ) (1 diff)
• char_mouse/include/char_mouse.h (moved) (moved from uspace/srv/hid/c_mouse/include/c_mouse.h ) (1 diff)
• char_mouse/include/mouse_port.h (moved) (moved from uspace/srv/hid/c_mouse/include/mouse_port.h )
• char_mouse/include/mouse_proto.h (moved) (moved from uspace/srv/hid/c_mouse/include/mouse_proto.h )
• char_mouse/proto/ps2.c (moved) (moved from uspace/srv/hid/c_mouse/proto/ps2.c ) (1 diff)
• console/console.c (modified) (1 diff)
• kbd/Makefile.build (modified) (1 diff)
• kbd/ctl/apple.c (added)
• kbd/port/adb.c (added)

uspace/srv/hid/char_mouse/Makefile

@@ -32 +32 @@
 EXTRA_CFLAGS = -Iinclude
 
-OUTPUT = c_mouse
+OUTPUT = char_ms
 
 SOURCES = \
         proto/ps2.c \
-        c_mouse.c \
+        char_mouse.c \
         chardev.c
 

uspace/srv/hid/char_mouse/char_mouse.c

@@ -47 +47 @@
 #include <devmap.h>
 
-#include <c_mouse.h>
+#include <char_mouse.h>
 #include <mouse_port.h>
 #include <mouse_proto.h>

uspace/srv/hid/char_mouse/chardev.c

@@ -41 +41 @@
 #include <errno.h>
 
-#include <c_mouse.h>
+#include <char_mouse.h>
 #include <mouse_port.h>
 

uspace/srv/hid/char_mouse/include/char_mouse.h

@@ -34 +34 @@
  */
 
-#ifndef C_MOUSE_H_
-#define C_MOUSE_H_
+#ifndef CHAR_MOUSE_H_
+#define CHAR_MOUSE_H_
 
 extern void mouse_handle_byte(int);

uspace/srv/hid/char_mouse/proto/ps2.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <mouse_proto.h>
-#include <c_mouse.h>
+#include <char_mouse.h>
 
 #define BUFSIZE 3

uspace/srv/hid/console/console.c

@@ -475 +475 @@
 static void cons_write(console_t *cons, ipc_callid_t rid, ipc_call_t *request)
 {
-        ipc_callid_t callid;
+        void *buf;
         size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+        int rc = async_data_write_accept(&buf, false, 0, 0, 0, &size);
+        
+        if (rc != EOK) {
+                ipc_answer_0(rid, rc);
                 return;
         }
-        
-        char *buf = (char *) malloc(size);
-        if (buf == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        
-        (void) async_data_write_finalize(callid, buf, size);
         
         async_serialize_start();

uspace/srv/hid/kbd/Makefile.build

@@ -125 +125 @@
 ifeq ($(UARCH),ppc32)
         SOURCES += \
-                port/dummy.c \
-                ctl/stty.c
+                port/adb.c \
+                ctl/apple.c
 endif