Changeset 46c20c8 in mainline for uspace/lib/c/include/sys

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

Location:

uspace/lib/c/include/sys

Files:

• mman.h (moved) (moved from uspace/lib/libc/include/sys/mman.h ) (2 diffs)
• stat.h (moved) (moved from uspace/lib/libc/include/sys/stat.h ) (2 diffs)
• time.h (moved) (moved from uspace/lib/libc/include/sys/time.h ) (2 diffs)
• typefmt.h (added)
• types.h (moved) (moved from uspace/lib/libc/include/sys/types.h ) (1 diff)

uspace/lib/c/include/sys/mman.h

@@ -41 +41 @@
 #define MAP_FAILED  ((void *) -1)
 
-#define MAP_SHARED       (1 << 0)
-#define MAP_PRIVATE      (1 << 1)
-#define MAP_FIXED        (1 << 2)
-#define MAP_ANONYMOUS    (1 << 3)
+#define MAP_SHARED     (1 << 0)
+#define MAP_PRIVATE    (1 << 1)
+#define MAP_FIXED      (1 << 2)
+#define MAP_ANONYMOUS  (1 << 3)
 
 #define PROTO_READ   AS_AREA_READ
@@ -50 +50 @@
 #define PROTO_EXEC   AS_AREA_EXEC
 
-extern void *mmap(void  *start, size_t length, int prot, int flags, int fd,
-    off_t offset);
+extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
+    aoff64_t offset);
 extern int munmap(void *start, size_t length);
 

uspace/lib/c/include/sys/stat.h

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #ifndef LIBC_SYS_STAT_H_
@@ -43 +43 @@
 struct stat {
         fs_handle_t fs_handle;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         fs_index_t index;
         unsigned int lnkcnt;
         bool is_file;
         bool is_directory;
-        off_t size;
-        dev_handle_t device;
+        aoff64_t size;
+        devmap_handle_t device;
 };
 

uspace/lib/c/include/sys/time.h

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #ifndef LIBC_SYS_TIME_H_
@@ -43 +43 @@
 typedef long suseconds_t;
 
+typedef uint32_t useconds_t;
+typedef uint32_t mseconds_t;
+
 struct timeval {
-        time_t         tv_sec;        /* seconds */
-        suseconds_t    tv_usec;  /* microseconds */
+        time_t tv_sec;        /* seconds */
+        suseconds_t tv_usec;  /* microseconds */
 };
 
 struct timezone {
-        int  tz_minuteswest; /* minutes W of Greenwich */
-        int  tz_dsttime;     /* type of dst correction */
+        int tz_minuteswest;  /* minutes W of Greenwich */
+        int tz_dsttime;      /* type of dst correction */
 };
 

uspace/lib/c/include/sys/types.h

@@ -38 +38 @@
 #include <libarch/types.h>
 
-typedef long off_t;
-typedef int mode_t;
-typedef uint64_t bn_t;  /**< Block number type. */
+typedef unsigned int mode_t;
 
-typedef int32_t wchar_t;
+/** Relative offset */
+typedef int64_t off64_t;
+
+/** Absolute offset */
+typedef uint64_t aoff64_t;
 
 typedef volatile uint8_t ioport8_t;