Index: uspace/lib/block/block.c =================================================================== --- uspace/lib/block/block.c (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ uspace/lib/block/block.c (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) @@ -40,5 +40,4 @@ #include #include -#include #include #include Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ uspace/lib/c/Makefile (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) @@ -131,5 +131,4 @@ generic/time.c \ generic/stdlib.c \ - generic/mman.c \ generic/udebug.c \ generic/vfs/vfs.c \ Index: uspace/lib/c/generic/mman.c =================================================================== --- uspace/lib/c/generic/mman.c (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ (revision ) @@ -1,61 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#include -#include -#include -#include - -void *mmap(void *start, size_t length, int prot, int flags, int fd, - aoff64_t offset) -{ - if (!start) - start = AS_AREA_ANY; - -// if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE))) -// return MAP_FAILED; - - if (!(flags & MAP_ANONYMOUS)) - return MAP_FAILED; - - return as_area_create(start, length, prot); -} - -int munmap(void *start, size_t length) -{ - return as_area_destroy(start); -} - -/** @} - */ Index: uspace/lib/c/include/sys/mman.h =================================================================== --- uspace/lib/c/include/sys/mman.h (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_MMAN_H_ -#define LIBC_MMAN_H_ - -#include -#include - -#define MAP_FAILED AS_MAP_FAILED - -#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 -#define PROTO_WRITE AS_AREA_WRITE -#define PROTO_EXEC AS_AREA_EXEC - -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); - -#endif - -/** @} - */ Index: uspace/lib/drv/generic/remote_audio_pcm.c =================================================================== --- uspace/lib/drv/generic/remote_audio_pcm.c (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ uspace/lib/drv/generic/remote_audio_pcm.c (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) @@ -38,5 +38,5 @@ #include #include -#include +#include #include "audio_pcm_iface.h" Index: uspace/lib/posix/Makefile =================================================================== --- uspace/lib/posix/Makefile (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ uspace/lib/posix/Makefile (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) @@ -73,4 +73,5 @@ source/string.c \ source/strings.c \ + source/sys/mman.c \ source/sys/stat.c \ source/sys/wait.c \ Index: uspace/lib/posix/include/posix/sys/mman.h =================================================================== --- uspace/lib/posix/include/posix/sys/mman.h (revision 5828554423254c2cf4c4eb9a849b1d5d9ffd413d) +++ uspace/lib/posix/include/posix/sys/mman.h (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) @@ -40,5 +40,5 @@ #endif -#include "sys/types.h" +#include "types.h" #include @@ -60,7 +60,8 @@ #define PROT_EXEC AS_AREA_EXEC -extern void *mmap(void *start, size_t length, int prot, int flags, int fd, +extern void * +__POSIX_DEF__(mmap)(void *start, size_t length, int prot, int flags, int fd, __POSIX_DEF__(off_t) offset); -extern int munmap(void *start, size_t length); +extern int __POSIX_DEF__(munmap)(void *start, size_t length); Index: uspace/lib/posix/source/sys/mman.c =================================================================== --- uspace/lib/posix/source/sys/mman.c (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) +++ uspace/lib/posix/source/sys/mman.c (revision 83b6ba9f08438ec84b9026da1651c0ffa1d7c35f) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libposix + * @{ + */ +/** @file + */ + +#define LIBPOSIX_INTERNAL +#define __POSIX_DEF__(x) posix_##x + +#include "../internal/common.h" +#include +#include +#include +#include + +void *posix_mmap(void *start, size_t length, int prot, int flags, int fd, + __POSIX_DEF__(off_t) offset) +{ + if (!start) + start = AS_AREA_ANY; + +// if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE))) +// return MAP_FAILED; + + if (!(flags & MAP_ANONYMOUS)) + return MAP_FAILED; + + return as_area_create(start, length, prot); +} + +int posix_munmap(void *start, size_t length) +{ + return as_area_destroy(start); +} + +/** @} + */