Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3816 → Rev 3817

/branches/sparc/kernel/arch/sparc64/src/console.c
40,12 → 40,16
 
#include <arch/drivers/sgcn.h>
 
#ifdef CONFIG_Z8530
#include <genarch/kbd/z8530.h>
#if defined (SUN4U)
#ifdef CONFIG_Z8530
#include <genarch/kbd/z8530.h>
#endif
#ifdef CONFIG_NS16550
#include <genarch/kbd/ns16550.h>
#endif
#elif defined (SUN4V)
#include <arch/drivers/niagara.h>
#endif
#ifdef CONFIG_NS16550
#include <genarch/kbd/ns16550.h>
#endif
 
#include <console/chardev.h>
#include <console/console.h>
61,6 → 65,8
 
#define KEYBOARD_POLL_PAUSE 50000 /* 50ms */
 
#if defined (SUN4U)
 
/**
* Initialize kernel console to use framebuffer and keyboard directly.
* Called on UltraSPARC machines with standard keyboard and framebuffer.
104,6 → 110,8
sgcn_init();
}
 
#endif
 
/**
* Initialize input/output. Auto-detects the type of machine
* and calls the appropriate I/O init routine.
110,6 → 118,7
*/
void standalone_sparc64_console_init(void)
{
#if defined (SUN4U)
ofw_tree_node_t *aliases;
ofw_tree_property_t *prop;
125,6 → 134,9
} else {
serengeti_init();
}
#elif defined (SUN4V)
niagara_init();
#endif
}
 
 
166,6 → 178,10
if (kbd_type == KBD_SGCN)
sgcn_poll();
#endif
#ifdef SUN4V
if (kbd_type == KBD_SUN4V)
niagara_poll();
#endif
thread_usleep(KEYBOARD_POLL_PAUSE);
}
}