X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/728194869c3dc89b0e1c625480d486ada309ae40..f09e806d5032150564df39a2f7b1192c4d84cf15:/lunaix-os/includes/lunaix/common.h

diff --git a/lunaix-os/includes/lunaix/common.h b/lunaix-os/includes/lunaix/common.h
index f9ab67f..c9ef9e4 100644
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -1,45 +1,40 @@
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 
-#define KSTACK_SIZE (64 << 10)
-#define KSTACK_START ((0x3FFFFFU - KSTACK_SIZE) + 1)
-#define KSTACK_TOP 0x3FFFF0U
+#define PG_SIZE_BITS 12
+#define PG_SIZE (1 << PG_SIZE_BITS)
+#define PG_INDEX_BITS 10
 
-#define KERNEL_MM_BASE 0xC0000000
 #define MEM_1MB 0x100000
 #define MEM_4MB 0x400000
 
-#define KCODE_MAX_SIZE MEM_4MB
-#define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
-#define KHEAP_SIZE_MB 256
+#define USER_START 0x400000
 
-#define PROC_TABLE_SIZE_MB 4
-#define PROC_START (KHEAP_START + (KHEAP_SIZE_MB * MEM_1MB))
+#define KSTACK_SIZE MEM_1MB
+#define KSTACK_START (USER_START - KSTACK_SIZE)
+#define KSTACK_TOP ((USER_START - 1) & ~0xf)
 
-#define VGA_BUFFER_VADDR (PROC_START + (PROC_TABLE_SIZE_MB * MEM_1MB))
-#define VGA_BUFFER_PADDR 0xB8000
-#define VGA_BUFFER_SIZE 4096
+#define KERNEL_MM_BASE 0xC0000000
 
-#define MMIO_BASE (VGA_BUFFER_VADDR + MEM_4MB)
-#define MMIO_APIC (MMIO_BASE)
-#define MMIO_IOAPIC (MMIO_BASE + 4096)
+#define KCODE_MAX_SIZE MEM_4MB
+// #define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
+// #define KHEAP_SIZE_MB 256
+
+#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 USTACK_TOP 0x9fffffff
-#define USTACK_END (USTACK_TOP - USTACK_SIZE + 1)
-#define UMMAP_AREA 0x4D000000
+#define KSIZE (MEM_4MB * 16)
 
-#define SYS_TIMER_FREQUENCY_HZ 2048
+#define USTACK_SIZE MEM_4MB
+#define USTACK_TOP 0x9ffffff0
+#define USTACK_END (0x9fffffff - USTACK_SIZE + 1)
+#define UMMAP_START 0x4D000000
+#define UMMAP_END (USTACK_END - MEM_4MB)
 
 #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
@@ -52,7 +47,7 @@
 #define container_of(ptr, type, member)                                        \
     ({                                                                         \
         const typeof(((type*)0)->member)* __mptr = (ptr);                      \
-        (type*)((char*)__mptr - offsetof(type, member));                       \
+        (ptr) ? (type*)((char*)__mptr - offsetof(type, member)) : 0;           \
     })
 
 #endif