Changeset 76ca3f7 in mainline for uspace/srv/hid/char_mouse

Timestamp:

2010-03-23T20:49:54Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

e417b96

Parents:

b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:

uspace/srv/hid/char_mouse

Files:

• Makefile (modified) (2 diffs)
• chardev.c (modified) (1 diff)
• proto/ps2.c (modified) (2 diffs)

uspace/srv/hid/char_mouse/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBC_PREFIX)/libc.a
 EXTRA_CFLAGS = -Iinclude
-
-OUTPUT = char_ms
+BINARY = char_ms
 
 SOURCES = \
@@ -39 +37 @@
         chardev.c
 
-include ../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common

uspace/srv/hid/char_mouse/chardev.c

@@ -48 +48 @@
 static int dev_phone;
 
-#define NAME "kbd"
+#define NAME "char_mouse"
 
 int mouse_port_init(void)

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

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <mouse_port.h>
+#include <char_mouse.h>
 #include <mouse_proto.h>
-#include <char_mouse.h>
 
 #define BUFSIZE 3
+
+#define PS2_MOUSE_OUT_INIT  0xf4
+#define PS2_MOUSE_ACK       0xfa
 
 typedef struct {
@@ -67 +71 @@
 int mouse_proto_init(void)
 {
+        mouse_port_write(PS2_MOUSE_OUT_INIT);
         return 0;
 }