Decoupling Architectural-specific Code (#35)

[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 5a6fb9095839576578065c623d6d164c6c0600a7..9aff5ab60a13bf0b33ea7824136ed145b1f46e11 100644 (file)
--- a/lunaix-os/includes/lunaix/types.h
+++ b/lunaix-os/includes/lunaix/types.h
@@ -1,9 +1,9 @@
 #ifndef __LUNAIX_TYPES_H
 #define __LUNAIX_TYPES_H
 
+#include <lunaix/compiler.h>
 #include <stdarg.h>
-#include <stddef.h>
-#include <sys/types.h>
+#include <usr/lunaix/types.h>
 
 #define PACKED __attribute__((packed))
 
@@ -16,12 +16,31 @@ 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;
 
-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
+ *
+ * @ptr:       the pointer to the member.
+ * @type:      the type of the container struct this is embedded in.
+ * @member:    the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member)                                        \
+    ({                                                                         \
+        const typeof(((type*)0)->member)* __mptr = (ptr);                      \
+        (ptr) ? (type*)((char*)__mptr - offsetof(type, member)) : 0;           \
+    })
+
 #endif /* __LUNAIX_TYPES_H */