Changeset 75732da in mainline for uspace/lib/c/include

Timestamp:

2010-12-13T07:20:20Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

309dea52

Parents:

84439d7 (diff), 37f7cfe (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 development/ changes

Location:

uspace/lib/c/include

Files:

• adt/generic_field.h (modified) (2 diffs)
• errno.h (modified) (1 diff)
• ipc/dev_iface.h (modified) (1 diff)
• ipc/vfs.h (modified) (2 diffs)

uspace/lib/c/include/adt/generic_field.h

@@ -91 +91 @@
                         } \
                         field->items[field->next] = value; \
-                        ++field->next; \
+                        field->next++; \
                         field->items[field->next] = NULL; \
                         return field->next - 1; \
@@ -108 +108 @@
                         int index; \
                         field->magic = 0; \
-                        for (index = 0; index < field->next; ++ index) { \
+                        for (index = 0; index < field->next; index++) { \
                                 if (field->items[index]) \
                                         free(field->items[index]); \

uspace/lib/c/include/errno.h

@@ -83 +83 @@
 #define ENOTCONN        (-10057)
 
-/** The requested operation was not performed.
- *  Try again later.
- */
-#define TRY_AGAIN       (-11002)
+/** The requested operation was not performed. Try again later. */
+#define EAGAIN          (-11002)
 
 /** No data.

uspace/lib/c/include/ipc/dev_iface.h

@@ -54 +54 @@
         DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX)
 
+/*
+ * The first argument is actually method (as the "real" method is used
+ * for indexing into interfaces.
+ */
+
+#define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call))
+#define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call))
+#define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call))
+#define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call))
+
 
 #endif

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

@@ -36 +36 @@
 #define LIBC_IPC_VFS_H_
 
+#include <ipc/ipc.h>
 #include <sys/types.h>
-#include <ipc/ipc.h>
+#include <bool.h>
 
 #define FS_NAME_MAXLEN  20
@@ -55 +56 @@
         /** Unique identifier of the fs. */
         char name[FS_NAME_MAXLEN + 1];
+        bool concurrent_read_write;
+        bool write_retains_size;
 } vfs_info_t;