Boot framework rework (#45)

[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 a6af3c10b99ffa7577af409457409c03cdeed999..e065273ce93a20ef00d8a2e53aed9f30963711a0 100644 (file)
--- a/lunaix-os/includes/lunaix/types.h
+++ b/lunaix-os/includes/lunaix/types.h
@@ -3,11 +3,8 @@
 
 #include <lunaix/compiler.h>
 #include <stdarg.h>
-#include <stddef.h>
 #include <usr/lunaix/types.h>
 
-#define PACKED __attribute__((packed))
-
 // TODO: WTERMSIG
 
 // TODO: replace the integer type with these. To make thing more portable.
@@ -15,18 +12,26 @@
 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 signed long ssize_t;
 typedef int pid_t;
-typedef unsigned long size_t;
-typedef unsigned long off_t;
+typedef signed long ssize_t;
 
 typedef unsigned int cpu_t;
 
 typedef u64_t lba_t;
 
+#define true 1
+#define false 0
+typedef int bool;
+
 /**
  * container_of - cast a member of a structure out to the containing structure
  *
@@ -38,7 +43,17 @@ typedef u64_t lba_t;
 #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 */