refactor: clean up the virtual memory mappings

[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 f9ab67f5bb3a975006efad55df3b9daba49016d7..8873a73ba35b12f90959381cfa0ea5f5be69862e 100644 (file)
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -1,28 +1,23 @@
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 

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

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

 
 #define KCODE_MAX_SIZE MEM_4MB
 
 #define KCODE_MAX_SIZE MEM_4MB

-#define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
-#define KHEAP_SIZE_MB 256
+// #define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
+// #define KHEAP_SIZE_MB 256

 
 #define PROC_TABLE_SIZE_MB 4
 
 #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 PROC_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)

 
 

-#define MMIO_BASE (VGA_BUFFER_VADDR + MEM_4MB)
-#define MMIO_APIC (MMIO_BASE)
-#define MMIO_IOAPIC (MMIO_BASE + 4096)
+#define VGA_FRAMEBUFFER 0xB8000

 
 #define KCODE_SEG 0x08
 #define KDATA_SEG 0x10
 
 #define KCODE_SEG 0x08
 #define KDATA_SEG 0x10


@@ -32,12 +27,10 @@
 
 #define USER_START 0x400000
 #define USTACK_SIZE 0x100000
 
 #define USER_START 0x400000
 #define USTACK_SIZE 0x100000

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

 #define UMMAP_AREA 0x4D000000
 
 #define UMMAP_AREA 0x4D000000
 

-#define SYS_TIMER_FREQUENCY_HZ 2048
-

 #ifndef __ASM__
 #include <stddef.h>
 // From Linux kernel v2.6.0 <kernel.h:194>
 #ifndef __ASM__
 #include <stddef.h>
 // From Linux kernel v2.6.0 <kernel.h:194>


@@ -52,7 +45,7 @@
 #define container_of(ptr, type, member)                                        \
     ({                                                                         \
         const typeof(((type*)0)->member)* __mptr = (ptr);                      \
 #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
     })
 
 #endif