Changeset b0f00a9 in mainline for uspace/srv/fs/ext2fs/ext2fs.h

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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.

File:

• uspace/srv/fs/ext2fs/ext2fs.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_port.h ) (3 diffs)

uspace/srv/fs/ext2fs/ext2fs.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief       HelenOS generic uspace keyboard handler.
- * @ingroup  kbd
+/** @addtogroup fs
  * @{
  */ 
-/** @file
- */
 
-#ifndef KBD_PORT_H_
-#define KBD_PORT_H_
+#ifndef EXT2FS_EXT2FS_H_
+#define EXT2FS_EXT2FS_H_
 
+#include <libext2.h>
+#include <libfs.h>
 #include <sys/types.h>
 
-extern int kbd_port_init(void);
-extern void kbd_port_yield(void);
-extern void kbd_port_reclaim(void);
-extern void kbd_port_write(uint8_t);
+#define min(a, b)               ((a) < (b) ? (a) : (b))
+
+extern vfs_out_ops_t ext2fs_ops;
+extern libfs_ops_t ext2fs_libfs_ops;
+
+extern int ext2fs_global_init(void);
+extern int ext2fs_global_fini(void);
 
 #endif
@@ -49 +50 @@
 /**
  * @}
- */ 
-
+ */