Date: Thu, 14 Jun 2001 14:37:15 +0900 (JST) From: <shigeru@iij.ad.jp> To: imp@harmony.village.org Cc: current@FreeBSD.ORG Subject: Re: PCCARD and -current Message-ID: <20010614.143715.110847928.shigeru@iij.ad.jp> In-Reply-To: <200106102313.f5AND5V60475@harmony.village.org> References: <200106100140.f5A1egl17676@billy-club.village.org> <200106101846.f5AIkSl21015@billy-club.village.org> <200106102313.f5AND5V60475@harmony.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Next_Part(Thu_Jun_14_14:37:15_2001_123)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
I make a short patch to sharing IRQ between a PCIC and a PC Card when using
PCI IRQ routing.
#Does this patch help you?
-------
YAMAMOTO Shigeru Internet Initiative Japan Inc.
<shigeru@iij.ad.jp> Network Engineering Div.
----Next_Part(Thu_Jun_14_14:37:15_2001_123)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="pcic.diff"
Index: pcic.c
===================================================================
RCS file: /share/cvsup/FreeBSD/current/usr/src/sys/pccard/pcic.c,v
retrieving revision 1.141
diff -u -r1.141 pcic.c
--- pcic.c 2001/06/04 03:29:06 1.141
+++ pcic.c 2001/06/13 04:18:17
@@ -805,8 +805,13 @@
/*
* If we're routing via pci, we can share.
*/
- if (sc->func_route == pci_parallel && type == SYS_RES_IRQ)
+ if (sc->func_route == pci_parallel && type == SYS_RES_IRQ) {
flags |= RF_SHAREABLE;
+ if (sc->irqres) {
+ start = rman_get_start(sc->irqres);
+ end = rman_get_start(sc->irqres);
+ }
+ }
return (bus_generic_alloc_resource(dev, child, type, rid, start, end,
count, flags));
Index: pcic_pci.c
===================================================================
RCS file: /share/cvsup/FreeBSD/current/usr/src/sys/pccard/pcic_pci.c,v
retrieving revision 1.48
diff -u -r1.48 pcic_pci.c
--- pcic_pci.c 2001/06/09 07:34:17 1.48
+++ pcic_pci.c 2001/06/13 04:26:52
@@ -446,9 +446,10 @@
sc->flags = PCIC_PD_POWER;
num6729++;
} else {
+ device_printf(dev, "MEMORY mapped device!\n");
sc->memrid = CB_PCI_SOCKET_BASE;
sc->memres = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &sc->memrid, 0, ~0, 1, RF_ACTIVE);
+ &sc->memrid, 0, ~0, 0x1000, RF_ACTIVE);
if (sc->memres == NULL && pcic_pci_get_memory(dev) != 0)
return (ENOMEM);
sp->getb = pcic_pci_getb2;
----Next_Part(Thu_Jun_14_14:37:15_2001_123)----
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010614.143715.110847928.shigeru>