Changeset b50b5af2 in mainline for kernel/arch/amd64/src/amd64.c
- Timestamp:
- 2009-08-22T10:48:00Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 04803bf
- Parents:
- 1ea99cc (diff), a71c158 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/amd64/src/amd64.c
r1ea99cc rb50b5af2 151 151 i8254_init(); 152 152 153 #if (defined(CONFIG_FB) || defined(CONFIG_EGA)) 154 bool vesa = false; 155 #endif 156 153 157 #ifdef CONFIG_FB 154 if (vesa_present()) 155 vesa_init(); 156 else 157 #endif 158 vesa = vesa_init(); 159 #endif 160 158 161 #ifdef CONFIG_EGA 159 ega_init(EGA_BASE, EGA_VIDEORAM); /* video */ 160 #else 161 {} 162 if (!vesa) { 163 outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM); 164 if (egadev) 165 stdout_wire(egadev); 166 } 162 167 #endif 163 168 … … 249 254 } 250 255 251 /** Acquire console back for kernel252 *253 */254 void arch_grab_console(void)255 {256 #ifdef CONFIG_FB257 if (vesa_present())258 vesa_redraw();259 else260 #endif261 #ifdef CONFIG_EGA262 ega_redraw();263 #else264 {}265 #endif266 }267 268 /** Return console to userspace269 *270 */271 void arch_release_console(void)272 {273 }274 275 256 /** Construct function pointer 276 257 *
Note:
See TracChangeset
for help on using the changeset viewer.