Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1291 → Rev 1292

/kernel/trunk/arch/amd64/include/pm.h
36,9 → 36,8
#endif
 
#define IDT_ITEMS 64
#define GDT_ITEMS 9
#define GDT_ITEMS 8
 
#define VESA_INIT_SEGMENT 0x8000
 
#define NULL_DES 0
/* Warning: Do not reorder next items, unless you look into syscall.c!!! */
49,8 → 48,20
#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/amd64/src/pm.c
110,7 → 110,9
{ 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];