Changeset 2a34e4c in mainline
- Timestamp:
- 2009-03-12T18:00:23Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 7012a8d
- Parents:
- 0e0490bd
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia32/src/ia32.c
r0e0490bd r2a34e4c 114 114 115 115 #ifdef CONFIG_FB 116 if (vesa_present()) 116 if (vesa_present()) 117 117 vesa_init(); 118 118 else … … 152 152 void arch_post_smp_init(void) 153 153 { 154 #ifdef CONFIG_PC_KBD 154 155 devno_t devno = device_assign_devno(); 155 156 156 157 /* 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. 160 160 */ 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 165 167 /* 166 168 * This is the necessary evil until the userspace driver is entirely … … 174 176 sysinfo_set_item_val("kbd.address.kernel", NULL, 175 177 (uintptr_t) I8042_BASE); 178 #endif 176 179 } 177 180 … … 207 210 { 208 211 #ifdef CONFIG_FB 209 vesa_redraw(); 212 if (vesa_present()) 213 vesa_redraw(); 214 else 215 #endif 216 #ifdef CONFIG_EGA 217 ega_redraw(); 210 218 #else 211 ega_redraw();219 {} 212 220 #endif 213 221 }
Note:
See TracChangeset
for help on using the changeset viewer.