refactor: one more step towards arch-agnostic design

[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..8b0c0d62dab1d526f03914b3e340419b4728b8c7 100644 (file)
--- a/lunaix-os/includes/lunaix/types.h
+++ b/lunaix-os/includes/lunaix/types.h
@@ -1,24 +1,10 @@
 #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))
+#include <usr/lunaix/types.h>
 
 #define PACKED __attribute__((packed))
 
@@ -32,7 +18,13 @@ typedef unsigned int u32_t;
 typedef unsigned long long u64_t;
 typedef unsigned long ptr_t;
 
-typedef int32_t pid_t;
-typedef int64_t lba_t;
+typedef signed long ssize_t;
+typedef int pid_t;
+typedef unsigned long size_t;
+typedef unsigned long off_t;
+
+typedef unsigned int cpu_t;
+
+typedef u64_t lba_t;
 
 #endif /* __LUNAIX_TYPES_H */