From owner-cvs-all Tue Nov 28 6:49:11 2000 Delivered-To: cvs-all@freebsd.org Received: from goro.asahi-net.or.jp (goro.asahi-net.or.jp [202.224.39.40]) by hub.freebsd.org (Postfix) with ESMTP id 7D59037B400; Tue, 28 Nov 2000 06:49:04 -0800 (PST) Received: from localhost (b139161.ppp.asahi-net.or.jp [202.213.139.161]) by goro.asahi-net.or.jp (8.8.8/3.7W) with ESMTP id XAA04845; Tue, 28 Nov 2000 23:49:02 +0900 (JST) To: jon@freebsd.org Cc: cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/conf files src/sys/dev/cardbus cardbus.c src/sys/dev/pccbb pccbb.c pccbbvar.h pccbb_if.m src/sys/modules/cardbus Makefile src/sys/modules/pccbb Makefile From: Takeshi Shibagaki In-Reply-To: <200011280005.QAA10973@freefall.freebsd.org> References: <200011280005.QAA10973@freefall.freebsd.org> X-Mailer: Mew version 1.94b32 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20001128234924C.ie9t-sbgk@asahi-net.or.jp> Date: Tue, 28 Nov 2000 23:49:24 +0900 X-Dispatcher: imput version 990604(IM116) Lines: 56 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi, Jonathan. From: Jonathan Chen Subject: cvs commit: src/sys/conf files src/sys/dev/cardbus cardbus.c src/sys/dev/pccbb pccbb.c pccbbvar.h pccbb_if.m src/sys/modules/cardbus Makefile src/sys/modules/pccbb Makefile Date: Mon, 27 Nov 2000 16:05:20 -0800 (PST) Message-ID: <200011280005.QAA10973@freefall.freebsd.org> jon> jon 2000/11/27 16:05:20 PST jon> jon> Modified files: jon> sys/conf files jon> sys/dev/cardbus cardbus.c jon> sys/dev/pccbb pccbb.c pccbbvar.h jon> sys/modules/cardbus Makefile jon> Added files: jon> sys/modules/pccbb Makefile jon> Removed files: jon> sys/dev/pccbb pccbb_if.m jon> Log: jon> A bunch of newcard/cardbus changes that's been sitting in my tree for a while: jon> jon> - Make pccbb/cardbus kld loadable and unloadable. jon> - Make pccbb/cardbus use the power interface from pccard instead of inventing its own. jon> - some other minor fixes Make of NEWCARD don't succeed because of this change. I made a quick hack at temporary. diff -ruN current/src/sys/dev/cardbus/cardbus.c NEWCARD_TEST/src/sys/dev/cardbus/cardbus.c --- current/src/sys/dev/cardbus/cardbus.c Tue Nov 28 22:07:39 2000 +++ NEWCARD_TEST/src/sys/dev/cardbus/cardbus.c Tue Nov 28 22:30:27 2000 @@ -71,6 +71,8 @@ #define DEVPRINTF(x) #endif +#define DETACH_FORCE 0x1 + #if !defined(lint) static const char rcsid[] = "$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.5 2000/11/28 00:52:40 jon Exp $"; diff -ruN current/src/sys/dev/pccbb/pccbb.c NEWCARD_TEST/src/sys/dev/pccbb/pccbb.c --- current/src/sys/dev/pccbb/pccbb.c Tue Nov 28 22:07:42 2000 +++ NEWCARD_TEST/src/sys/dev/pccbb/pccbb.c Tue Nov 28 22:37:20 2000 @@ -83,6 +83,8 @@ #define DEVPRINTF(x) #endif +#define DETACH_FORCE 0x1 + #define PCI_MASK_CONFIG(DEV,REG,MASK,SIZE) \ pci_write_config(DEV, REG, pci_read_config(DEV, REG, SIZE) MASK, SIZE) #define PCI_MASK2_CONFIG(DEV,REG,MASK1,MASK2,SIZE) \ Takeshi Shibagki ie9t-sbgk@asahi-net.or.jp To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message