From owner-cvs-all Wed Feb 23 3:50:13 2000 Delivered-To: cvs-all@freebsd.org Received: from florence.pavilion.net (florence.pavilion.net [212.74.0.25]) by hub.freebsd.org (Postfix) with ESMTP id C53B537B769; Wed, 23 Feb 2000 03:50:08 -0800 (PST) (envelope-from joe@florence.pavilion.net) Received: (from joe@localhost) by florence.pavilion.net (8.9.3/8.8.8) id LAA22873; Wed, 23 Feb 2000 11:48:14 GMT (envelope-from joe) Date: Wed, 23 Feb 2000 11:48:13 +0000 From: Josef Karthauser To: Brian Somers Cc: Warner Losh , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, brian@hak.lan.awfulhak.org Subject: Re: cvs commit: src/sys/pccard pccard.c pccard_nbk.c pcic.c slot.h Message-ID: <20000223114813.K96773@florence.pavilion.net> References: <200002230110.BAA00750@hak.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0pre2i In-Reply-To: <200002230110.BAA00750@hak.lan.Awfulhak.org> X-NCC-RegID: uk.pavilion Organisation: Pavilion Internet plc, Lees House, 21-23 Dyke Road, Brighton, England Phone: +44-845-333-5000 Fax: +44-845-333-5001 Mobile: +44-403-596893 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk On Wed, Feb 23, 2000 at 01:10:21AM +0000, Brian Somers wrote: > > > Minor improvements in pcic. > > o Change IODF_ACTIVE to MDF_ACTIVE when dealing with memory. This is > > a text only change. > > o Better spl safty, ala comments from Bruce and the nomads. > > o Default to resetting the pcic on resume. This is needed for newer > > machines and may fix jordan's vaio problem. > > Doesn't help on mine (F190) :-( I can still successfully suspend & > resume, but the second suspend freezes the machine. I tried this > with a kernel from Joe's machine at FreeBSDCon - his machine worked > fine.... I suspect that I need a BIOS upgrade. Maybe I'll talk to > the VAIO folks. It still does. :) Does anyone fancy fixing resume support for the AC97 chipset? I've had a hack around, and now understand the mechanism, but my attempt to reinitialise failed :) with a hard hang. Joe Index: neomagic.c =================================================================== RCS file: /home/ncvs/src/sys/dev/sound/pci/neomagic.c,v retrieving revision 1.7 diff -u -r1.7 neomagic.c --- neomagic.c 2000/01/29 18:48:29 1.7 +++ neomagic.c 2000/02/23 11:48:44 @@ -644,10 +644,20 @@ return ENXIO; } +static int +nm_pci_resume(device_t dev) +{ + snddev_info *d = device_get_softc(dev); + snd_mixer *m = &d->mixer; + + return ac97mix_init(m); +} + static device_method_t nm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nm_pci_probe), DEVMETHOD(device_attach, nm_pci_attach), + DEVMETHOD(device_resume, nm_pci_resume), { 0, 0 } }; -- Josef Karthauser FreeBSD: Take the red pill and we'll show you just how Technical Manager deep the rabbit hole goes. (http://www.uk.freebsd.org) Pavilion Internet plc. [joe@pavilion.net, joe@freebsd.org, joe@tao.org.uk] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message