Changeset 03362fbd in mainline for uspace/srv/fs/ext4fs/ext4fs.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/srv/fs/ext4fs/ext4fs.h (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.h ) (2 diffs)

uspace/srv/fs/ext4fs/ext4fs.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2012 Frantisek Princ
  * All rights reserved.
  *
@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
-#ifndef EXT2FS_EXT2FS_H_
-#define EXT2FS_EXT2FS_H_
+#ifndef EXT4FS_EXT4FS_H_
+#define EXT4FS_EXT4FS_H_
 
-#include <libext2.h>
 #include <libfs.h>
-#include <sys/types.h>
 
-#define min(a, b)               ((a) < (b) ? (a) : (b))
+extern vfs_out_ops_t ext4fs_ops;
+extern libfs_ops_t ext4fs_libfs_ops;
 
-extern vfs_out_ops_t ext2fs_ops;
-extern libfs_ops_t ext2fs_libfs_ops;
+extern int ext4fs_global_init(void);
+extern int ext4fs_global_fini(void);
 
-extern int ext2fs_global_init(void);
-extern int ext2fs_global_fini(void);
 
 #endif