hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-16 23:57:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initialisation of interrupt masks changed.

Browse Source 
Reviewed by:	se
Submitted by:	wolf (Wolfgang Stanglmeier)
This commit is contained in:
Stefan Eßer 1995-02-09 20:16:19 +00:00
parent 1e30185a78
commit 6f22585dd4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=6281
6 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/amd64/pci/pci_bus.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.5 1994/10/12 02:33:21 se Exp $
** $Id: pcibus.c,v 1.1 1995/02/01 23:06:58 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -393,7 +393,7 @@ static unsigned int pci_int_mask [16];
int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
{
int irq;
unsigned mask;
unsigned mask, oldmask;
irq = PCI_INTERRUPT_LINE_EXTRACT(
pci_conf_read (tag, PCI_INTERRUPT_REG));
@ -402,6 +402,7 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
if (!maskptr)
maskptr = &pci_int_mask[irq];
oldmask = *maskptr;
INTRMASK (*maskptr, mask);
@ -425,13 +426,13 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
** update the isa interrupt masks.
*/
for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
/*
** update the pci interrupt masks.
*/
for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
};
#endif

9
sys/amd64/pci/pci_cfgreg.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.5 1994/10/12 02:33:21 se Exp $
** $Id: pcibus.c,v 1.1 1995/02/01 23:06:58 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -393,7 +393,7 @@ static unsigned int pci_int_mask [16];
int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
{
int irq;
unsigned mask;
unsigned mask, oldmask;
irq = PCI_INTERRUPT_LINE_EXTRACT(
pci_conf_read (tag, PCI_INTERRUPT_REG));
@ -402,6 +402,7 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
if (!maskptr)
maskptr = &pci_int_mask[irq];
oldmask = *maskptr;
INTRMASK (*maskptr, mask);
@ -425,13 +426,13 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
** update the isa interrupt masks.
*/
for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
/*
** update the pci interrupt masks.
*/
for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
};
#endif

9
sys/i386/isa/pcibus.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.5 1994/10/12 02:33:21 se Exp $
** $Id: pcibus.c,v 1.1 1995/02/01 23:06:58 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -393,7 +393,7 @@ static unsigned int pci_int_mask [16];
int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
{
int irq;
unsigned mask;
unsigned mask, oldmask;
irq = PCI_INTERRUPT_LINE_EXTRACT(
pci_conf_read (tag, PCI_INTERRUPT_REG));
@ -402,6 +402,7 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
if (!maskptr)
maskptr = &pci_int_mask[irq];
oldmask = *maskptr;
INTRMASK (*maskptr, mask);
@ -425,13 +426,13 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
** update the isa interrupt masks.
*/
for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
/*
** update the pci interrupt masks.
*/
for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
};
#endif

9
sys/i386/pci/pci_bus.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.5 1994/10/12 02:33:21 se Exp $
** $Id: pcibus.c,v 1.1 1995/02/01 23:06:58 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -393,7 +393,7 @@ static unsigned int pci_int_mask [16];
int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
{
int irq;
unsigned mask;
unsigned mask, oldmask;
irq = PCI_INTERRUPT_LINE_EXTRACT(
pci_conf_read (tag, PCI_INTERRUPT_REG));
@ -402,6 +402,7 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
if (!maskptr)
maskptr = &pci_int_mask[irq];
oldmask = *maskptr;
INTRMASK (*maskptr, mask);
@ -425,13 +426,13 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
** update the isa interrupt masks.
*/
for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
/*
** update the pci interrupt masks.
*/
for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
};
#endif

9
sys/i386/pci/pci_cfgreg.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.5 1994/10/12 02:33:21 se Exp $
** $Id: pcibus.c,v 1.1 1995/02/01 23:06:58 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -393,7 +393,7 @@ static unsigned int pci_int_mask [16];
int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
{
int irq;
unsigned mask;
unsigned mask, oldmask;
irq = PCI_INTERRUPT_LINE_EXTRACT(
pci_conf_read (tag, PCI_INTERRUPT_REG));
@ -402,6 +402,7 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
if (!maskptr)
maskptr = &pci_int_mask[irq];
oldmask = *maskptr;
INTRMASK (*maskptr, mask);
@ -425,13 +426,13 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
** update the isa interrupt masks.
*/
for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
/*
** update the pci interrupt masks.
*/
for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
};
#endif

9
sys/i386/pci/pci_pir.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.5 1994/10/12 02:33:21 se Exp $
** $Id: pcibus.c,v 1.1 1995/02/01 23:06:58 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -393,7 +393,7 @@ static unsigned int pci_int_mask [16];
int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
{
int irq;
unsigned mask;
unsigned mask, oldmask;
irq = PCI_INTERRUPT_LINE_EXTRACT(
pci_conf_read (tag, PCI_INTERRUPT_REG));
@ -402,6 +402,7 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
if (!maskptr)
maskptr = &pci_int_mask[irq];
oldmask = *maskptr;
INTRMASK (*maskptr, mask);
@ -425,13 +426,13 @@ int pcibus_regint (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr)
** update the isa interrupt masks.
*/
for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
/*
** update the pci interrupt masks.
*/
for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++)
if (*mp & *maskptr)
if ((~*mp & oldmask)==0)
*mp |= mask;
};
#endif