From owner-freebsd-mobile  Sun Apr 16 14:31:40 2000
Delivered-To: freebsd-mobile@freebsd.org
Received: from tasogare.imasy.or.jp (tasogare.imasy.or.jp [202.227.24.5])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9A22437B953; Sun, 16 Apr 2000 14:31:31 -0700 (PDT)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (isdnb15.imasy.or.jp [202.227.24.143])
	by tasogare.imasy.or.jp (8.9.3+3.2W/3.7W-tasogare/smtpfeed 1.04) with ESMTP id GAA82367;
	Mon, 17 Apr 2000 06:31:26 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Message-Id: <200004162131.GAA82367@tasogare.imasy.or.jp>
To: imp@FreeBSD.org
Cc: FreeBSD-mobile@FreeBSD.ORG
Subject: [NEWCARD] patch against panics (Re: cvs commit: src/sys/dev/pcic
 i82365.c i82365_isa.c i82365var.h
         src/sys/dev/pccard card_if.m pccard.c pccard_cis.c
 pccardvar.h)
In-Reply-To: Your message of "Wed, 12 Apr 2000 23:42:59 -0700 (PDT)"
	<200004130642.XAA39181@freefall.freebsd.org>
References: <200004130642.XAA39181@freefall.freebsd.org>
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Date: Mon, 17 Apr 2000 06:31:26 +0900
From: Mitsuru IWASAKI <iwasaki@jp.FreeBSD.org>
X-Dispatcher: imput version 980905(IM100)
Lines: 59
Sender: owner-freebsd-mobile@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

Hi, Warner-san,

>   This version now panics when we try to read the CIS.  The next batch
>   of work to make this work is what was outlined in my posting to mobile
>   about resource allocation and such.

I've just tried the latest NEWCARD, and noticed that someting wrong with
bus_space stuff.  Here is the patch to avoid panics, not for the solution :-)

# I'm going to bed...zzz

Index: dev/pccard/pccard_cis.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pccard/pccard_cis.c,v
retrieving revision 1.8
diff -u -r1.8 pccard_cis.c
--- dev/pccard/pccard_cis.c	2000/04/13 06:42:57	1.8
+++ dev/pccard/pccard_cis.c	2000/04/16 21:10:36
@@ -152,8 +152,12 @@
 	while (1) {
 		while (1) {
 			/* get the tuple code */
-
+#if 0
+			/* something wrong with macro or inline ...*/
 			tuple.code = pccard_cis_read_1(&tuple, tuple.ptr);
+#else
+			tuple.code = inb(tuple.memh + tuple.mult*tuple.ptr);
+#endif
 
 			/* two special-case tuples */
 
@@ -170,7 +174,11 @@
 					goto done;
 				}
 				tuple.ptr++;
+#if 0
 				break;
+#else
+				goto done;	/* to exit from loop :-) */
+#endif
 			}
 			/* now all the normal tuples */
 
Index: conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.353
diff -u -r1.353 files
--- conf/files	2000/04/15 03:34:09	1.353
+++ conf/files	2000/04/16 19:45:04
@@ -189,6 +189,7 @@
 dev/pccard/pccard.c	optional pccard
 dev/pccard/pccard_cis.c	optional pccard
 dev/pccard/pccard_cis_quirks.c optional pccard
+dev/pccard/card_if.m	optional pccard
 dev/pccard/power_if.m	optional pccard
 dev/pcic/i82365.c	optional pcic pccard
 dev/pcic/i82365_isa.c	optional pcic pccard


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-mobile" in the body of the message