Changeset b7068da in mainline for uspace/drv/char

Timestamp:

2012-02-09T20:35:12Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/drv/char

Files:

• i8042/Makefile (moved) (moved from uspace/srv/hw/char/i8042/Makefile ) (1 diff)
• i8042/buffer.h (added)
• i8042/i8042.c (added)
• i8042/i8042.h (added)
• i8042/i8042.ma (added)
• i8042/main.c (added)
• ps2mouse/Makefile (added)
• ps2mouse/chardev.c (added)
• ps2mouse/chardev.h (added)
• ps2mouse/main.c (added)
• ps2mouse/ps2mouse.c (added)
• ps2mouse/ps2mouse.h (added)
• ps2mouse/ps2mouse.ma (added)
• xtkbd/Makefile (added)
• xtkbd/chardev.c (added)
• xtkbd/chardev.h (added)
• xtkbd/main.c (added)
• xtkbd/xtkbd.c (added)
• xtkbd/xtkbd.h (added)
• xtkbd/xtkbd.ma (added)

uspace/drv/char/i8042/Makefile

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../../../..
+USPACE_PREFIX = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
 BINARY = i8042
 
 SOURCES = \
-        i8042.c
+        i8042.c \
+        main.c
 
 include $(USPACE_PREFIX)/Makefile.common