Changeset 2a34e4c in mainline


Ignore:
Timestamp:
2009-03-12T18:00:23Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7012a8d
Parents:
0e0490bd
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/ia32/src/ia32.c

    r0e0490bd r2a34e4c  
    114114               
    115115#ifdef CONFIG_FB
    116                 if (vesa_present()) 
     116                if (vesa_present())
    117117                        vesa_init();
    118118                else
     
    152152void arch_post_smp_init(void)
    153153{
     154#ifdef CONFIG_PC_KBD
    154155        devno_t devno = device_assign_devno();
    155 
     156       
    156157        /*
    157          * Initialize the keyboard module and conect it to stdin. Then
    158          * initialize the i8042 controller and connect it to kbrdin. Enable
    159          * keyboard interrupts.
     158         * Initialize the i8042 controller. Then initialize the keyboard
     159         * module and connect it to i8042. Enable keyboard interrupts.
    160160         */
    161         kbrd_init(stdin);
    162         (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin);
    163         trap_virtual_enable_irqs(1 << IRQ_KBD);
    164 
     161        indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
     162        if (kbrdin) {
     163                kbrd_init(kbrdin);
     164                trap_virtual_enable_irqs(1 << IRQ_KBD);
     165        }
     166       
    165167        /*
    166168         * This is the necessary evil until the userspace driver is entirely
     
    174176        sysinfo_set_item_val("kbd.address.kernel", NULL,
    175177            (uintptr_t) I8042_BASE);
     178#endif
    176179}
    177180
     
    207210{
    208211#ifdef CONFIG_FB
    209         vesa_redraw();
     212        if (vesa_present())
     213                vesa_redraw();
     214        else
     215#endif
     216#ifdef CONFIG_EGA
     217                ega_redraw();
    210218#else
    211         ega_redraw();
     219                {}
    212220#endif
    213221}
Note: See TracChangeset for help on using the changeset viewer.