Architectural Support: x86_64 (#37)

[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 1251b7033176297dfffe4fdfa077e4445cea615a..52faac3d486d6f6ef2efa7d539225fc6401b4f52 100644 (file)
--- a/lunaix-os/includes/lunaix/types.h
+++ b/lunaix-os/includes/lunaix/types.h
@@ -1,26 +1,9 @@
 #ifndef __LUNAIX_TYPES_H
 #define __LUNAIX_TYPES_H
 
+#include <lunaix/compiler.h>
 #include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#define PEXITTERM 0x100
-#define PEXITSTOP 0x200
-#define PEXITSIG 0x400
-
-#define PEXITNUM(flag, code) (flag | (code & 0xff))
-
-#define WNOHANG 1
-#define WUNTRACED 2
-#define WEXITSTATUS(wstatus) ((wstatus & 0xff))
-#define WIFSTOPPED(wstatus) ((wstatus & PEXITSTOP))
-#define WIFEXITED(wstatus)                                                     \
-    ((wstatus & PEXITTERM) && ((char)WEXITSTATUS(wstatus) >= 0))
-
-#define WIFSIGNALED(wstatus) ((wstatus & PEXITSIG))
-
-#define PACKED __attribute__((packed))
+#include <usr/lunaix/types.h>
 
 // TODO: WTERMSIG
 
@@ -29,10 +12,42 @@
 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;
 
-typedef int32_t pid_t;
-typedef int64_t lba_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;
+
+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;           \
+    })
+
+#define __ptr(val)      ((ptr_t)(val))
+
+typedef va_list* sc_va_list;
 
 #endif /* __LUNAIX_TYPES_H */