Subversion Repositories HelenOS

Rev

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

Rev 3934 Rev 3963
Line 164... Line 164...
164 
 
 164 
 
165 
#ifdef CONFIG_NS16550
 165 
#ifdef CONFIG_NS16550
166 
    (void) ns16550_init((ns16550_t *)NS16550_BASE, kbd, NS16550_IRQ, NULL,
 166 
    (void) ns16550_init((ns16550_t *)NS16550_BASE, kbd, NS16550_IRQ, NULL,
167 
         NULL);
 167 
         NULL);
168 
#else
 168 
#else
169 
    devno_t mouse = device_assign_devno();
 - 
 
170 
    i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
 169 
    (void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
171 
#endif
 170 
#endif
172 
#endif
 171 
#endif
173 
 
 172 
 
174 
    sysinfo_set_item_val("ia64_iospace", NULL, true);
 173 
    sysinfo_set_item_val("ia64_iospace", NULL, true);
175 
    sysinfo_set_item_val("ia64_iospace.address", NULL, true);
 174 
    sysinfo_set_item_val("ia64_iospace.address", NULL, true);
Line 220... Line 219...
220 
 */
 219 
 */
221 
void arch_grab_console(void)
 220 
void arch_grab_console(void)
222 
{
 221 
{
223 
#ifdef SKI
 222 
#ifdef SKI
224 
    ski_kbd_grab();
 223 
    ski_kbd_grab();
225 
#else
 - 
 
226 
#ifdef CONFIG_NS16550
 - 
 
227 
    ns16550_grab();
 - 
 
228 
#else
 - 
 
229 
    i8042_grab();
 - 
 
230 
#endif
 - 
 
231 
#endif
 224 
#endif
232 
}
 225 
}
233 
 
 226 
 
234 
/** Return console to userspace
 227 
/** Return console to userspace
235 
 *
 228 
 *
236 
 */
 229 
 */
237 
void arch_release_console(void)
 230 
void arch_release_console(void)
238 
{
 231 
{
239 
#ifdef SKI
 232 
#ifdef SKI
240 
    ski_kbd_release();
 233 
    ski_kbd_release();
241 
#else
 - 
 
242 
#ifdef CONFIG_NS16550
 - 
 
243 
    ns16550_release();
 - 
 
244 
#else
 - 
 
245 
    i8042_release();
 - 
 
246 
#endif
 - 
 
247 
#endif
 234 
#endif
248 
}
 235 
}
249 
 
 236 
 
250 
void arch_reboot(void)
 237 
void arch_reboot(void)
251 
{
 238 
{