diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-09-26 18:01:32 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-09-26 18:01:32 +0000 |
| commit | a36e4362836c62ebed712e28559610c4c9dc63ea (patch) | |
| tree | 9e7a20879ef0428466f1208f2d1d7b4564367464 /sys/powerpc/pseries | |
| parent | ce5f424576ec3324fb23f4605341d38da946f21d (diff) | |
| download | FreeBSD-src-a36e4362836c62ebed712e28559610c4c9dc63ea.zip FreeBSD-src-a36e4362836c62ebed712e28559610c4c9dc63ea.tar.gz | |
Fix bug where UART unit number was not set properly, which prevented
operation on systems with multiple serial ports. Also turn on
interrupts for the UART device, which were disabled due to a
now-fixed bug in QEMU.
Approved by: re (gjb)
Diffstat (limited to 'sys/powerpc/pseries')
| -rw-r--r-- | sys/powerpc/pseries/phyp_console.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c index 8f66f14..a72fe80 100644 --- a/sys/powerpc/pseries/phyp_console.c +++ b/sys/powerpc/pseries/phyp_console.c @@ -150,6 +150,7 @@ uart_phyp_probe_node(struct uart_phyp_softc *sc) OF_getprop(node, "reg", ®, sizeof(reg)); if (reg == -1) return (ENXIO); + sc->vtermid = reg; sc->node = node; if (OF_getprop(node, "compatible", buf, sizeof(buf)) <= 0) @@ -251,12 +252,8 @@ uart_phyp_attach(device_t dev) } sc->irqrid = 0; -#ifdef NOTYET sc->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqrid, RF_ACTIVE | RF_SHAREABLE); -#else - sc->irqres = NULL; -#endif if (sc->irqres != NULL) { bus_setup_intr(dev, sc->irqres, INTR_TYPE_TTY | INTR_MPSAFE, NULL, uart_phyp_intr, sc, &sc->sc_icookie); |
