From owner-cvs-all Wed Feb 26 10:42: 4 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EC3E37B401; Wed, 26 Feb 2003 10:42:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E43743F3F; Wed, 26 Feb 2003 10:42:01 -0800 (PST) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1QIg10U000794; Wed, 26 Feb 2003 10:42:01 -0800 (PST) (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1QIg13P000792; Wed, 26 Feb 2003 10:42:01 -0800 (PST) Message-Id: <200302261842.h1QIg13P000792@repoman.freebsd.org> From: Warner Losh Date: Wed, 26 Feb 2003 10:42:01 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/pccard pccard.c pcic.c pcic_isa.c pcic_pci.c pcic_pci.h src/sys/dev/pccbb pccbbdevid.h X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG imp 2003/02/26 10:42:01 PST Modified files: (Branch: RELENG_4) sys/pccard pccard.c pcic.c pcic_isa.c pcic_pci.c pcic_pci.h sys/dev/pccbb pccbbdevid.h Log: MFC: Merge most of current's sys/pccard: o Vastly improve support for CLPD6729/30 on PCI Add-in cards. Built-in support remains unchanged. CLPD6729 are the only PCI devices that default to ISA mode interrupts. These changes are needed for the WL200 wireless card (and a few others) that use the '29 to bridge to a hardwired wireless pcmcia card. This also makes pci<->pcmcia "reader" cards based on the '29 work as well. o Additional debugging information in some failure modes. o Minor formatting changes for when resources aren't present. o Minor 3.3V support improvement for Ricoh ISA cards. o Minor commentary changes. o ti12xx_enable_pci_clock support (disabled by default since so few people need it). o SMC 34C90 id Some changes have not been merged at this time. I'll try to merge them and test them after 4.8 goes out the door. These changes are low risk to people who do not have the listed hardware (ricoh ISA bridges and CLPD 6729 PCI cards). Approved by: re@ 6729 reader card: donated by Shigeru Yamamoto-san Revision Changes Path 1.1.2.6 +6 -5 src/sys/dev/pccbb/pccbbdevid.h 1.106.2.15 +15 -9 src/sys/pccard/pccard.c 1.89.2.28 +15 -17 src/sys/pccard/pcic.c 1.13.2.8 +2 -2 src/sys/pccard/pcic_isa.c 1.54.2.22 +51 -28 src/sys/pccard/pcic_pci.c 1.23.2.12 +1 -0 src/sys/pccard/pcic_pci.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message