| /trunk/kernel/arch/ia64/src/ia64.c |
|---|
| 132,9 → 132,9 |
| irq_init(INR_COUNT, INR_COUNT); |
| #ifdef SKI |
| ski_init_console(); |
| #else |
| #else |
| ega_init(EGA_BASE, EGA_VIDEORAM); |
| #endif |
| #endif |
| } |
| it_init(); |
| 265,13 → 265,13 |
| { |
| #ifdef SKI |
| ski_kbd_release(); |
| #else |
| #else |
| #ifdef CONFIG_NS16550 |
| ns16550_release(); |
| #else |
| #else |
| i8042_release(); |
| #endif |
| #endif |
| #endif |
| } |
| void arch_reboot(void) |
| 281,5 → 281,22 |
| ; |
| } |
| /** Construct function pointer |
| * |
| * @param fptr function pointer structure |
| * @param addr function address |
| * @param caller calling function address |
| * |
| * @return address of the function pointer |
| * |
| */ |
| void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller) |
| { |
| fptr->fnc = (unative_t) addr; |
| fptr->gp = ((unative_t *) caller)[1]; |
| return (void *) fptr; |
| } |
| /** @} |
| */ |
| /trunk/kernel/arch/ia64/src/ski/ski.c |
|---|
| 46,7 → 46,7 |
| #include <arch/asm.h> |
| #include <arch/drivers/kbd.h> |
| #define SKI_KBD_INR 0 |
| #define SKI_KBD_INR 0 |
| static irq_t ski_kbd_irq; |
| static devno_t ski_kbd_devno; |
| 114,9 → 114,9 |
| static char ski_getchar_blocking(chardev_t *d) |
| { |
| int ch; |
| while(!(ch = ski_getchar())) |
| ; |
| while(!(ch = ski_getchar())); |
| if (ch == '\r') |
| ch = '\n'; |
| return (char) ch; |
| 128,16 → 128,16 |
| char ch; |
| static char last; |
| ipl_t ipl; |
| ipl = interrupts_disable(); |
| if (kbd_disabled) { |
| interrupts_restore(ipl); |
| return; |
| } |
| spinlock_lock(&ski_kbd_irq.lock); |
| ch = ski_getchar(); |
| if(ch == '\r') |
| ch = '\n'; |
| 177,7 → 177,7 |
| /* Called from getc(). */ |
| static void ski_kbd_disable(chardev_t *d) |
| { |
| kbd_disabled = true; |
| kbd_disabled = true; |
| } |
| /** Decline to service hardware IRQ. |
| /trunk/kernel/arch/ia64/src/interrupt.c |
|---|
| 194,8 → 194,8 |
| void disabled_fp_register(uint64_t vector, istate_t *istate) |
| { |
| #ifdef CONFIG_FPU_LAZY |
| scheduler_fpu_lazy_request(); |
| #ifdef CONFIG_FPU_LAZY |
| scheduler_fpu_lazy_request(); |
| #else |
| fault_if_from_uspace(istate, "Interruption: %#hx (%s).", |
| (uint16_t) vector, vector_to_string(vector)); |
| 301,5 → 301,9 |
| } |
| } |
| void trap_virtual_enable_irqs(uint16_t irqmask) |
| { |
| } |
| /** @} |
| */ |