Merge branch 'vfs-dev'

[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 27243bfba322957684e1ba6bd1806d9d159ce3dc..4c8c794f8a1026851d5583c232eb1cf0491b6acd 100644 (file)
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -1,23 +1,36 @@
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 

-#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 KSTACK_SIZE (64 << 10)
+#define KSTACK_START ((0x3FFFFFU - KSTACK_SIZE) + 1)
+#define KSTACK_TOP 0x3FFFF0U

 
 

-#define VGA_BUFFER_VADDR        0xB0000000
-#define VGA_BUFFER_PADDR        0xB8000
-#define VGA_BUFFER_SIZE         4096
+#define KERNEL_MM_BASE 0xC0000000
+#define MEM_1MB 0x100000
+#define MEM_4MB 0x400000

 
 

-#define KCODE_SEG              0x08
-#define KDATA_SEG              0x10
-#define UCODE_SEG              0x1B
-#define UDATA_SEG              0x23
-#define TSS_SEG                0x28
+#define KCODE_MAX_SIZE MEM_4MB
+#define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
+#define KHEAP_SIZE_MB 256

 
 

-#define SYS_TIMER_FREQUENCY_HZ  2048
+#define PROC_TABLE_SIZE_MB 4
+#define PROC_START (KHEAP_START + (KHEAP_SIZE_MB * MEM_1MB))
+
+#define VGA_BUFFER_VADDR (PROC_START + (PROC_TABLE_SIZE_MB * MEM_1MB))
+#define VGA_BUFFER_PADDR 0xB8000
+#define VGA_BUFFER_SIZE 4096
+
+#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 0x9ffffff0
+#define USTACK_END (0x9fffffff - USTACK_SIZE + 1)
+#define UMMAP_AREA 0x4D000000

 
 #ifndef __ASM__
 #include <stddef.h>
 
 #ifndef __ASM__
 #include <stddef.h>


@@ -30,9 +43,11 @@
  * @member:    the name of the member within the struct.
  *
  */
  * @member:    the name of the member within the struct.
  *
  */

-#define container_of(ptr, type, member) ({                     \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);   \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
+#define container_of(ptr, type, member)                                        \
+    ({                                                                         \
+        const typeof(((type*)0)->member)* __mptr = (ptr);                      \
+        (ptr) ? (type*)((char*)__mptr - offsetof(type, member)) : 0;           \
+    })

 
 #endif
 #endif /* __LUNAIX_CONSTANTS_H */
 
 #endif
 #endif /* __LUNAIX_CONSTANTS_H */