Index: uspace/drv/fb/amdm37x_dispc/Makefile =================================================================== --- uspace/drv/fb/amdm37x_dispc/Makefile (revision 079cacfe8159c7bf8972a35f592c9d1025a2b61d) +++ uspace/drv/fb/amdm37x_dispc/Makefile (revision d57ff6f520f5fa8e682cc81a29d9ea9b01dee527) @@ -30,11 +30,20 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBGRAPH_PREFIX)/libgraph.a $(LIBSOFTREND_PREFIX)/libsoftrend.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBGRAPH_PREFIX) -I$(LIBSOFTREND_PREFIX) -BINARY = kfb + +LIBS = \ + $(LIBDRV_PREFIX)/libdrv.a \ + $(LIBGRAPH_PREFIX)/libgraph.a \ + $(LIBSOFTREND_PREFIX)/libsoftrend.a + +EXTRA_CFLAGS += \ + -I$(LIBDRV_PREFIX)/include \ + -I$(LIBGRAPH_PREFIX) \ + -I$(LIBSOFTREND_PREFIX) + +BINARY = amdm37x_dispc SOURCES = \ port.c \ - kfb.c + main.c include $(USPACE_PREFIX)/Makefile.common Index: pace/drv/fb/amdm37x_dispc/kfb.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/kfb.c (revision 079cacfe8159c7bf8972a35f592c9d1025a2b61d) +++ (revision ) @@ -1,85 +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 kfb - * @{ - */ -/** - * @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include "port.h" -#include "kfb.h" - -static int kgraph_dev_add(ddf_dev_t *dev) -{ - port_init(dev); - printf("%s: Accepting connections\n", NAME); - return EOK; -} - -static driver_ops_t kgraph_driver_ops = { - .dev_add = kgraph_dev_add, -}; - -static driver_t kgraph_driver = { - .name = NAME, - .driver_ops = &kgraph_driver_ops -}; - -static graph_dev_ops_t graph_vsl_dev_ops = { - .connect = (connect_func) &graph_visualizer_connection -}; - -ddf_dev_ops_t graph_vsl_device_ops = { - .interfaces[GRAPH_DEV_IFACE] = &graph_vsl_dev_ops -}; - -static graph_dev_ops_t graph_rnd_dev_ops = { - .connect = (connect_func) &graph_renderer_connection -}; - -ddf_dev_ops_t graph_rnd_device_ops = { - .interfaces[GRAPH_DEV_IFACE] = &graph_rnd_dev_ops -}; - -int main(int argc, char *argv[]) -{ - printf("%s: HelenOS kernel framebuffer driver\n", NAME); - return ddf_driver_main(&kgraph_driver); -} - -/** @} - */ Index: pace/drv/fb/amdm37x_dispc/kfb.h =================================================================== --- uspace/drv/fb/amdm37x_dispc/kfb.h (revision 079cacfe8159c7bf8972a35f592c9d1025a2b61d) +++ (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 kfb - * @{ - */ -/** - * @file - */ - -#ifndef KFB_KFB_H_ -#define KFB_KFB_H_ - -#include - -#define NAME "kfb" - -extern ddf_dev_ops_t graph_vsl_device_ops; -extern ddf_dev_ops_t graph_rnd_device_ops; - -#endif - -/** @} - */ Index: uspace/drv/fb/amdm37x_dispc/main.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/main.c (revision d57ff6f520f5fa8e682cc81a29d9ea9b01dee527) +++ uspace/drv/fb/amdm37x_dispc/main.c (revision d57ff6f520f5fa8e682cc81a29d9ea9b01dee527) @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2013 Jan Vesely + * 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 kfb + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include "port.h" + +#define NAME "amdm37x_dispc" + +static int kgraph_dev_add(ddf_dev_t *dev) +{ + port_init(dev); + printf("%s: Accepting connections\n", NAME); + return EOK; +} + +static driver_ops_t kgraph_driver_ops = { + .dev_add = kgraph_dev_add, +}; + +static driver_t kgraph_driver = { + .name = NAME, + .driver_ops = &kgraph_driver_ops +}; + +int main(int argc, char *argv[]) +{ + printf("%s: HelenOS kernel framebuffer driver\n", NAME); + return ddf_driver_main(&kgraph_driver); +} + +/** @} + */ Index: uspace/drv/fb/amdm37x_dispc/port.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/port.c (revision 079cacfe8159c7bf8972a35f592c9d1025a2b61d) +++ uspace/drv/fb/amdm37x_dispc/port.c (revision d57ff6f520f5fa8e682cc81a29d9ea9b01dee527) @@ -55,9 +55,9 @@ #include +#include #include #include -#include "kfb.h" #include "port.h" @@ -79,4 +79,12 @@ uint8_t *addr; } kfb_t; + +static graph_dev_ops_t graph_vsl_dev_ops = { + .connect = (connect_func) &graph_visualizer_connection +}; + +static ddf_dev_ops_t graph_vsl_device_ops = { + .interfaces[GRAPH_DEV_IFACE] = &graph_vsl_dev_ops +}; static kfb_t kfb;