From owner-cvs-src@FreeBSD.ORG Wed Jan 26 05:21:13 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 087F816A4CE; Wed, 26 Jan 2005 05:21:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E77CC43D3F; Wed, 26 Jan 2005 05:21:12 +0000 (GMT) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q5LCqJ012362; Wed, 26 Jan 2005 05:21:12 GMT (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q5LC68012361; Wed, 26 Jan 2005 05:21:12 GMT (envelope-from imp) Message-Id: <200501260521.j0Q5LC68012361@repoman.freebsd.org> From: Warner Losh Date: Wed, 26 Jan 2005 05:21:12 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/ed if_ed_pccard.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 05:21:13 -0000 imp 2005-01-26 05:21:12 UTC FreeBSD src repository Modified files: sys/dev/ed if_ed_pccard.c Log: Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now... Revision Changes Path 1.67 +28 -35 src/sys/dev/ed/if_ed_pccard.c