Date: Thu, 26 Sep 2013 18:01:32 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255895 - head/sys/powerpc/pseries Message-ID: <201309261801.r8QI1Wk2078007@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309261801.r8QI1Wk2078007>