Changeset 25eec4e in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 mainline chages.

File:

• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h (moved) (moved from uspace/lib/ext2/libext2.h ) (3 diffs)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libext2
+/** @addtogroup kgraph
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef LIBEXT2_LIBEXT2_H_
-#define LIBEXT2_LIBEXT2_H_
+#ifndef AMDM37X_DISPC_H_
+#define AMDM37X_DISPC_H_
 
-#include "libext2_superblock.h"
-#include "libext2_block_group.h"
-#include "libext2_inode.h"
-#include "libext2_filesystem.h"
-#include "libext2_directory.h"
+#include <graph.h>
+#include <abi/fb/visuals.h>
+#include <pixconv.h>
+
+#include "amdm37x_dispc_regs.h"
+
+typedef struct {
+        amdm37x_dispc_regs_t *regs;
+
+        struct {
+                pixel2visual_t pixel2visual;
+                unsigned width;
+                unsigned height;
+                unsigned pitch;
+                unsigned bpp;
+                unsigned idx;
+        } active_fb;
+
+        size_t size;
+        void *fb_data;
+
+        vslmode_list_element_t modes[1];
+} amdm37x_dispc_t;
+
+int amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis);
+int amdm37x_dispc_fini(amdm37x_dispc_t *instance);
 
 #endif
-
 /** @}
  */