From owner-svn-src-all@FreeBSD.ORG Fri May 1 21:43:04 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96F1C106571A; Fri, 1 May 2009 21:43:04 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69C248FC15; Fri, 1 May 2009 21:43:04 +0000 (UTC) (envelope-from mav@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 n41Lh4Hm054075; Fri, 1 May 2009 21:43:04 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n41Lh4uS054073; Fri, 1 May 2009 21:43:04 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200905012143.n41Lh4uS054073@svn.freebsd.org> From: Alexander Motin Date: Fri, 1 May 2009 21:43:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191733 - in head/sys: amd64/isa isa X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 01 May 2009 21:43:06 -0000 Author: mav Date: Fri May 1 21:43:04 2009 New Revision: 191733 URL: http://svn.freebsd.org/changeset/base/191733 Log: Add resume methods to i8254 and atrtc devices. Modified: head/sys/amd64/isa/clock.c head/sys/isa/atrtc.c Modified: head/sys/amd64/isa/clock.c ============================================================================== --- head/sys/amd64/isa/clock.c Fri May 1 21:31:39 2009 (r191732) +++ head/sys/amd64/isa/clock.c Fri May 1 21:43:04 2009 (r191733) @@ -376,6 +376,17 @@ set_i8254_freq(u_int freq, int intr_freq mtx_unlock_spin(&clock_lock); } +static void +i8254_restore(void) +{ + + mtx_lock_spin(&clock_lock); + outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); + outb(TIMER_CNTR0, i8254_real_max_count & 0xff); + outb(TIMER_CNTR0, i8254_real_max_count >> 8); + mtx_unlock_spin(&clock_lock); +} + /* This is separate from startrtclock() so that it can be called early. */ void i8254_init(void) @@ -558,6 +569,14 @@ attimer_attach(device_t dev) return(0); } +static int +attimer_resume(device_t dev) +{ + + i8254_restore(); + return(0); +} + static device_method_t attimer_methods[] = { /* Device interface */ DEVMETHOD(device_probe, attimer_probe), @@ -565,7 +584,7 @@ static device_method_t attimer_methods[] DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_resume, attimer_resume), { 0, 0 } }; Modified: head/sys/isa/atrtc.c ============================================================================== --- head/sys/isa/atrtc.c Fri May 1 21:31:39 2009 (r191732) +++ head/sys/isa/atrtc.c Fri May 1 21:43:04 2009 (r191733) @@ -190,6 +190,13 @@ atrtc_attach(device_t dev) return(0); } +static int +atrtc_resume(device_t dev) +{ + + atrtc_restore(); + return(0); +} static int atrtc_settime(device_t dev __unused, struct timespec *ts) @@ -264,8 +271,7 @@ static device_method_t atrtc_methods[] = DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX stop statclock? */ - DEVMETHOD(device_resume, bus_generic_resume), - /* XXX restart statclock? */ + DEVMETHOD(device_resume, atrtc_resume), /* clock interface */ DEVMETHOD(clock_gettime, atrtc_gettime),