Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 827d73f in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged the actual head

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    r918e9910 r827d73f  
    4444#include <arch/stack.h>
    4545#include <arch/mm/page.h>
     46#include <interrupt.h>
    4647#include <mm/as.h>
    4748#include <config.h>
     
    203204        }
    204205       
    205         sysinfo_set_item_val("kbd", NULL, true);
    206         sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
    207         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
    208         sysinfo_set_item_val("kbd.address.physical", NULL,
     206        sysinfo_set_item_val("i8042", NULL, true);
     207        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
     208        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
     209        sysinfo_set_item_val("i8042.address.physical", NULL,
    209210            (uintptr_t) I8042_BASE);
    210         sysinfo_set_item_val("kbd.address.kernel", NULL,
     211        sysinfo_set_item_val("i8042.address.kernel", NULL,
    211212            (uintptr_t) I8042_BASE);
    212213#endif
     
    280281}
    281282
     283void irq_initialize_arch(irq_t *irq)
     284{
     285        (void) irq;
     286}
     287
    282288/** @}
    283289 */
Note: See TracChangeset for help on using the changeset viewer.