Subversion Repositories HelenOS

Rev

Rev 4337 | Rev 4342 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4337 Rev 4338
Line 38... Line 38...
38 
 
 38 
 
39 
#include <config.h>
 39 
#include <config.h>
40 
 
 40 
 
41 
#include <proc/thread.h>
 41 
#include <proc/thread.h>
42 
#include <arch/drivers/ega.h>
 42 
#include <arch/drivers/ega.h>
- 
 
 43 
#include <genarch/drivers/ega/ega.h>
43 
#include <arch/drivers/vesa.h>
 44 
#include <arch/drivers/vesa.h>
44 
#include <genarch/kbd/i8042.h>
 45 
#include <genarch/kbd/i8042.h>
45 
#include <arch/drivers/i8254.h>
 46 
#include <arch/drivers/i8254.h>
46 
#include <arch/drivers/i8259.h>
 47 
#include <arch/drivers/i8259.h>
47 
 
 48 
 
Line 137... Line 138...
137 
#ifdef CONFIG_FB
 138 
#ifdef CONFIG_FB
138 
        if (vesa_present())
 139 
        if (vesa_present())
139 
            vesa_init();
 140 
            vesa_init();
140 
        else
 141 
        else
141 
#endif
 142 
#endif
142 
            ega_init(); /* video */
 143 
            ega_init(EGA_BASE, EGA_VIDEORAM);   /* video */
143 
       
 144 
       
144 
        /* Enable debugger */
 145 
        /* Enable debugger */
145 
        debugger_init();
 146 
        debugger_init();
146 
        /* Merge all memory zones to 1 big zone */
 147 
        /* Merge all memory zones to 1 big zone */
147 
        zone_merge_all();
 148 
        zone_merge_all();
Line 206... Line 207...
206 
/** Acquire console back for kernel
 207 
/** Acquire console back for kernel
207 
 *
 208 
 *
208 
 */
 209 
 */
209 
void arch_grab_console(void)
 210 
void arch_grab_console(void)
210 
{
 211 
{
- 
 
 212 
#ifdef CONFIG_FB
- 
 
 213 
    vesa_redraw();
- 
 
 214 
#else
- 
 
 215 
    ega_redraw();
- 
 
 216 
#endif
- 
 
 217 
   
211 
    i8042_grab();
 218 
    i8042_grab();
212 
}
 219 
}
213 
 
 220 
 
214 
/** Return console to userspace
 221 
/** Return console to userspace
215 
 *
 222 
 *