Changeset 67472b9b in mainline

Timestamp:

2013-12-31T20:30:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5c65e61

Parents:

7858acbf

Message:

libc, libdrv: Move graph dev iface to libdrv.

Location:

uspace

Files:

• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/device/graph_dev.c (deleted)
• lib/drv/generic/remote_graph_dev.c (modified) (1 diff)
• lib/drv/include/graph_iface.h (moved) (moved from uspace/lib/c/include/device/graph_dev.h ) (1 diff)
• srv/hid/compositor/Makefile (modified) (1 diff)
• srv/hid/compositor/compositor.c (modified) (1 diff)

uspace/lib/c/Makefile

@@ -71 +71 @@
         generic/device/char_dev.c \
         generic/device/clock_dev.c \
-        generic/device/graph_dev.c \
         generic/dhcp.c \
         generic/dnsr.c \

uspace/lib/drv/generic/remote_graph_dev.c

@@ -36 +36 @@
 #include <async.h>
 #include <macros.h>
-#include <device/graph_dev.h>
 
 #include "ops/graph_dev.h"
+#include "graph_iface.h"
 #include "ddf/driver.h"
+
+typedef enum {
+        GRAPH_DEV_CONNECT = 0
+} graph_dev_method_t;
+
+int graph_dev_connect(async_sess_t *sess)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        int ret = async_req_1_0(exch, DEV_IFACE_ID(GRAPH_DEV_IFACE), GRAPH_DEV_CONNECT);
+        async_exchange_end(exch);
+
+        return ret;
+}
 
 static void remote_graph_connect(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);

uspace/lib/drv/include/graph_iface.h

@@ -38 +38 @@
 #include <async.h>
 
-typedef enum {
-        GRAPH_DEV_CONNECT = 0
-} graph_dev_method_t;
-
 extern int graph_dev_connect(async_sess_t *);
 

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>