From owner-cvs-src@FreeBSD.ORG Mon Oct 17 02:17:49 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 8634716A41F; Mon, 17 Oct 2005 02:17:49 +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 55BA243D46; Mon, 17 Oct 2005 02:17:49 +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 j9H2HnOl017432; Mon, 17 Oct 2005 02:17:49 GMT (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9H2Hnjp017431; Mon, 17 Oct 2005 02:17:49 GMT (envelope-from imp) Message-Id: <200510170217.j9H2Hnjp017431@repoman.freebsd.org> From: Warner Losh Date: Mon, 17 Oct 2005 02:17:49 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/dev/ed if_ed_pci.c 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: Mon, 17 Oct 2005 02:17:49 -0000 imp 2005-10-17 02:17:49 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/dev/ed if_ed_pci.c if_ed_rtl80x9.c Log: MFC: Fixes for RTL8029 and qemu. > imp 2005-10-13 22:06:02 UTC > Modified files: > sys/dev/ed if_ed_rtl80x9.c > Log: > o Fix probing of rtl80x9 parts. We shouldn't be calling > ed_probe_generic8390 where we're calling it. It will be done as part > of ed_probe_Novel_generic after things are setup in a way that > ed_probe_generic8390 will grok. > o Fix operator precedence botch that causes a panic when setting the media > type for 10baseT connections. > o Save the type of device so that it prints with the rest of the probe. > > # this should make it work with qemu again, but only if it has my patches > # to actually implement the RTL8029 specific registers. > Revision Changes Path > 1.2 +6 -5 src/sys/dev/ed/if_ed_rtl80x9.c > > Modified files: > sys/dev/ed if_ed_pci.c > Log: > If we can't probe the RTL80x9 for some reason, fall back to probing it > as a Novell NE-2000. This is necessary for unpatched qemu working > correctly. qemu claims to be a RTL8029, but doesn't implement the > RTL8029 specific registers at this time. I've created patches for > that, but there's no reason we can't use qemu's emulation w/o these > patches. This should make life easier for those folks that boot > FreeBSD via qemu. > Revision Changes Path > 1.48 +9 -2 src/sys/dev/ed/if_ed_pci.c Approved by: re@ (kensmith) Revision Changes Path 1.43.2.3 +9 -2 src/sys/dev/ed/if_ed_pci.c 1.1.2.2 +6 -5 src/sys/dev/ed/if_ed_rtl80x9.c