X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/fef29e9e993e62f025d8cbfeb6b8d51588083b7e..12293ed1d71cd306ed9a5d021a79ba945fe4e680:/lunaix-os/includes/lunaix/common.h

diff --git a/lunaix-os/includes/lunaix/common.h b/lunaix-os/includes/lunaix/common.h
index d9ffeae..6482008 100644
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -1,20 +1,32 @@
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 
-#include <stddef.h>
-
-#define K_STACK_SIZE            (64 << 10)
-#define K_STACK_START           ((0xFFBFFFFFU - K_STACK_SIZE) + 1)
-#define HIGHER_HLF_BASE         0xC0000000UL
-#define MEM_1MB                 0x100000UL
+#define KSTACK_SIZE             (64 << 10)
+#define KSTACK_START            ((0xFFBFFFFFU - KSTACK_SIZE) + 1)
+#define KSTACK_TOP              0xffbffff0
+#define HIGHER_HLF_BASE         0xC0000000
+#define MEM_1MB                 0x100000
 
-#define VGA_BUFFER_VADDR        0xB0000000UL
-#define VGA_BUFFER_PADDR        0xB8000UL
+#define VGA_BUFFER_VADDR        0xB0000000
+#define VGA_BUFFER_PADDR        0xB8000
 #define VGA_BUFFER_SIZE         4096
 
-#define SYS_TIMER_FREQUENCY_HZ  2048
+#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 USTACK_TOP             0x9fffffff
+#define USTACK_END             (USTACK_TOP - USTACK_SIZE + 1)
+#define UMMAP_AREA             0x4D000000
 
+#define SYS_TIMER_FREQUENCY_HZ  2048
+
+#ifndef __ASM__
+#include <stddef.h>
 // From Linux kernel v2.6.0 <kernel.h:194>
 /**
  * container_of - cast a member of a structure out to the containing structure
@@ -24,8 +36,9 @@
  * @member:	the name of the member within the struct.
  *
  */
-#define container_of(ptr, type, member) ({			            \
+#define container_of(ptr, type, member) ({			\
         const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
         (type *)( (char *)__mptr - offsetof(type,member) );})
 
+#endif
 #endif /* __LUNAIX_CONSTANTS_H */