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

Changeset 4df7d3a in mainline


Ignore:
Timestamp:
2009-03-12T18:02:21Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
1462d35
Parents:
0b6eba5
Message:

update for the new scheme of wiring device drivers to keyboard/serial modules
use ega_redraw() only if it is compiled in

File:
1 edited

Legend:

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

    r0b6eba5 r4df7d3a  
    194194void arch_post_smp_init(void)
    195195{
     196#ifdef CONFIG_PC_KBD
    196197        devno_t devno = device_assign_devno();
    197 
    198         /*
    199          * Initialize the keyboard module and conect it to stdin. Then
    200          * initialize the i8042 controller and connect it to kbrdin. Enable
    201          * keyboard interrupts.
    202          */
    203         kbrd_init(stdin);
    204         (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin);
    205         trap_virtual_enable_irqs(1 << IRQ_KBD);
    206 
     198       
     199        /*
     200         * Initialize the i8042 controller. Then initialize the keyboard
     201         * module and connect it to i8042. Enable keyboard interrupts.
     202         */
     203        indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
     204        if (kbrdin) {
     205                kbrd_init(kbrdin);
     206                trap_virtual_enable_irqs(1 << IRQ_KBD);
     207        }
     208       
    207209        /*
    208210         * This is the necessary evil until the userspace driver is entirely
     
    216218        sysinfo_set_item_val("kbd.address.kernel", NULL,
    217219            (uintptr_t) I8042_BASE);
     220#endif
    218221}
    219222
     
    251254{
    252255#ifdef CONFIG_FB
    253         vesa_redraw();
     256        if (vesa_present())
     257                vesa_redraw();
     258        else
     259#endif
     260#ifdef CONFIG_EGA
     261                ega_redraw();
    254262#else
    255         ega_redraw();
     263                {}
    256264#endif
    257265}
Note: See TracChangeset for help on using the changeset viewer.