rewrite the device subsystem interfaces (#48)

[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 9aff5ab60a13bf0b33ea7824136ed145b1f46e11..e065273ce93a20ef00d8a2e53aed9f30963711a0 100644 (file)
--- a/lunaix-os/includes/lunaix/types.h
+++ b/lunaix-os/includes/lunaix/types.h
@@ -5,8 +5,6 @@
 #include <stdarg.h>
 #include <usr/lunaix/types.h>
 
-#define PACKED __attribute__((packed))
-
 // TODO: WTERMSIG
 
 // TODO: replace the integer type with these. To make thing more portable.
@@ -14,10 +12,15 @@
 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 unsigned long reg_t;
 
+#ifndef CONFIG_ARCH_BITS_64
+typedef unsigned long long u64_t;
+#else
+typedef unsigned long u64_t;
+#endif
+
 typedef int pid_t;
 typedef signed long ssize_t;
 
@@ -40,7 +43,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 */