X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/2803826a2373620dbfce8a5bff1e6a01dd594953..bc34fd00d2e81fbc890bb2060ed6693454a230bf:/lunaix-os/includes/lunaix/common.h diff --git a/lunaix-os/includes/lunaix/common.h b/lunaix-os/includes/lunaix/common.h index fe0c0bc..4c8c794 100644 --- 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 @@ -36,8 +32,6 @@ #define USTACK_END (0x9fffffff - USTACK_SIZE + 1) #define UMMAP_AREA 0x4D000000 -#define SYS_TIMER_FREQUENCY_HZ 2048 - #ifndef __ASM__ #include // From Linux kernel v2.6.0 @@ -52,7 +46,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