renamed and cleaned up export header files to match linux convention

[lunaix-os.git] / lunaix-os / includes / lunaix / types.h

diff --git a/lunaix-os/includes/lunaix/types.h b/lunaix-os/includes/lunaix/types.h
index d4273d8f98451d0d79c052cae92775e9d63d4fbd..c7b09e87acd8a3f0cbc2b7710142de3e244e905a 100644 (file)
--- a/lunaix-os/includes/lunaix/types.h
+++ b/lunaix-os/includes/lunaix/types.h
@@ -1,30 +1,39 @@
 #ifndef __LUNAIX_TYPES_H
 #define __LUNAIX_TYPES_H
 
-#include <lunaix/compiler.h>
 #include <stdarg.h>
+#include <lunaix/compiler.h>
+#include <lunaix/limits.h>
 #include <usr/lunaix/types.h>
 
-#define PACKED __attribute__((packed))
+#undef  NULL
+#define NULL                (void*)0
 
-// TODO: WTERMSIG
+typedef unsigned char       u8_t;
+typedef unsigned short      u16_t;
+typedef unsigned int        u32_t;
 
-// TODO: replace the integer type with these. To make thing more portable.
+#ifndef CONFIG_ARCH_BITS_64
+typedef unsigned long long  u64_t;
+#else
+typedef unsigned long       u64_t;
+#endif
 
-typedef unsigned char u8_t;
-typedef unsigned short u16_t;
-typedef unsigned int u32_t;
-typedef unsigned long long u64_t;
-typedef unsigned long ptr_t;
+typedef __lunaix_pid_t      pid_t;
+typedef __lunaix_tid_t      tid_t;
+typedef __lunaix_uid_t      uid_t;
+typedef __lunaix_gid_t      gid_t;
+typedef __lunaix_size_t     size_t;
+typedef __lunaix_ssize_t    ssize_t;
+typedef __lunaix_size_t     off_t;
+typedef __lunaix_ino_t      ino_t;
 
-typedef int pid_t;
-typedef signed long ssize_t;
-// typedef unsigned long size_t;
-// typedef unsigned long off_t;
+typedef unsigned long       ptr_t;
+typedef unsigned long       reg_t;
+typedef unsigned int        cpu_t;
+typedef u64_t               lba_t;
 
-typedef unsigned int cpu_t;
-
-typedef u64_t lba_t;
+typedef __lunaix_dev_t      dev_t;
 
 #define true 1
 #define false 0
@@ -41,7 +50,17 @@ typedef int bool;
 #define container_of(ptr, type, member)                                        \
     ({                                                                         \
         const typeof(((type*)0)->member)* __mptr = (ptr);                      \
-        (ptr) ? (type*)((char*)__mptr - offsetof(type, member)) : 0;           \
+        ((ptr_t)ptr != 0UL) ? (type*)((char*)__mptr - offsetof(type, member)) : 0;           \
     })
 
+#define offset(data, off)   \
+            ((typeof(data))(__ptr(data) + (off)))
+
+#define offset_t(data, type, off)   \
+            ((type*)(__ptr(data) + (off)))
+
+#define __ptr(val)      ((ptr_t)(val))
+
+typedef va_list* sc_va_list;
+
 #endif /* __LUNAIX_TYPES_H */