From owner-cvs-all Fri Oct 15 10:29:24 1999 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 3933C150EC; Fri, 15 Oct 1999 10:29:22 -0700 (PDT) (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA10845; Fri, 15 Oct 1999 10:29:22 -0700 (PDT) (envelope-from imp@FreeBSD.org) Message-Id: <199910151729.KAA10845@freefall.freebsd.org> From: Warner Losh Date: Fri, 15 Oct 1999 10:29:22 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/i386/conf LINT PCCARD src/sys/pccard driver.h pccard.c pccard_nbk.c pcic.c Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk imp 1999/10/15 10:29:22 PDT Modified files: sys/i386/conf LINT PCCARD sys/pccard driver.h pccard.c pccard_nbk.c pcic.c Log: Reorganize the attachement point for pcic (it was unattached and floating before). Attach pccard devices to pcic, one per slot (although this may change to one per pcic). pcic is now attached to isa (to act as a bridge) and pccard is attached to pcic, cbb and pc98ic (the last two are card bus bridge and the pc98ic version of pcic, neither of which are in the tree yet). Move pccard compat code into pccard/pccard_compat.c. THIS REQUIRES A CONFIG FILE CHANGE. You must change your pcic/card entries to be: # PCCARD (PCMCIA) support controller pcic0 at isa? controller pcic1 at isa? controller card0 The old system was upside down and this corrects that problem. It will make it easier to add support for YENTA pccard/card bus bridges. Much more cleanup needs to happen before newbus devices can have pccard attachments. My previous commit's comments were premature. Revision Changes Path 1.659 +5 -5 src/sys/i386/conf/LINT 1.21 +3 -3 src/sys/i386/conf/PCCARD 1.10 +1 -2 src/sys/pccard/driver.h 1.89 +2 -4 src/sys/pccard/pccard.c 1.7 +5 -170 src/sys/pccard/pccard_nbk.c 1.78 +46 -124 src/sys/pccard/pcic.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message