From 145341e9cd19bfb5ee570ff079caaefaae37dbd8 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Thu, 26 Sep 2013 18:01:32 +0000 Subject: [PATCH] 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) --- sys/powerpc/pseries/phyp_console.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c index 8f66f146957..a72fe80c442 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);