Changeset 8e7c9fe in mainline for uspace/lib/posix/source/sys/mman.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/posix/source/sys/mman.c (moved) (moved from uspace/lib/c/generic/mman.c ) (3 diffs)

uspace/lib/posix/source/sys/mman.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libposix
  * @{
  */
@@ -33 +33 @@
  */
 
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <as.h>
-#include <unistd.h>
+#define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
-void *mmap(void *start, size_t length, int prot, int flags, int fd,
-    aoff64_t offset)
+#include "../internal/common.h"
+#include <posix/sys/mman.h>
+#include <posix/sys/types.h>
+#include <libc/as.h>
+#include <posix/unistd.h>
+
+void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
+    __POSIX_DEF__(off_t) offset)
 {
         if (!start)
@@ -53 +57 @@
 }
 
-int munmap(void *start, size_t length)
+int posix_munmap(void *start, size_t length)
 {
         return as_area_destroy(start);