/kernel/trunk/arch/amd64/src/pm.c |
---|
110,9 → 110,7 |
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, |
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, |
/* VESA Init descriptor */ |
#ifdef CONFIG_FB |
{ 0xffff, 0, VESA_INIT_SEGMENT>>12, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 } |
#endif |
}; |
idescriptor_t idt[IDT_ITEMS]; |
/kernel/trunk/arch/amd64/include/pm.h |
---|
36,8 → 36,9 |
#endif |
#define IDT_ITEMS 64 |
#define GDT_ITEMS 8 |
#define GDT_ITEMS 9 |
#define VESA_INIT_SEGMENT 0x8000 |
#define NULL_DES 0 |
/* Warning: Do not reorder next items, unless you look into syscall.c!!! */ |
48,20 → 49,8 |
#define KTEXT32_DES 5 |
/* EndOfWarning */ |
#define TSS_DES 6 |
#ifdef CONFIG_FB |
#define VESA_INIT_DES 8 |
#define VESA_INIT_SEGMENT 0x8000 |
#undef GDT_ITEMS |
#define GDT_ITEMS 9 |
#endif /*CONFIG_FB*/ |
#define gdtselector(des) ((des)<<3) |
#define idtselector(des) ((des)<<4) |
/kernel/trunk/arch/ia32/src/pm.c |
---|
68,9 → 68,8 |
/* TLS descriptor */ |
{ 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 }, |
/* VESA Init descriptor */ |
#ifdef CONFIG_FB |
{ 0xffff, 0, VESA_INIT_SEGMENT>>12, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 } |
#endif |
}; |
static idescriptor_t idt[IDT_ITEMS]; |
/kernel/trunk/arch/ia32/src/drivers/vesa.c |
---|
77,6 → 77,7 |
page_mapping_insert(AS_KERNEL, videoram_lin_addr+a*4096, vesa_ph_addr+a*4096, PAGE_NOT_CACHEABLE); |
fb_init( videoram_lin_addr,vesa_width,vesa_height,vesa_bpp,vesa_scanline); |
putchar('\n'); |
} |
#endif |
/kernel/trunk/arch/ia32/include/pm.h |
---|
30,7 → 30,7 |
#define __PM_H__ |
#define IDT_ITEMS 64 |
#define GDT_ITEMS 7 |
#define GDT_ITEMS 8 |
#define VESA_INIT_SEGMENT 0x8000 |
41,17 → 41,8 |
#define UDATA_DES 4 |
#define TSS_DES 5 |
#define TLS_DES 6 /* Pointer to Thread-Local-Storage data */ |
#ifdef CONFIG_FB |
#define VESA_INIT_SEGMENT 0x8000 |
#define VESA_INIT_DES 7 |
#undef GDT_ITEMS |
#define GDT_ITEMS 8 |
#endif /* CONFIG_FB */ |
#define selector(des) ((des)<<3) |
#define PL_KERNEL 0 |