Changeset 827d73f in mainline for uspace/srv/hid/char_mouse

Timestamp:

2010-02-12T14:09:22Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

a70bda4

Parents:

918e9910 (diff), e70edd1 (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:

Merged the actual head

Location:

uspace/srv/hid/char_mouse

Files:

• Makefile (moved) (moved from uspace/app/klog/Makefile.common ) (2 diffs)
• Makefile.build (moved) (moved from uspace/srv/mouse/c_mouse/Makefile.build )
• Makefile.common (moved) (moved from uspace/srv/mouse/c_mouse/Makefile.common )
• char_mouse.c (moved) (moved from uspace/srv/mouse/c_mouse/c_mouse.c ) (1 diff)
• chardev.c (moved) (moved from uspace/srv/mouse/c_mouse/chardev.c ) (1 diff)
• include/char_mouse.h (moved) (moved from uspace/srv/mouse/c_mouse/include/c_mouse.h ) (1 diff)
• include/mouse_port.h (moved) (moved from uspace/srv/mouse/c_mouse/include/mouse_port.h )
• include/mouse_proto.h (moved) (moved from uspace/srv/mouse/c_mouse/include/mouse_proto.h )
• proto/ps2.c (moved) (moved from uspace/srv/mouse/c_mouse/proto/ps2.c ) (1 diff)

uspace/srv/hid/char_mouse/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
+USPACE_PREFIX = ../../..
+LIBS = $(LIBC_PREFIX)/libc.a
+EXTRA_CFLAGS = -Iinclude
 
-## Common names
-#
+OUTPUT = char_ms
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
-LIBS = $(LIBC_PREFIX)/libc.a
+SOURCES = \
+        proto/ps2.c \
+        char_mouse.c \
+        chardev.c
 
-DEPEND = Makefile.depend
-DEPEND_PREV = $(DEPEND).prev
-OUTPUT = klog
+include ../../Makefile.common

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