Merge branch 'master' into 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 f9ab67f5bb3a975006efad55df3b9daba49016d7..d341daa341120feca19b36510b7987d657cbcf46 100644 (file)
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -20,10 +20,6 @@
 #define VGA_BUFFER_PADDR 0xB8000
 #define VGA_BUFFER_SIZE 4096
 
-#define MMIO_BASE (VGA_BUFFER_VADDR + MEM_4MB)
-#define MMIO_APIC (MMIO_BASE)
-#define MMIO_IOAPIC (MMIO_BASE + 4096)
-
 #define KCODE_SEG 0x08
 #define KDATA_SEG 0x10
 #define UCODE_SEG 0x1B
@@ -32,8 +28,8 @@
 
 #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 SYS_TIMER_FREQUENCY_HZ 2048
@@ -52,7 +48,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