Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the frontend passes in sc->irq=0, set PCIC_INTR_ENABLE. Also, don't clear 

that bit all over the bloody place
This commit is contained in:
mycroft 2003-09-02 22:44:08 +00:00
parent 244c38a2ae
commit 55ff1b2294
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ic/i82365.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365.c,v 1.72 2003/01/31 00:26:30 thorpej Exp $ */
/* $NetBSD: i82365.c,v 1.73 2003/09/02 22:44:08 mycroft Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.72 2003/01/31 00:26:30 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.73 2003/09/02 22:44:08 mycroft Exp $");
#define PCICDEBUG
@ -442,6 +442,8 @@ pcic_attach_socket_finish(h)
/* steer above mgmt interrupt to configured place */
intr = pcic_read(h, PCIC_INTR);
intr &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
if (sc->irq == 0)
intr |= PCIC_INTR_ENABLE;
pcic_write(h, PCIC_INTR, intr);
/* power down the socket */
@ -1421,7 +1423,7 @@ pcic_chip_socket_enable(pch)
/* disable interrupts */
intr = pcic_read(h, PCIC_INTR);
intr &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
intr &= ~PCIC_INTR_IRQ_MASK;
pcic_write(h, PCIC_INTR, intr);
/* power down the socket to reset it, clear the card reset pin */
@ -1557,7 +1559,7 @@ pcic_chip_socket_disable(pch)
/* disable interrupts */
intr = pcic_read(h, PCIC_INTR);
intr &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
intr &= ~PCIC_INTR_IRQ_MASK;
pcic_write(h, PCIC_INTR, intr);
/* power down the socket */

8
sys/dev/isa/i82365_isasubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isasubr.c,v 1.31 2003/01/06 13:05:13 wiz Exp $ */
/* $NetBSD: i82365_isasubr.c,v 1.32 2003/09/02 22:44:09 mycroft Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.31 2003/01/06 13:05:13 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.32 2003/09/02 22:44:09 mycroft Exp $");
#define PCICISADEBUG
@ -496,7 +496,7 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
h->ih_irq = irq;
if (h->flags & PCIC_FLAG_ENABLED) {
reg = pcic_read(h, PCIC_INTR);
reg &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
reg &= ~PCIC_INTR_IRQ_MASK;
pcic_write(h, PCIC_INTR, reg | irq);
}
@ -523,7 +523,7 @@ pcic_isa_chip_intr_disestablish(pch, ih)
h->ih_irq = 0;
if (h->flags & PCIC_FLAG_ENABLED) {
reg = pcic_read(h, PCIC_INTR);
reg &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
reg &= ~PCIC_INTR_IRQ_MASK;
pcic_write(h, PCIC_INTR, reg);
}
}