Index: uspace/console/console.c =================================================================== --- uspace/console/console.c (revision fadd3817f5f589ea27d771621b7531c4ede1293c) +++ uspace/console/console.c (revision 2def78824559e9a326693314a605af8e1e7e690a) @@ -48,5 +48,5 @@ #include #include -#include +#include #include "gcons.h" Index: uspace/console/gcons.c =================================================================== --- uspace/console/gcons.c (revision fadd3817f5f589ea27d771621b7531c4ede1293c) +++ uspace/console/gcons.c (revision 2def78824559e9a326693314a605af8e1e7e690a) @@ -37,5 +37,5 @@ #include #include -#include +#include #include #include Index: uspace/libc/Makefile =================================================================== --- uspace/libc/Makefile (revision fadd3817f5f589ea27d771621b7531c4ede1293c) +++ uspace/libc/Makefile (revision 2def78824559e9a326693314a605af8e1e7e690a) @@ -73,5 +73,5 @@ generic/err.c \ generic/stdlib.c \ - generic/mmap.c + generic/mman.c ARCH_SOURCES += \ Index: uspace/libc/generic/mman.c =================================================================== --- uspace/libc/generic/mman.c (revision 2def78824559e9a326693314a605af8e1e7e690a) +++ uspace/libc/generic/mman.c (revision 2def78824559e9a326693314a605af8e1e7e690a) @@ -0,0 +1,58 @@ +/* + * 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 + +void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) +{ + if (!start) + start = as_get_mappable_page(length); + +// 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/libc/generic/mmap.c =================================================================== --- uspace/libc/generic/mmap.c (revision fadd3817f5f589ea27d771621b7531c4ede1293c) +++ (revision ) @@ -1,58 +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 - -void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) -{ - if (!start) - start = as_get_mappable_page(length); - -// 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/libc/include/sys/mman.h =================================================================== --- uspace/libc/include/sys/mman.h (revision 2def78824559e9a326693314a605af8e1e7e690a) +++ uspace/libc/include/sys/mman.h (revision 2def78824559e9a326693314a605af8e1e7e690a) @@ -0,0 +1,58 @@ +/* + * 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 + +#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 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, + off_t offset); +extern int munmap(void *start, size_t length); + +#endif + +/** @} + */ Index: uspace/libc/include/sys/mmap.h =================================================================== --- uspace/libc/include/sys/mmap.h (revision fadd3817f5f589ea27d771621b7531c4ede1293c) +++ (revision ) @@ -1,58 +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_MMAP_H_ -#define LIBC_MMAP_H_ - -#include - -#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 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, - off_t offset); -extern int munmap(void *start, size_t length); - -#endif - -/** @} - */ Index: uspace/libc/malloc/malloc.c =================================================================== --- uspace/libc/malloc/malloc.c (revision fadd3817f5f589ea27d771621b7531c4ede1293c) +++ uspace/libc/malloc/malloc.c (revision 2def78824559e9a326693314a605af8e1e7e690a) @@ -566,5 +566,5 @@ #if HAVE_MMAP #ifndef LACKS_SYS_MMAN_H -#include /* for mmap */ +#include /* for mmap */ #endif /* LACKS_SYS_MMAN_H */ #ifndef LACKS_FCNTL_H