Changeset e2b73d4f in mainline for uspace/srv/hid

Timestamp:

2010-03-21T09:25:29Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f857a

Parents:

facebd56 (diff), 4e9aaf5 (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:

• char_mouse/chardev.c (modified) (1 diff)
• char_mouse/proto/ps2.c (modified) (2 diffs)
• console/Makefile (modified) (1 diff)
• fb/Makefile (modified) (1 diff)
• kbd/Makefile (modified) (1 diff)

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;
 }

uspace/srv/hid/console/Makefile

@@ -32 +32 @@
 .PHONY: all clean
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
+all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)

uspace/srv/hid/fb/Makefile

@@ -32 +32 @@
 .PHONY: all clean
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
+all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)

uspace/srv/hid/kbd/Makefile

@@ -32 +32 @@
 .PHONY: all clean
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
+all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)