Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2515 → Rev 2516

/trunk/kernel/kernel.config
60,10 → 60,6
@ "gxemul_testarm" GXEmul testarm
! [ARCH=arm32] MACHINE (choice)
 
# Machine type
@ "ski" Ski ia64 simulator
@ "i460GX" i460GX chipset machine
! [ARCH=ia64] MACHINE (choice)
 
# Framebuffer support
! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=arm32&MACHINE=gxemul_testarm)] CONFIG_FB (y/n)
/trunk/kernel/genarch/src/kbd/i8042.c
168,10 → 168,10
i8042_mouse_irq.claim = i8042_claim;
i8042_mouse_irq.handler = i8042_irq_handler;
irq_register(&i8042_mouse_irq);
#ifndef ia64
trap_virtual_enable_irqs(1 << kbd_inr);
trap_virtual_enable_irqs(1 << mouse_inr);
#endif
/*
* Clear input buffer.
* Number of iterations is limited to prevent infinite looping.
/trunk/kernel/arch/ia64/_link.ld.in
9,7 → 9,7
ENTRY(kernel_image_start)
 
SECTIONS {
.image 0xe000000000100000: AT (0x0000000000100000) {
.image 0xe000000004404000: AT (0x0000000004404000) {
ktext_start = .;
*(K_TEXT_START);
*(.text)
39,6 → 39,6
 
_hardcoded_ktext_size = ktext_end - ktext_start;
_hardcoded_kdata_size = kdata_end - kdata_start;
_hardcoded_load_address = 0xe000000000100000;
_hardcoded_load_address = 0xe000000004404000;
 
}
/trunk/kernel/arch/ia64/include/interrupt.h
51,6 → 51,8
 
/** External Interrupt vectors. */
#define INTERRUPT_TIMER 255
#define IRQ_KBD 241
#define IRQ_MOUSE 252
#define INTERRUPT_SPURIOUS 15
 
/** General Exception codes. */