From owner-cvs-src@FreeBSD.ORG Sat Oct 22 05:14:19 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org 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 763EB16A41F; Sat, 22 Oct 2005 05:14:19 +0000 (GMT) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31B0A43D45; Sat, 22 Oct 2005 05:14:19 +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 j9M5EJNX073789; Sat, 22 Oct 2005 05:14:19 GMT (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9M5EJl7073788; Sat, 22 Oct 2005 05:14:19 GMT (envelope-from imp) Message-Id: <200510220514.j9M5EJl7073788@repoman.freebsd.org> From: Warner Losh Date: Sat, 22 Oct 2005 05:14:19 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/dev/ed if_ed_rtl80x9.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 22 Oct 2005 05:14:19 -0000 imp 2005-10-22 05:14:19 UTC FreeBSD src repository Modified files: sys/dev/ed if_ed_rtl80x9.c Log: In the ISA case, we call ed_probe_WD80x3 before we call ed_probe_rtl80x9. In the pci case we call ed_probe_rtl80x9 first. In the PCI case we were using the correct nic_offset by accident because softc is initialized to zero. In the isa case we were using the wrong value by accident, since ed_probe_WD80x3 sets the offset value to 0x10. This lead to the identification routines failing. Fix this problem by always initalizing the nic_offset and asic_offset before making ed_{asic,nic}_{in,out}* calls. Revision Changes Path 1.3 +3 -3 src/sys/dev/ed/if_ed_rtl80x9.c