Changeset 03362fbd in mainline for uspace/drv/fb/kfb/kfb.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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 changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/drv/fb/kfb/kfb.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libext2
+/** @addtogroup kfb
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef LIBEXT2_LIBEXT2_H_
-#define LIBEXT2_LIBEXT2_H_
+#ifndef KFB_KFB_H_
+#define KFB_KFB_H_
 
-#include "libext2_superblock.h"
-#include "libext2_block_group.h"
-#include "libext2_inode.h"
-#include "libext2_filesystem.h"
-#include "libext2_directory.h"
+#include <ddf/driver.h>
+
+#define NAME  "kfb"
+
+extern ddf_dev_ops_t graph_vsl_device_ops;
+extern ddf_dev_ops_t graph_rnd_device_ops;
 
 #endif