From owner-freebsd-bugs@FreeBSD.ORG Tue Aug 30 18:25:32 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5932C16A420 for ; Tue, 30 Aug 2005 18:25:32 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C8DB43F3E for ; Tue, 30 Aug 2005 18:20:01 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7UIK1uH075020 for ; Tue, 30 Aug 2005 18:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7UIK1Vt075019; Tue, 30 Aug 2005 18:20:01 GMT (envelope-from gnats) Resent-Date: Tue, 30 Aug 2005 18:20:01 GMT Resent-Message-Id: <200508301820.j7UIK1Vt075019@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Keiji Wada Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA83116A425 for ; Tue, 30 Aug 2005 18:11:01 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA88F43ED3 for ; Tue, 30 Aug 2005 18:07:06 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j7UI70fn021120 for ; Tue, 30 Aug 2005 18:07:00 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j7UI70gH021119; Tue, 30 Aug 2005 18:07:00 GMT (envelope-from nobody) Message-Id: <200508301807.j7UI70gH021119@www.freebsd.org> Date: Tue, 30 Aug 2005 18:07:00 GMT From: Keiji Wada To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: kern/85493: OLDCARD can't probe ed driver X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2005 18:25:32 -0000 >Number: 85493 >Category: kern >Synopsis: OLDCARD can't probe ed driver >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Aug 30 18:20:00 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Keiji Wada >Release: RELENG_5 >Organization: wada >Environment: FreeBSD spinach.net2.jp 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon Jul 18 17:53:57 JST 2005 keiji@spinach.net2.jp:/home/spinach/keiji/ftp/HARD/yacxm/sys/i386/compile/SPINACH i386 >Description: OLDCARD can't probe ed driver. pccardd recognize PCMCIA card with OLDCARD. But ed_pccard_probe use NEWCARD. >How-To-Repeat: The old machine with OLDCARD can't probe ed. >Fix: --- if_ed_pccard.c.1.59.2.3 Tue Aug 30 22:58:42 2005 +++ if_ed_pccard.c Wed Aug 31 02:48:09 2005 @@ -216,27 +216,28 @@ static int ed_pccard_probe(device_t dev) { - const struct ed_product *pp; int error; + int flags = device_get_flags(dev); - if ((pp = (const struct ed_product *) pccard_product_lookup(dev, - (const struct pccard_product *) ed_pccard_products, - sizeof(ed_pccard_products[0]), NULL)) == NULL) - return (ENXIO); - if (pp->flags & NE2000DVF_DL10019) { - error = ed_probe_Novell(dev, 0, 0); - if (error == 0) - error = ed_pccard_Linksys(dev); - ed_release_resources(dev); - if (error == 0) - goto end2; - } - if (pp->flags & NE2000DVF_AX88190) { + if (ED_FLAGS_GETTYPE(flags) == ED_FLAGS_AX88190) { error = ed_pccard_ax88190(dev); - if (error == 0) - goto end2; + goto end2; } - error = ed_probe_Novell(dev, 0, 0); + + error = ed_probe_Novell(dev, 0, flags); + if (error == 0) + goto end; + ed_release_resources(dev); + + error = ed_probe_WD80x3(dev, 0, flags); + if (error == 0) + goto end; + ed_release_resources(dev); + goto end2; + +end: + if (ED_FLAGS_GETTYPE(flags) & ED_FLAGS_LINKSYS) + ed_pccard_Linksys(dev); end2: if (error == 0) error = ed_alloc_irq(dev, 0, 0); >Release-Note: >Audit-Trail: >Unformatted: