Changeset d57ff6f in mainline

Timestamp:

2013-01-20T20:02:01Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4e3bfab

Parents:

079cacf

Message:

amdm37x_dispc: Begin conversion, remove unused header.

Location:

uspace/drv/fb/amdm37x_dispc

Files:

• Makefile (modified) (1 diff)
• kfb.h (deleted)
• main.c (moved) (moved from uspace/drv/fb/amdm37x_dispc/kfb.c ) (3 diffs)
• port.c (modified) (2 diffs)

uspace/drv/fb/amdm37x_dispc/Makefile

@@ -30 +30 @@
 
 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

uspace/drv/fb/amdm37x_dispc/main.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2013 Jan Vesely
  * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
@@ -40 +41 @@
 #include <task.h>
 #include <graph.h>
-#include <ops/graph_dev.h>
 #include "port.h"
-#include "kfb.h"
+
+#define NAME  "amdm37x_dispc"
 
 static int kgraph_dev_add(ddf_dev_t *dev)
@@ -60 +61 @@
 };
 
-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[])
 {

uspace/drv/fb/amdm37x_dispc/port.c

@@ -55 +55 @@
 #include <io/chargrid.h>
 
+#include <ops/graph_dev.h>
 #include <pixconv.h>
 
 #include <graph.h>
 
-#include "kfb.h"
 #include "port.h"
 
@@ -79 +79 @@
         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;