From owner-freebsd-mobile  Wed Oct 22 14:34:21 1997
Return-Path: <owner-freebsd-mobile>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id OAA29954
          for mobile-outgoing; Wed, 22 Oct 1997 14:34:21 -0700 (PDT)
          (envelope-from owner-freebsd-mobile)
Received: from ns.mt.sri.com (SRI-56K-FR.mt.net [206.127.65.42])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id OAA29940
          for <mobile@freebsd.org>; Wed, 22 Oct 1997 14:34:17 -0700 (PDT)
          (envelope-from nate@rocky.mt.sri.com)
Received: from rocky.mt.sri.com (rocky.mt.sri.com [206.127.76.100])
	by ns.mt.sri.com (8.8.7/8.8.7) with ESMTP id PAA03358;
	Wed, 22 Oct 1997 15:32:28 -0600 (MDT)
Received: (from nate@localhost) by rocky.mt.sri.com (8.7.5/8.7.3) id PAA11576; Wed, 22 Oct 1997 15:32:26 -0600 (MDT)
Date: Wed, 22 Oct 1997 15:32:26 -0600 (MDT)
Message-Id: <199710222132.PAA11576@rocky.mt.sri.com>
From: Nate Williams <nate@mt.sri.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: Nate Williams <nate@mt.sri.com>
Cc: Mike Smith <mike@smith.net.au>, mobile@freebsd.org
Subject: Re: Patches from -current for -stable I'd like to commit after testing 
In-Reply-To: <199710222122.PAA11535@rocky.mt.sri.com>
References: <199710211923.NAA07091@rocky.mt.sri.com>
	<199710220214.LAA00615@word.smith.net.au>
	<199710220418.WAA08580@rocky.mt.sri.com>
	<199710220423.WAA08641@rocky.mt.sri.com>
	<199710222122.PAA11535@rocky.mt.sri.com>
X-Mailer: VM 6.29 under 19.15 XEmacs Lucid
Sender: owner-freebsd-mobile@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

I wrote:
 I'd like to bring in most of the recent changes to 2.2, not that 2.2.5
 is out the door.  (I didn't want to break things for the release, and
 didn't have time to test them enough for the release.)

Mike:
 Can you hold off a couple of days?  Something you've changed recently 
 has broken PCCARD support on my Toshiba, but I haven't been able to 
 track it down yet.

My response:

 Can you try out this patch.

[ Note, This patch is against -current.  If you're running -current, can
you apply this patch and see if it makes any difference?  If it helps
(and solves Mike's problems), then I'll back this change out of -current
and continue on the with 2.2 merge.

]


Nate
ps. This is the same patch I mailed out, but I'm re-sending just in case
folks deleted it.

===================================================================
RCS file: /home/CVS/src/sys/pccard/pccard.c,v
retrieving revision 1.38
diff -c -r1.38 pccard.c
*** pccard.c	1997/10/06 05:46:03	1.38
--- pccard.c	1997/10/22 21:19:34
***************
*** 652,661 ****
  	 */
  	sp->pwr.vcc = 50;
  	sp->pwr.vpp = 0;
! 	if (sp->pwr_off_pending) {
! 		untimeout(power_off_slot, (caddr_t)sp, sp->poff_ch);
  		sp->ctrl->disable(sp);
- 	}
  	sp->pwr_off_pending = 0;
  	sp->ctrl->power(sp);
  	printf("Card inserted, slot %d\n", sp->slot);
--- 652,660 ----
  	 */
  	sp->pwr.vcc = 50;
  	sp->pwr.vpp = 0;
! 	untimeout(power_off_slot, (caddr_t)sp, sp->poff_ch);
! 	if (sp->pwr_off_pending)
  		sp->ctrl->disable(sp);
  	sp->pwr_off_pending = 0;
  	sp->ctrl->power(sp);
  	printf("Card inserted, slot %d\n", sp->slot);
Index: pccard.c