From owner-svn-src-stable@FreeBSD.ORG Wed Mar 6 11:08:00 2013 Return-Path: Delivered-To: svn-src-stable@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 769A0921; Wed, 6 Mar 2013 11:08:00 +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 5A0EB215; Wed, 6 Mar 2013 11:08:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r26B8075085681; Wed, 6 Mar 2013 11:08:00 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r26B7x9m085663; Wed, 6 Mar 2013 11:07:59 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201303061107.r26B7x9m085663@svn.freebsd.org> From: Andriy Gapon Date: Wed, 6 Mar 2013 11:07:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r247887 - stable/9/sys/dev/uart X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Mar 2013 11:08:00 -0000 Author: avg Date: Wed Mar 6 11:07:59 2013 New Revision: 247887 URL: http://svnweb.freebsd.org/changeset/base/247887 Log: MFC r246243: uart: add resume method and enable it for attachments on the most common x86 buses Modified: stable/9/sys/dev/uart/uart_bus.h stable/9/sys/dev/uart/uart_bus_acpi.c stable/9/sys/dev/uart/uart_bus_isa.c stable/9/sys/dev/uart/uart_bus_pci.c stable/9/sys/dev/uart/uart_core.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/uart/uart_bus.h ============================================================================== --- stable/9/sys/dev/uart/uart_bus.h Wed Mar 6 11:02:44 2013 (r247886) +++ stable/9/sys/dev/uart/uart_bus.h Wed Mar 6 11:07:59 2013 (r247887) @@ -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/9/sys/dev/uart/uart_bus_acpi.c ============================================================================== --- stable/9/sys/dev/uart/uart_bus_acpi.c Wed Mar 6 11:02:44 2013 (r247886) +++ stable/9/sys/dev/uart/uart_bus_acpi.c Wed Mar 6 11:07:59 2013 (r247887) @@ -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/9/sys/dev/uart/uart_bus_isa.c ============================================================================== --- stable/9/sys/dev/uart/uart_bus_isa.c Wed Mar 6 11:02:44 2013 (r247886) +++ stable/9/sys/dev/uart/uart_bus_isa.c Wed Mar 6 11:07:59 2013 (r247887) @@ -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/9/sys/dev/uart/uart_bus_pci.c ============================================================================== --- stable/9/sys/dev/uart/uart_bus_pci.c Wed Mar 6 11:02:44 2013 (r247886) +++ stable/9/sys/dev/uart/uart_bus_pci.c Wed Mar 6 11:07:59 2013 (r247887) @@ -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/9/sys/dev/uart/uart_core.c ============================================================================== --- stable/9/sys/dev/uart/uart_core.c Wed Mar 6 11:02:44 2013 (r247886) +++ stable/9/sys/dev/uart/uart_core.c Wed Mar 6 11:07:59 2013 (r247887) @@ -577,3 +577,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)); +}