28c28
< __FBSDID("$FreeBSD: head/sys/dev/uart/uart_kbd_sun.c 163890 2006-11-02 00:01:15Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/uart/uart_kbd_sun.c 166100 2007-01-18 22:01:19Z marius $");
75,76d74
< int sc_checked_key;
<
406c404
< (sc->sc_checked_key = uart_poll(sc->sc_sysdev)) != -1)
---
> uart_rxready(sc->sc_sysdev))
444,449d441
< if (sc->sc_checked_key != -1) {
< suncode = sc->sc_checked_key;
< sc->sc_checked_key = -1;
< goto process_code;
< }
<
475d466
<
568,571c559,564
< if (sc->sc_flags & KPCOMPOSE) {
< sc->sc_flags &= ~KPCOMPOSE;
< if (sc->sc_composed_char > UCHAR_MAX)
< sc->sc_composed_char = 0;
---
> if (sc->sc_flags & KPCOMPOSE) {
> sc->sc_flags &= ~KPCOMPOSE;
> if (sc->sc_composed_char >
> UCHAR_MAX)
> sc->sc_composed_char =
> 0;
771d763
< sc->sc_checked_key = -1;