Subversion Repositories HelenOS

Rev

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

Rev 3790 Rev 3865
Line 67... Line 67...
67 
 *
 67 
 *
68 
 * @param aliases   the "/aliases" OBP node
 68 
 * @param aliases   the "/aliases" OBP node
69 
 */
 69 
 */
70 
static void standard_console_init(ofw_tree_node_t *aliases)
 70 
static void standard_console_init(ofw_tree_node_t *aliases)
71 
{
 71 
{
- 
 
 72 
#ifdef CONFIG_FB
72 
    stdin = NULL;
 73 
    stdin = NULL;
73 
 
 74 
 
74 
    ofw_tree_property_t *prop;
 75 
    ofw_tree_property_t *prop;
75 
    ofw_tree_node_t *screen;
 76 
    ofw_tree_node_t *screen;
76 
    ofw_tree_node_t *keyboard;
 77 
    ofw_tree_node_t *keyboard;
Line 94... Line 95...
94 
    keyboard = ofw_tree_lookup(prop->value);
 95 
    keyboard = ofw_tree_lookup(prop->value);
95 
    if (!keyboard)
 96 
    if (!keyboard)
96 
        panic("Cannot find %s.", prop->value);
 97 
        panic("Cannot find %s.", prop->value);
97 
 
 98 
 
98 
    kbd_init(keyboard);
 99 
    kbd_init(keyboard);
- 
 
 100 
#else
- 
 
 101 
    panic("Standard console requires FB, "
- 
 
 102 
          "but the kernel is not compiled with FB support.");
- 
 
 103 
#endif
99 
}
 104 
}
100 
 
 105 
 
101 
/** Initilize I/O on the Serengeti machine. */
 106 
/** Initilize I/O on the Serengeti machine. */
102 
static void serengeti_init(void)
 107 
static void serengeti_init(void)
103 
{
 108 
{
Line 173... Line 178...
173 
/** Acquire console back for kernel
 178 
/** Acquire console back for kernel
174 
 *
 179 
 *
175 
 */
 180 
 */
176 
void arch_grab_console(void)
 181 
void arch_grab_console(void)
177 
{
 182 
{
- 
 
 183 
#ifdef CONFIG_FB
178 
    scr_redraw();
 184 
    scr_redraw();
- 
 
 185 
#endif
179 
    switch (kbd_type) {
 186 
    switch (kbd_type) {
180 
#ifdef CONFIG_Z8530
 187 
#ifdef CONFIG_Z8530
181 
    case KBD_Z8530:
 188 
    case KBD_Z8530:
182 
        z8530_grab();
 189 
        z8530_grab();
183 
        break;
 190 
        break;