Date: Tue, 21 Oct 1997 22:18:50 -0600 (MDT) From: Nate Williams <nate@mt.sri.com> To: Mike Smith <mike@smith.net.au> Cc: Nate Williams <nate@mt.sri.com>, mobile@freebsd.org, handy@sag.space.lockheed.com Subject: Re: Patches from -current for -stable I'd like to commit after testing Message-ID: <199710220418.WAA08580@rocky.mt.sri.com> In-Reply-To: <199710220214.LAA00615@word.smith.net.au> References: <199710211923.NAA07091@rocky.mt.sri.com> <199710220214.LAA00615@word.smith.net.au>
next in thread | previous in thread | raw e-mail | index | archive | help
> > 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.)
>
> 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.
>
> (One killer is that the code now allocates IRQ 11 by default for the
> pcic, but IRQ 11 is used by "something" else that's not probed.
I changed the code to use the 'highest' un-allocated IRQ, because that's
what Win95 does and many machines used built-in IRQ's for IRQ 3.
> There
> needs to be a mechanism for explicitly specifying an IRQ for the pcic.)
Yes, there does. But, because of the current 'ISA' leanings of the
configuration, there isn't an easy way.
In the meantime, you could try backing out the change I made to see if
things start working again.
Nate
------ cut-n-pasto reverse patch follows -----------
RCS file: /home/CVS/src/sys/pccard/pccard.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pccard.c 1997/09/21 22:01:53 1.35
+++ pccard.c 1997/10/06 02:56:15 1.36
@@ -451,7 +451,7 @@
int irq;
unsigned int mask;
- for (irq = 1; irq < ICU_LEN; irq++) {
+ for (irq = ICU_LEN; irq > 0; irq--) {
mask = 1ul << irq;
if (!(mask & imask))
continue;
Index: pccard.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199710220418.WAA08580>