d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Axe the IMEN_BITS and APIC_IMEN_BITS constants.

Browse Source 
- Add back in a definition of NHWI which is preferred over ICU_LEN.

Submitted by:	bde
This commit is contained in:
John Baldwin 2001-05-17 22:24:17 +00:00
parent 60453b06de
commit ddfbf9d259
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/amd64/isa/icu.h
View File

@ -61,10 +61,8 @@ void INTRDIS __P((u_int));
#ifdef APIC_IO
extern unsigned apic_imen; /* APIC interrupt mask enable */
#define APIC_IMEN_BITS 32 /* number of bits in apic_imen */
#else
extern unsigned imen; /* interrupt mask enable */
#define IMEN_BITS 16 /* number of bits in imen */
#endif
#endif /* LOCORE */
@ -108,7 +106,6 @@ extern unsigned imen; /* interrupt mask enable */
#define IRQ_SLAVE 0x0080
#endif
/*
* Interrupt Control offset into Interrupt descriptor table (IDT)
*/
@ -116,14 +113,16 @@ extern unsigned imen; /* interrupt mask enable */
#ifdef APIC_IO
/* 32-47: ISA IRQ0-IRQ15, 48-55: IO APIC IRQ16-IRQ31 */
/* 32-47: ISA IRQ0-IRQ15, 48-63: IO APIC IRQ16-IRQ31 */
#define ICU_LEN 32
#define HWI_MASK 0xffffffff /* bits for h/w interrupts */
#define NHWI 32
#else
#define ICU_LEN 16 /* 32-47 are ISA interrupts */
#define HWI_MASK 0xffff /* bits for h/w interrupts */
#define NHWI 16
#endif /* APIC_IO */

7
sys/i386/isa/icu.h
View File

@ -61,10 +61,8 @@ void INTRDIS __P((u_int));
#ifdef APIC_IO
extern unsigned apic_imen; /* APIC interrupt mask enable */
#define APIC_IMEN_BITS 32 /* number of bits in apic_imen */
#else
extern unsigned imen; /* interrupt mask enable */
#define IMEN_BITS 16 /* number of bits in imen */
#endif
#endif /* LOCORE */
@ -108,7 +106,6 @@ extern unsigned imen; /* interrupt mask enable */
#define IRQ_SLAVE 0x0080
#endif
/*
* Interrupt Control offset into Interrupt descriptor table (IDT)
*/
@ -116,14 +113,16 @@ extern unsigned imen; /* interrupt mask enable */
#ifdef APIC_IO
/* 32-47: ISA IRQ0-IRQ15, 48-55: IO APIC IRQ16-IRQ31 */
/* 32-47: ISA IRQ0-IRQ15, 48-63: IO APIC IRQ16-IRQ31 */
#define ICU_LEN 32
#define HWI_MASK 0xffffffff /* bits for h/w interrupts */
#define NHWI 32
#else
#define ICU_LEN 16 /* 32-47 are ISA interrupts */
#define HWI_MASK 0xffff /* bits for h/w interrupts */
#define NHWI 16
#endif /* APIC_IO */