WebSVN – HelenOS-historic – Path Comparison – / – /uspace/trunk/libc/ Rev 1781 and /uspace/trunk/libc Rev 1751

Ignore whitespace Rev 1781 → Rev 1751

 /uspace/trunk/libc/generic/psthread.c
 ,7 → 38,7
 #include <unistd.h>
 #include <thread.h>
 #include <stdio.h>
-#include <libarch/faddr.h>
+#include <kernel/arch/faddr.h>
 #include <futex.h>
 #include <assert.h>
 #include <async.h>

 /uspace/trunk/libc/generic/thread.c
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libc
+ /** @addtogroup libc
  * @{
  */
 /** @file
 ,7 → 35,7
 #include <thread.h>
 #include <libc.h>
 #include <stdlib.h>
-#include <libarch/faddr.h>
+#include <arch/faddr.h>
 #include <kernel/proc/uarg.h>
 #include <psthread.h>
 #include <string.h>
 ,7 → 152,9
     __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status);
 }
-/** @}
+ /** @}
  */

 /uspace/trunk/libc/include/ipc/fb.h
 ,15 → 26,18
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcipc
+ /** @addtogroup libcipc
  * @{
  */
 /** @file
  */
-#ifndef LIBC_FB_H_
-#define LIBC_FB_H_
+#include <arch/types.h>
+#include <types.h>
+#ifndef __libc__FB_H__
+#define __libc__FB_H__
 #define FB_PUTCHAR           1025
 #define FB_CLEAR             1026
 #define FB_GET_CSIZE         1027
 ,5 → 74,8
 #endif
-/** @}
+ /** @}
  */

/uspace/trunk/libc/include/types.h
1,0 → 0,0
#include <libarch/types.h>


/** @}
*/

 /uspace/trunk/libc/include/unistd.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libc
+ /** @addtogroup libc
  * @{
  */
 /** @file
 ,7 → 36,7
 #define __LIBC__UNISTD_H__
 #include <types.h>
-#include <libarch/config.h>
+#include <arch/mm/page.h>
 #define NULL 0
 #define getpagesize()     (PAGE_SIZE)
 ,7 → 49,8
 #endif
-/** @}
+ /** @}
  */

/uspace/trunk/libc/arch/ia32/include/faddr.h
File deleted

/uspace/trunk/libc/arch/ia32/include/config.h
File deleted

 /uspace/trunk/libc/arch/ia32/include/types.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcia32
+ /** @addtogroup libcia32
  * @{
  */
 /** @file
 ,9 → 50,10
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef uint32_t uintptr_t;
 #endif
-/** @}
+ /** @}
  */

/uspace/trunk/libc/arch/amd64/include/faddr.h
File deleted

/uspace/trunk/libc/arch/amd64/include/config.h
File deleted

 /uspace/trunk/libc/arch/amd64/include/context_offset.h
 ,5 → 8,9
 #define OFFSET_R14 0x30
 #define OFFSET_R15 0x38
 #define OFFSET_TLS 0x40
+ /** @}
+ */

 /uspace/trunk/libc/arch/amd64/include/limits.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcamd64
+ /** @addtogroup libcamd64
  * @{
  */
 /** @file
 ,5 → 42,10
 #endif
-/** @}
+ /** @}
  */

 /uspace/trunk/libc/arch/amd64/include/types.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcamd64
+ /** @addtogroup libcamd64
  * @{
  */
 /** @file
 ,7 → 40,7
 typedef signed long ssize_t;
 typedef ssize_t off_t;
-typedef signed char int8_t;
+typedef char int8_t;
 typedef short int int16_t;
 typedef int int32_t;
 typedef long long int int64_t;
 ,9 → 50,10
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef uint64_t uintptr_t;
 #endif
-/** @}
+ /** @}
  */

/uspace/trunk/libc/arch/ia64/include/faddr.h
File deleted

/uspace/trunk/libc/arch/ia64/include/config.h
File deleted

 /uspace/trunk/libc/arch/ia64/include/psthread.h
 ,19 → 26,19
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcia64
+ /** @addtogroup libcia64
  * @{
  */
 /** @file
  */
-#ifndef LIBC_ia64_PSTHREAD_H_
-#define LIBC_ia64_PSTHREAD_H_
+#ifndef __LIBC__ia64PSTHREAD_H__
+#define __LIBC__ia64PSTHREAD_H__
 #include <types.h>
 #include <align.h>
 #include <libarch/stack.h>
-#include <libarch/types.h>
+#include <arch/types.h>
 /*
  * context_save() and context_restore() are both leaf procedures.

 /uspace/trunk/libc/arch/ia64/include/types.h
 ,14 → 26,14
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcia64
+ /** @addtogroup libcia64
  * @{
  */
 /** @file
  */
-#ifndef LIBC_ia64_TYPES_H_
-#define LIBC_ia64_TYPES_H_
+#ifndef __LIBC__TYPES_H__
+#define __LIBC__TYPES_H__
 typedef unsigned long long sysarg_t;
 typedef unsigned long size_t;
 ,19 → 50,8
 typedef unsigned int uint32_t;
 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
-/** @}
+ /** @}
  */

/uspace/trunk/libc/arch/mips32/include/faddr.h
File deleted

/uspace/trunk/libc/arch/mips32/include/config.h
File deleted

 /uspace/trunk/libc/arch/mips32/include/types.h
 ,15 → 26,15
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcmips32
+ /** @addtogroup libcmips32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb
+ * @ingroup libcmips32eb
  */
-#ifndef LIBC_mips32_TYPES_H_
-#define LIBC_mips32_TYPES_H_
+#ifndef __LIBC__TYPES_H__
+#define __LIBC__TYPES_H__
 typedef unsigned int sysarg_t;
 typedef unsigned int size_t;
 ,9 → 51,8
 typedef unsigned long int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef uint32_t uintptr_t;
 #endif
-/** @}
+ /** @}
  */

/uspace/trunk/libc/arch/ppc32/include/faddr.h
File deleted

/uspace/trunk/libc/arch/ppc32/include/config.h
File deleted

 /uspace/trunk/libc/arch/ppc32/include/types.h
 ,14 → 26,14
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcppc32
+ /** @addtogroup libcppc32
  * @{
  */
 /** @file
  */
-#ifndef LIBC_ppc32_TYPES_H_
-#define LIBC_ppc32_TYPES_H_
+#ifndef __LIBC__TYPES_H__
+#define __LIBC__TYPES_H__
 typedef unsigned int sysarg_t;
 typedef unsigned int size_t;
 ,10 → 50,8
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef uint32_t uintptr_t;
 #endif
-/** @}
+ /** @}
  */

/uspace/trunk/libc/arch/ppc64/include/faddr.h
File deleted

/uspace/trunk/libc/arch/ppc64/include/config.h
File deleted

 /uspace/trunk/libc/arch/ppc64/include/types.h
 ,14 → 26,14
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libcppc64
+ /** @addtogroup libcppc64
  * @{
  */
 /** @file
  */
-#ifndef LIBC_ppc64_TYPES_H_
-#define LIBC_ppc64_TYPES_H_
+#ifndef __LIBC__TYPES_H__
+#define __LIBC__TYPES_H__
 typedef unsigned long sysarg_t;
 typedef unsigned long size_t;
 ,9 → 50,8
 typedef unsigned int uint32_t;
 typedef unsigned long int uint64_t;
-typedef uint64_t uintptr_t;
 #endif
-/** @}
+ /** @}
  */