From owner-freebsd-bugs Mon Aug 7 5:40: 8 2000 Delivered-To: freebsd-bugs@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 8EA5A37B6F3 for ; Mon, 7 Aug 2000 05:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id FAA66530; Mon, 7 Aug 2000 05:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Date: Mon, 7 Aug 2000 05:40:02 -0700 (PDT) Message-Id: <200008071240.FAA66530@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: "Eric Masson" Subject: Re: kern/17796: pcm drivers failes to load for Neomagic on IBM Thinkpad 390 Reply-To: "Eric Masson" Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR kern/17796; it has been noted by GNATS. From: "Eric Masson" To: freebsd-gnats-submit@FreeBSD.org, mavetju@chello.nl Cc: Subject: Re: kern/17796: pcm drivers failes to load for Neomagic on IBM Thinkpad 390 Date: Mon, 7 Aug 2000 14:24:49 +0200 Hello, Here's a quick'n'dirty fix. Add a kernel option to disable probing of Neomagic 256AV chip by pcm. Kernel configuration file options NEOMAGIC_TP390 device pcm0 at isa? port 0x530 irq 5 drq 0 flags 0x11 Here are the diffs to implement the kernel option : --- options.i386.orig Mon Aug 7 13:16:44 2000 +++ options.i386 Mon Aug 7 13:19:43 2000 @@ -139,6 +139,9 @@ GUS_DMA opt_sound.h GUS_IRQ opt_sound.h +# newpcm options +NEOMAGIC_TP390 opt_sound.h + # Video spigot SPIGOT_UNSECURE opt_spigot.h --- neomagic.c.orig Mon Aug 7 12:42:31 2000 +++ neomagic.c Mon Aug 7 13:39:05 2000 @@ -28,6 +28,7 @@ * $FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.7.2.3 2000/07/19 21:18:45 cg Exp $ */ +#include #include #include #include @@ -560,10 +561,14 @@ nm_pci_probe(device_t dev) { char *s = NULL; - u_int32_t subdev, i; + u_int32_t subdev; +#ifndef NEOMAGIC_TP390 + u_int32_t i; +#endif subdev = (pci_get_subdevice(dev) << 16) | pci_get_subvendor(dev); switch (pci_get_devid(dev)) { +#ifndef NEOMAGIC_TP390 case NM256AV_PCI_ID: i = 0; while ((i < NUM_BADCARDS) && (badcards[i] != subdev)) @@ -573,6 +578,7 @@ DEB(else) DEB(device_printf(dev, "this is a non-ac97 NM256AV, not attaching\n")); break; +#endif case NM256ZX_PCI_ID: s = "NeoMagic 256ZX"; Regards Eric Masson -- Progress : (n) What led from smart users in front of dumb terminals to dumb users in front of smart terminals. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message