From owner-cvs-all Tue Mar 21 12:33:13 2000 Delivered-To: cvs-all@freebsd.org Received: from awfulhak.org (tun.AwfulHak.org [194.242.139.173]) by hub.freebsd.org (Postfix) with ESMTP id 32AF437BE1E; Tue, 21 Mar 2000 12:29:49 -0800 (PST) (envelope-from brian@Awfulhak.org) Received: from hak.lan.Awfulhak.org (root@hak.lan.awfulhak.org [172.16.0.12]) by awfulhak.org (8.9.3/8.9.3) with ESMTP id UAA22010; Tue, 21 Mar 2000 20:29:33 GMT (envelope-from brian@hak.lan.Awfulhak.org) Received: from hak.lan.Awfulhak.org (localhost [127.0.0.1]) by hak.lan.Awfulhak.org (8.9.3/8.9.3) with ESMTP id RAA00548; Tue, 21 Mar 2000 17:41:35 GMT (envelope-from brian@hak.lan.Awfulhak.org) Message-Id: <200003211741.RAA00548@hak.lan.Awfulhak.org> X-Mailer: exmh version 2.1.1 10/15/1999 To: Cameron Grant Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, brian@hak.lan.Awfulhak.org Subject: Re: cvs commit: src/sys/dev/sound/pcm ac97.c ac97.h sound.c sound.h src/sys/dev/sound/pci aureal.c csapcm.c es137x.c neomagic.c t4dwave.c In-Reply-To: Message from Cameron Grant of "Mon, 20 Mar 2000 07:30:51 PST." <200003201530.HAA50720@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 21 Mar 2000 17:41:35 +0000 From: Brian Somers Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG This jams my PCG-F190 at probe time. I get > pci0: at 8.0 irq 9 > pcm0: mem 0xfec00000-0xfecfffff,0xfe000000-0xfe3fffff irq 9 at device 8.1 on pci0 And then a lock-up. When I apply the attached patch, things work for a while, but the machine seems keen on hanging still.... FWIW, the proble line that never happens when ac97_initmixer() is called is: > chip2: mem 0xfe7ffc00-0xfe7ffdff irq 9 at device 9.0 on pci0 Any suggestions ? [.....] > cg 2000/03/20 07:30:51 PST > > Modified files: > sys/dev/sound/pcm ac97.c ac97.h sound.c sound.h > sys/dev/sound/pci aureal.c csapcm.c es137x.c neomagic.c > t4dwave.c > Log: > update the ac97 layer: > * add a callback for initialising the mixer interface > * support ac97 2.1 variable rate audio feature > > fix ac97-using drivers for the above > > add suspend/resume support for neomagic > > Revision Changes Path > 1.6 +136 -63 src/sys/dev/sound/pcm/ac97.c > 1.4 +44 -2 src/sys/dev/sound/pcm/ac97.h > 1.18 +8 -1 src/sys/dev/sound/pcm/sound.c > 1.11 +2 -1 src/sys/dev/sound/pcm/sound.h > 1.9 +2 -2 src/sys/dev/sound/pci/aureal.c > 1.9 +2 -2 src/sys/dev/sound/pci/csapcm.c > 1.14 +2 -2 src/sys/dev/sound/pci/es137x.c > 1.8 +37 -3 src/sys/dev/sound/pci/neomagic.c > 1.10 +2 -2 src/sys/dev/sound/pci/t4dwave.c -- Brian Don't _EVER_ lose your sense of humour ! Index: ac97.c =================================================================== RCS file: /home/ncvs/src/sys/dev/sound/pcm/ac97.c,v retrieving revision 1.6 diff -u -r1.6 ac97.c --- ac97.c 2000/03/20 15:30:46 1.6 +++ ac97.c 2000/03/21 17:33:22 @@ -374,7 +374,9 @@ struct ac97_info *codec = mix_getdevinfo(m); if (codec == NULL) return -1; +/* ac97_initmixer(codec); +*/ mix_setdevs(m, ac97mixdevs | ((codec->caps & 4)? SOUND_MASK_BASS | SOUND_MASK_TREBLE : 0)); mix_setrecdevs(m, ac97recdevs); return 0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message