Index: fb/fb.c =================================================================== --- fb/fb.c (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ fb/fb.c (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -71,5 +71,5 @@ struct { - __u8 *fbaddress ; + uint8_t *fbaddress ; unsigned int xres ; @@ -95,5 +95,5 @@ int cursor_shown; /* Double buffering */ - __u8 *dbdata; + uint8_t *dbdata; unsigned int dboffset; unsigned int paused; @@ -121,5 +121,5 @@ unsigned int width; unsigned int height; - __u8 *data; + uint8_t *data; } pixmap_t; static pixmap_t pixmaps[MAX_PIXMAPS]; @@ -154,5 +154,5 @@ static void rgb_3byte(void *dst, int rgb) { - __u8 *scr = dst; + uint8_t *scr = dst; #if (defined(BIG_ENDIAN) || defined(FB_BIG_ENDIAN)) scr[0] = RED(rgb, 8); @@ -170,5 +170,5 @@ static int byte3_rgb(void *src) { - __u8 *scr = src; + uint8_t *scr = src; #if (defined(BIG_ENDIAN) || defined(FB_BIG_ENDIAN)) return scr[0] << 16 | scr[1] << 8 | scr[2]; @@ -182,5 +182,5 @@ { /* 5-bit, 6-bits, 5-bits */ - *((__u16 *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5); + *((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5); } @@ -188,5 +188,5 @@ static int byte2_rgb(void *src) { - int color = *(__u16 *)(src); + int color = *(uint16_t *)(src); return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3); } @@ -195,5 +195,5 @@ static void rgb_1byte(void *dst, int rgb) { - *(__u8 *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3); + *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3); } @@ -201,5 +201,5 @@ static int byte1_rgb(void *src) { - int color = *(__u8 *)src; + int color = *(uint8_t *)src; return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5); } @@ -377,5 +377,5 @@ * @param transparent If false, print background color */ -static void draw_glyph(viewport_t *vport,__u8 glyph, unsigned int sx, unsigned int sy, +static void draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy, style_t style, int transparent) { Index: libc/arch/amd64/include/config.h =================================================================== --- libc/arch/amd64/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) +++ libc/arch/amd64/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * 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 libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_CONFIG_H_ +#define LIBC_amd64_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: libc/arch/amd64/include/limits.h =================================================================== --- libc/arch/amd64/include/limits.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/amd64/include/limits.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcamd64 +/** @addtogroup libcamd64 * @{ */ @@ -43,9 +43,4 @@ #endif - - - - /** @} +/** @} */ - - Index: libc/arch/amd64/include/types.h =================================================================== --- libc/arch/amd64/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/amd64/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcamd64 +/** @addtogroup libcamd64 * @{ */ @@ -41,5 +41,5 @@ typedef ssize_t off_t; -typedef char int8_t; +typedef signed char int8_t; typedef short int int16_t; typedef int int32_t; @@ -51,9 +51,8 @@ typedef unsigned long long int uint64_t; +typedef uint64_t uintptr_t; + #endif - - /** @} +/** @} */ - - Index: libc/arch/ia32/include/config.h =================================================================== --- libc/arch/ia32/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) +++ libc/arch/ia32/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_CONFIG_H_ +#define LIBC_ia32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: libc/arch/ia32/include/types.h =================================================================== --- libc/arch/ia32/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/ia32/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcia32 +/** @addtogroup libcia32 * @{ */ @@ -51,9 +51,8 @@ typedef unsigned long long int uint64_t; +typedef uint32_t uintptr_t; + #endif - - /** @} +/** @} */ - - Index: libc/arch/ia64/include/config.h =================================================================== --- libc/arch/ia64/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) +++ libc/arch/ia64/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_CONFIG_H_ +#define LIBC_ia64_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1< + +/** + * + * Calculate absolute address of function + * referenced by fptr pointer. + * + * @param f Function pointer. + * + */ +#define FADDR(f) (*((uintptr_t *)(f))); + +#endif + +/** @} + */ Index: libc/arch/ia64/include/psthread.h =================================================================== --- libc/arch/ia64/include/psthread.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/ia64/include/psthread.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcia64 +/** @addtogroup libcia64 * @{ */ @@ -33,11 +33,11 @@ */ -#ifndef __LIBC__ia64PSTHREAD_H__ -#define __LIBC__ia64PSTHREAD_H__ +#ifndef LIBC_ia64_PSTHREAD_H_ +#define LIBC_ia64_PSTHREAD_H_ #include #include #include -#include +#include /* Index: libc/arch/ia64/include/types.h =================================================================== --- libc/arch/ia64/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/ia64/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcia64 +/** @addtogroup libcia64 * @{ */ @@ -33,6 +33,6 @@ */ -#ifndef __LIBC__TYPES_H__ -#define __LIBC__TYPES_H__ +#ifndef LIBC_ia64_TYPES_H_ +#define LIBC_ia64_TYPES_H_ typedef unsigned long long sysarg_t; @@ -51,7 +51,18 @@ typedef unsigned long int uint64_t; +typedef uint64_t uintptr_t; + +typedef unsigned char __r8; /* Reserve byte */ +typedef unsigned short __r16; +typedef unsigned int __r32; +typedef unsigned long __r64; + +typedef struct __r128{ + __r64 lo; + __r64 hi; +} __r128; + #endif - /** @} +/** @} */ - Index: libc/arch/mips32/include/config.h =================================================================== --- libc/arch/mips32/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) +++ libc/arch/mips32/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * 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 libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32_CONFIG_H_ +#define LIBC_mips32_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1< + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: libc/arch/mips32/include/types.h =================================================================== --- libc/arch/mips32/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/mips32/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,13 +27,13 @@ */ - /** @addtogroup libcmips32 +/** @addtogroup libcmips32 * @{ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32eb */ -#ifndef __LIBC__TYPES_H__ -#define __LIBC__TYPES_H__ +#ifndef LIBC_mips32_TYPES_H_ +#define LIBC_mips32_TYPES_H_ typedef unsigned int sysarg_t; @@ -52,7 +52,8 @@ typedef unsigned long long int uint64_t; +typedef uint32_t uintptr_t; + #endif - /** @} +/** @} */ - Index: libc/arch/ppc32/include/config.h =================================================================== --- libc/arch/ppc32/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) +++ libc/arch/ppc32/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * 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 libppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_CONFIG_H_ +#define LIBC_ppc32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: libc/arch/ppc32/include/types.h =================================================================== --- libc/arch/ppc32/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/ppc32/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcppc32 +/** @addtogroup libcppc32 * @{ */ @@ -33,6 +33,6 @@ */ -#ifndef __LIBC__TYPES_H__ -#define __LIBC__TYPES_H__ +#ifndef LIBC_ppc32_TYPES_H_ +#define LIBC_ppc32_TYPES_H_ typedef unsigned int sysarg_t; @@ -51,7 +51,9 @@ typedef unsigned long long int uint64_t; +typedef uint32_t uintptr_t; + #endif - /** @} +/** @} */ Index: libc/arch/ppc64/include/config.h =================================================================== --- libc/arch/ppc64/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) +++ libc/arch/ppc64/include/config.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * 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 libppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_CONFIG_H_ +#define LIBC_ppc64_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: libc/arch/ppc64/include/types.h =================================================================== --- libc/arch/ppc64/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/arch/ppc64/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcppc64 +/** @addtogroup libcppc64 * @{ */ @@ -33,6 +33,6 @@ */ -#ifndef __LIBC__TYPES_H__ -#define __LIBC__TYPES_H__ +#ifndef LIBC_ppc64_TYPES_H_ +#define LIBC_ppc64_TYPES_H_ typedef unsigned long sysarg_t; @@ -51,7 +51,8 @@ typedef unsigned long int uint64_t; +typedef uint64_t uintptr_t; + #endif - /** @} +/** @} */ - Index: libc/generic/psthread.c =================================================================== --- libc/generic/psthread.c (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/generic/psthread.c (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include Index: libc/generic/thread.c =================================================================== --- libc/generic/thread.c (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/generic/thread.c (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libc +/** @addtogroup libc * @{ */ @@ -36,5 +36,5 @@ #include #include -#include +#include #include #include @@ -153,7 +153,5 @@ } - - - /** @} +/** @} */ Index: libc/include/ipc/fb.h =================================================================== --- libc/include/ipc/fb.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/include/ipc/fb.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libcipc +/** @addtogroup libcipc * @{ */ @@ -33,9 +33,6 @@ */ -#include -#include - -#ifndef __libc__FB_H__ -#define __libc__FB_H__ +#ifndef LIBC_FB_H_ +#define LIBC_FB_H_ #define FB_PUTCHAR 1025 @@ -75,7 +72,4 @@ #endif - - /** @} +/** @} */ - - Index: libc/include/types.h =================================================================== --- libc/include/types.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/include/types.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -1,7 +1,1 @@ #include - - - /** @} - */ - - Index: libc/include/unistd.h =================================================================== --- libc/include/unistd.h (revision 09087d23b91c8b197f3dea51ee0b4dd0a6b2a18b) +++ libc/include/unistd.h (revision afbe96acc3c6b0f29c73364cf7db27aef518f67d) @@ -27,5 +27,5 @@ */ - /** @addtogroup libc +/** @addtogroup libc * @{ */ @@ -37,5 +37,5 @@ #include -#include +#include #define NULL 0 @@ -50,6 +50,5 @@ #endif - - /** @} +/** @} */