Changeset ee24574 in mainline for uspace/lib/imgmap/imgmap.h

Timestamp:

2011-08-18T08:00:42Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

a92cf94f

Parents:

0f963cb (diff), c53a705 (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 libposix changes.

File:

• uspace/lib/imgmap/imgmap.h (moved) (moved from uspace/lib/c/include/typedefs.h ) (2 diffs)

uspace/lib/imgmap/imgmap.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup imgmap
  * @{
  */
-/** @file
- *
- * This header allows including a kernel header using typedefs.h from
- * libc. User-space code should use sys/types.h directly.
+/**
+ * @file
  */
 
-#ifndef LIBC_TYPEDEFS_H_
-#define LIBC_TYPEDEFS_H_
+#ifndef IMGMAP_IMGMAP_H_
+#define IMGMAP_IMGMAP_H_
 
 #include <sys/types.h>
+#include <abi/fb/visuals.h>
+
+typedef struct {
+        size_t size;
+        sysarg_t width;
+        sysarg_t height;
+        visual_t visual;
+        uint8_t data[];
+} imgmap_t;
+
+extern imgmap_t *imgmap_decode_tga(void *, size_t);
 
 #endif