From owner-svn-src-projects@FreeBSD.ORG Thu Feb 5 18:39:29 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B918106564A; Thu, 5 Feb 2009 18:39:29 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 310188FC0C; Thu, 5 Feb 2009 18:39:29 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n15IdTLg034537; Thu, 5 Feb 2009 18:39:29 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n15IdTVC034536; Thu, 5 Feb 2009 18:39:29 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902051839.n15IdTVC034536@svn.freebsd.org> From: Sam Leffler Date: Thu, 5 Feb 2009 18:39:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188161 - projects/cambria/sys/dev/uart X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2009 18:39:29 -0000 Author: sam Date: Thu Feb 5 18:39:28 2009 New Revision: 188161 URL: http://svn.freebsd.org/changeset/base/188161 Log: o add ier_mask hint so xscale hack can be made less of a hack o print hint overrides with bootverbose Modified: projects/cambria/sys/dev/uart/uart_dev_ns8250.c Modified: projects/cambria/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- projects/cambria/sys/dev/uart/uart_dev_ns8250.c Thu Feb 5 18:38:39 2009 (r188160) +++ projects/cambria/sys/dev/uart/uart_dev_ns8250.c Thu Feb 5 18:39:28 2009 (r188161) @@ -396,8 +396,8 @@ ns8250_bus_attach(struct uart_softc *sc) ns8250->mcr = uart_getreg(bas, REG_MCR); ns8250->fcr = FCR_ENABLE; - if (!resource_int_value("uart", device_get_unit(sc->sc_dev), "flags", - &ivar)) { + if (resource_int_value("uart", device_get_unit(sc->sc_dev), "flags", + &ivar) == 0) { if (UART_FLAGS_FCR_RX_LOW(ivar)) ns8250->fcr |= FCR_RX_LOW; else if (UART_FLAGS_FCR_RX_MEDL(ivar)) @@ -406,20 +406,30 @@ ns8250_bus_attach(struct uart_softc *sc) ns8250->fcr |= FCR_RX_HIGH; else ns8250->fcr |= FCR_RX_MEDH; + if (bootverbose) + device_printf(sc->sc_dev, "fcr 0x%x\n", ns8250->fcr); } else ns8250->fcr |= FCR_RX_MEDH; /* Get IER mask */ - ivar = 0xf0; - resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_mask", - &ivar); - ns8250->ier_mask = (uint8_t)(ivar & 0xff); + if (resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_mask", + &ivar) == 0) { + ns8250->ier_mask = (uint8_t)(ivar & 0xff); + if (bootverbose) + device_printf(sc->sc_dev, "ier_mask 0x%x\n", + ns8250->ier_mask); + } else + ns8250->ier_mask = 0xf0; /* Get IER RX interrupt bits */ - ivar = IER_EMSC | IER_ERLS | IER_ERXRDY; - resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_rxbits", - &ivar); - ns8250->ier_rxbits = (uint8_t)(ivar & 0xff); + if (resource_int_value("uart", device_get_unit(sc->sc_dev), + "ier_rxbits", &ivar) == 0) { + ns8250->ier_rxbits = (uint8_t)(ivar & 0xff); + if (bootverbose) + device_printf(sc->sc_dev, "ier_rxbits 0x%x\n", + ns8250->ier_rxbits); + } else + ns8250->ier_rxbits = IER_EMSC | IER_ERLS | IER_ERXRDY; uart_setreg(bas, REG_FCR, ns8250->fcr); uart_barrier(bas);