28c28
< __FBSDID("$FreeBSD: head/sys/dev/uart/uart_cpu_sparc64.c 137826 2004-11-17 20:01:43Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/uart/uart_cpu_sparc64.c 138157 2004-11-28 16:00:36Z marius $");
46a47,54
> /*
> * Determine which channel of a SCC a device referenced by an alias is.
> * The information present in the OF device tree only allows to do this
> * for "ttyX" aliases. If a device is a channel of a SCC its property
> * in the /aliases node looks like one of these:
> * ttya: '/central/fhc/zs@0,902000:a'
> * ttyc: '/pci@1f,0/pci@1,1/ebus@1/se@14,400000:a'
> */
72,74c80,82
< * Get the address of the UART that is selected as the console, if the
< * console is an UART of course. Note that we enforce that both stdin and
< * stdout are selected.
---
> * Get the package handle of the UART that is selected as the console, if
> * the console is an UART of course. Note that we enforce that both stdin
> * and stdout are selected.
118,119c126,127
< * Get the address of the UART that's selected as the debug port. Since
< * there's no place for this in the OF, we use the kernel environment
---
> * Get the package handle of the UART that's selected as the debug port.
> * Since there's no place for this in the OF, we use the kernel environment
140a149,154
> /*
> * Get the package handle of the device that is selected as the keyboard
> * port.
> * XXX this also matches PS/2 keyboard controllers and most likely also
> * USB keyboards.
> */
202c216,218
< di->bas.chan = uart_cpu_channel(dev);
---
> /* SAB82532 are only known to be used for TTYs. */
> if ((di->bas.chan = uart_cpu_channel(dev)) == 0)
> return (ENXIO);
206c222,232
< di->bas.chan = uart_cpu_channel(dev);
---
> if ((di->bas.chan = uart_cpu_channel(dev)) == 0) {
> /*
> * There's no way to determine from OF which
> * channel has the keyboard. Should always be
> * on channel 1 however.
> */
> if (devtype == UART_DEV_KEYBOARD)
> di->bas.chan = 1;
> else
> return (ENXIO);
> }