Changeset 476f62c in mainline for uspace/srv/hid

Timestamp:

2014-01-17T17:26:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5828554, cf982ff

Parents:

61b5b73d (diff), 66be0288 (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 libdrv cleanup.

• move 'client side' device iface to libdrv (from libc)
• hide remote_* libdrv headers
• add a bunch of const qualifiers and change static data to const
• cleanup: index initialized arrays, array size macro, removes duplicit enums, …

TODO

move hw_res, pio_window and co to libdrv. (too entangled with libc to move right now)
move clock_dev iface to libdrv. (also tied to libc, we need a time provider solution)

Location:

uspace/srv/hid

Files:

• compositor/Makefile (modified) (1 diff)
• compositor/compositor.c (modified) (1 diff)
• isdv4_tablet/Makefile (modified) (1 diff)
• isdv4_tablet/isdv4.c (modified) (1 diff)
• isdv4_tablet/main.c (modified) (1 diff)

uspace/srv/hid/compositor/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRAW_PREFIX)/libdraw.a $(LIBSOFTREND_PREFIX)/libsoftrend.a \
-        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-EXTRA_CFLAGS += -I$(LIBDRAW_PREFIX) -I$(LIBSOFTREND_PREFIX)
+LIBS = \
+        $(LIBDRAW_PREFIX)/libdraw.a \
+        $(LIBSOFTREND_PREFIX)/libsoftrend.a \
+        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+
+EXTRA_CFLAGS += \
+        -I$(LIBDRAW_PREFIX) \
+        -I$(LIBSOFTREND_PREFIX) \
+        -I$(LIBDRV_PREFIX)/include
+
 BINARY = compositor
 

uspace/srv/hid/compositor/compositor.c

@@ -58 +58 @@
 
 #include <event.h>
-#include <device/graph_dev.h>
+#include <graph_iface.h>
 #include <io/keycode.h>
 #include <io/mode.h>

uspace/srv/hid/isdv4_tablet/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-#LIBS = 
-#EXTRA_CFLAGS = 
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
 BINARY = isdv4_tablet
 

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -27 +27 @@
  */
 
-#include <device/char_dev.h>
+#include <char_dev_iface.h>
 #include <errno.h>
 #include <stdlib.h>

uspace/srv/hid/isdv4_tablet/main.c

@@ -27 +27 @@
  */
 
-#include <device/char_dev.h>
+#include <char_dev_iface.h>
 #include <errno.h>
 #include <ipc/serial_ctl.h>