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

Oops; PCIC_INTR_ENABLE does something *very* different.

Browse Source
This commit is contained in:
mycroft 1999-02-19 03:14:00 +00:00
parent 58d4d7e933
commit 28bc4dfeca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: i82365.c,v 1.22 1999/02/19 00:27:45 mycroft Exp $ */ /* $NetBSD: i82365.c,v 1.23 1999/02/19 03:14:00 mycroft Exp $ */
#define PCICDEBUG #define PCICDEBUG
@ -1316,11 +1316,11 @@ pcic_chip_socket_enable(pch)
cardtype = pcmcia_card_gettype(h->pcmcia); cardtype = pcmcia_card_gettype(h->pcmcia);
reg = pcic_read(h, PCIC_INTR); reg = pcic_read(h, PCIC_INTR);
reg &= ~PCIC_INTR_CARDTYPE_MASK; reg &= ~(PCIC_INTR_CARDTYPE_MASK | PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
reg |= ((cardtype == PCMCIA_IFTYPE_IO) ? reg |= ((cardtype == PCMCIA_IFTYPE_IO) ?
PCIC_INTR_CARDTYPE_IO : PCIC_INTR_CARDTYPE_IO :
PCIC_INTR_CARDTYPE_MEM); PCIC_INTR_CARDTYPE_MEM);
reg |= h->ih_irq | PCIC_INTR_ENABLE; reg |= h->ih_irq;
pcic_write(h, PCIC_INTR, reg); pcic_write(h, PCIC_INTR, reg);
DPRINTF(("%s: pcic_chip_socket_enable %02x cardtype %s %02x\n", DPRINTF(("%s: pcic_chip_socket_enable %02x cardtype %s %02x\n",

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

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isasubr.c,v 1.2 1999/02/18 23:41:40 mycroft Exp $ */ /* $NetBSD: i82365_isasubr.c,v 1.3 1999/02/19 03:14:01 mycroft Exp $ */
#define PCICISADEBUG #define PCICISADEBUG
@ -237,8 +237,8 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
return (NULL); return (NULL);
reg = pcic_read(h, PCIC_INTR); reg = pcic_read(h, PCIC_INTR);
reg &= ~PCIC_INTR_IRQ_MASK; reg &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
reg |= irq | PCIC_INTR_ENABLE; reg |= irq;
pcic_write(h, PCIC_INTR, reg); pcic_write(h, PCIC_INTR, reg);
h->ih_irq = irq; h->ih_irq = irq;