Author: nwhitehorn
Date: Thu Sep 26 18:01:32 2013
New Revision: 255895
URL: http://svnweb.freebsd.org/changeset/base/255895
Log:
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)
Modified:
head/sys/powerpc/pseries/phyp_console.c
Modified: head/sys/powerpc/pseries/phyp_console.c
==============================================================================
--- head/sys/powerpc/pseries/phyp_console.c Thu Sep 26 18:00:45 2013
(r255894)
+++ head/sys/powerpc/pseries/phyp_console.c Thu Sep 26 18:01:32 2013
(r255895)
@@ -150,6 +150,7 @@ uart_phyp_probe_node(struct uart_phyp_so
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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
