Changeset 6843a9c in mainline for uspace/lib/c/include/vfs/vfs_mtab.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/include/vfs/vfs_mtab.h (moved) (moved from uspace/lib/c/include/ipc/tl.h ) (2 diffs)

uspace/lib/c/include/vfs/vfs_mtab.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Maurizio Lombardi
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-
 /** @file
- * Transport layer modules messages.
- * @see tl_interface.h
  */
 
-#ifndef LIBC_TL_MESSAGES_H_
-#define LIBC_TL_MESSAGES_H_
+#ifndef LIBC_VFS_MTAB_H_
+#define LIBC_VFS_MTAB_H_
 
-#include <ipc/net.h>
+#include <sys/types.h>
+#include <ipc/vfs.h>
+#include <adt/list.h>
 
-/** Transport layer modules messages. */
-typedef enum {
-        /** Packet received message.
-         * @see tl_received_msg()
-         */
-        NET_TL_RECEIVED = NET_TL_FIRST
-} tl_messages;
+typedef struct mtab_ent {
+        link_t link;
+        char mp[MAX_PATH_LEN];
+        char opts[MAX_MNTOPTS_LEN];
+        char fs_name[FS_NAME_MAXLEN];
+        unsigned int instance;
+        service_id_t service_id;
+} mtab_ent_t;
 
 #endif