From owner-svn-src-all@FreeBSD.ORG Sat Jul 6 08:37:44 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E017B249; Sat, 6 Jul 2013 08:37:44 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C18991DDD; Sat, 6 Jul 2013 08:37:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r668biMO085700; Sat, 6 Jul 2013 08:37:44 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r668bhu0085695; Sat, 6 Jul 2013 08:37:43 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307060837.r668bhu0085695@svn.freebsd.org> From: Andriy Gapon Date: Sat, 6 Jul 2013 08:37:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r252870 - stable/8/sys/dev/uart X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jul 2013 08:37:45 -0000 Author: avg Date: Sat Jul 6 08:37:43 2013 New Revision: 252870 URL: http://svnweb.freebsd.org/changeset/base/252870 Log: MFC r246243: uart: add resume method and enable it for attachments on the most common x86 buses Modified: stable/8/sys/dev/uart/uart_bus.h stable/8/sys/dev/uart/uart_bus_acpi.c stable/8/sys/dev/uart/uart_bus_isa.c stable/8/sys/dev/uart/uart_bus_pci.c stable/8/sys/dev/uart/uart_core.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/uart/ (props changed) Modified: stable/8/sys/dev/uart/uart_bus.h ============================================================================== --- stable/8/sys/dev/uart/uart_bus.h Sat Jul 6 08:30:45 2013 (r252869) +++ stable/8/sys/dev/uart/uart_bus.h Sat Jul 6 08:37:43 2013 (r252870) @@ -137,6 +137,7 @@ extern char uart_driver_name[]; int uart_bus_attach(device_t dev); int uart_bus_detach(device_t dev); +int uart_bus_resume(device_t dev); serdev_intr_t *uart_bus_ihand(device_t dev, int ipend); int uart_bus_ipend(device_t dev); int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan); Modified: stable/8/sys/dev/uart/uart_bus_acpi.c ============================================================================== --- stable/8/sys/dev/uart/uart_bus_acpi.c Sat Jul 6 08:30:45 2013 (r252869) +++ stable/8/sys/dev/uart/uart_bus_acpi.c Sat Jul 6 08:37:43 2013 (r252870) @@ -47,6 +47,7 @@ static device_method_t uart_acpi_methods DEVMETHOD(device_probe, uart_acpi_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), + DEVMETHOD(device_resume, uart_bus_resume), { 0, 0 } }; Modified: stable/8/sys/dev/uart/uart_bus_isa.c ============================================================================== --- stable/8/sys/dev/uart/uart_bus_isa.c Sat Jul 6 08:30:45 2013 (r252869) +++ stable/8/sys/dev/uart/uart_bus_isa.c Sat Jul 6 08:37:43 2013 (r252870) @@ -50,6 +50,7 @@ static device_method_t uart_isa_methods[ DEVMETHOD(device_probe, uart_isa_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), + DEVMETHOD(device_resume, uart_bus_resume), { 0, 0 } }; Modified: stable/8/sys/dev/uart/uart_bus_pci.c ============================================================================== --- stable/8/sys/dev/uart/uart_bus_pci.c Sat Jul 6 08:30:45 2013 (r252869) +++ stable/8/sys/dev/uart/uart_bus_pci.c Sat Jul 6 08:37:43 2013 (r252870) @@ -51,6 +51,7 @@ static device_method_t uart_pci_methods[ DEVMETHOD(device_probe, uart_pci_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), + DEVMETHOD(device_resume, uart_bus_resume), DEVMETHOD_END }; Modified: stable/8/sys/dev/uart/uart_core.c ============================================================================== --- stable/8/sys/dev/uart/uart_core.c Sat Jul 6 08:30:45 2013 (r252869) +++ stable/8/sys/dev/uart/uart_core.c Sat Jul 6 08:37:43 2013 (r252870) @@ -578,3 +578,12 @@ uart_bus_detach(device_t dev) return (0); } + +int +uart_bus_resume(device_t dev) +{ + struct uart_softc *sc; + + sc = device_get_softc(dev); + return (UART_ATTACH(sc)); +}