fix: corrected time conversion on alarm/sleep syscall

[lunaix-os.git] / lunaix-os / includes / lunaix / common.h

diff --git a/lunaix-os/includes/lunaix/common.h b/lunaix-os/includes/lunaix/common.h
index 1ebf15836f509c7bbd0a5fcb8bcb00c636947166..cb827fbb922d34b58a1efe53abad87a5543afdda 100644 (file)
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -1,39 +1,31 @@
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 

-#define PG_SIZE_BITS 12
-#define PG_SIZE (1 << PG_SIZE_BITS)
-#define PG_INDEX_BITS 10
-

 #define MEM_1MB 0x100000
 #define MEM_4MB 0x400000
 
 #define MEM_1MB 0x100000
 #define MEM_4MB 0x400000
 

-#define KSTACK_SIZE MEM_1MB
-#define KSTACK_START ((0x3FFFFFU - KSTACK_SIZE) + 1)
-#define KSTACK_TOP 0x3FFFF0U
-
-#define KERNEL_MM_BASE 0xC0000000
+#define USER_START 0x400000

 
 

-#define KCODE_MAX_SIZE MEM_4MB
-// #define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
-// #define KHEAP_SIZE_MB 256
+#define KSTACK_SIZE MEM_1MB
+#define KSTACK_START (USER_START - KSTACK_SIZE)
+#define KSTACK_TOP ((USER_START - 1) & ~0xf)
+#define within_kstack(addr) (KSTACK_START <= (addr) && (addr) <= KSTACK_TOP)

 
 #define VGA_FRAMEBUFFER 0xB8000
 
 #define KCODE_SEG 0x08
 #define KDATA_SEG 0x10
 
 #define VGA_FRAMEBUFFER 0xB8000
 
 #define KCODE_SEG 0x08
 #define KDATA_SEG 0x10

-#define UCODE_SEG 0x1B
-#define UDATA_SEG 0x23
-#define TSS_SEG 0x28

 
 

-#define USER_START 0x400000
-#define USTACK_SIZE 0x100000
+#define KSIZE (MEM_4MB * 16)
+
+#define USTACK_SIZE MEM_4MB

 #define USTACK_TOP 0x9ffffff0
 #define USTACK_END (0x9fffffff - USTACK_SIZE + 1)
 #define USTACK_TOP 0x9ffffff0
 #define USTACK_END (0x9fffffff - USTACK_SIZE + 1)

-#define UMMAP_AREA 0x4D000000
+#define UMMAP_START 0x4D000000
+#define UMMAP_END (USTACK_END - MEM_4MB)

 
 #ifndef __ASM__
 
 #ifndef __ASM__

-#include <stddef.h>
+#include <lunaix/types.h>

 // From Linux kernel v2.6.0 <kernel.h:194>
 /**
  * container_of - cast a member of a structure out to the containing structure
 // From Linux kernel v2.6.0 <kernel.h:194>
 /**
  * container_of - cast a member of a structure out to the containing structure