Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 7858acbf41d53b9ad6dcaf06f30f37ba260f89f8) +++ uspace/lib/c/Makefile (revision 67472b9b2fe45eb27d0fdbb80b57702416e56ce2) @@ -71,5 +71,4 @@ generic/device/char_dev.c \ generic/device/clock_dev.c \ - generic/device/graph_dev.c \ generic/dhcp.c \ generic/dnsr.c \ Index: pace/lib/c/generic/device/graph_dev.c =================================================================== --- uspace/lib/c/generic/device/graph_dev.c (revision 7858acbf41d53b9ad6dcaf06f30f37ba260f89f8) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - /** @addtogroup libc - * @{ - */ -/** @file - */ - -#include -#include -#include - -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; -} - -/** @} - */ Index: pace/lib/c/include/device/graph_dev.h =================================================================== --- uspace/lib/c/include/device/graph_dev.h (revision 7858acbf41d53b9ad6dcaf06f30f37ba260f89f8) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_GRAPH_DEV_H_ -#define LIBC_DEVICE_GRAPH_DEV_H_ - -#include - -typedef enum { - GRAPH_DEV_CONNECT = 0 -} graph_dev_method_t; - -extern int graph_dev_connect(async_sess_t *); - -#endif - -/** @} - */ Index: uspace/lib/drv/generic/remote_graph_dev.c =================================================================== --- uspace/lib/drv/generic/remote_graph_dev.c (revision 7858acbf41d53b9ad6dcaf06f30f37ba260f89f8) +++ uspace/lib/drv/generic/remote_graph_dev.c (revision 67472b9b2fe45eb27d0fdbb80b57702416e56ce2) @@ -36,8 +36,21 @@ #include #include -#include #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 *); Index: uspace/lib/drv/include/graph_iface.h =================================================================== --- uspace/lib/drv/include/graph_iface.h (revision 67472b9b2fe45eb27d0fdbb80b57702416e56ce2) +++ uspace/lib/drv/include/graph_iface.h (revision 67472b9b2fe45eb27d0fdbb80b57702416e56ce2) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_GRAPH_DEV_H_ +#define LIBC_DEVICE_GRAPH_DEV_H_ + +#include + +extern int graph_dev_connect(async_sess_t *); + +#endif + +/** @} + */ Index: uspace/srv/hid/compositor/Makefile =================================================================== --- uspace/srv/hid/compositor/Makefile (revision 7858acbf41d53b9ad6dcaf06f30f37ba260f89f8) +++ uspace/srv/hid/compositor/Makefile (revision 67472b9b2fe45eb27d0fdbb80b57702416e56ce2) @@ -28,7 +28,15 @@ 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 Index: uspace/srv/hid/compositor/compositor.c =================================================================== --- uspace/srv/hid/compositor/compositor.c (revision 7858acbf41d53b9ad6dcaf06f30f37ba260f89f8) +++ uspace/srv/hid/compositor/compositor.c (revision 67472b9b2fe45eb27d0fdbb80b57702416e56ce2) @@ -58,5 +58,5 @@ #include -#include +#include #include #include