- Move some macros from icu.h into atpic.c as that is the only place they

  are used.
- Reduce duplication of a couple of macros removing the duplicates from
  ich.h.
- Remove unused macros from icu.h as well as locore protection as this
  header is no longer included in assembly sources.

1 files changed, 0 insertions, 53 deletions

diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index 60368ec..b882022 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -41,66 +41,13 @@
 #ifndef _I386_ISA_ICU_H_
 #define	_I386_ISA_ICU_H_
 
-/*
- * Interrupt enable bits - in normal order of priority (which we change)
- */
-#ifdef PC98
-#define	IRQ0		0x0001
-#define	IRQ1		0x0002
-#define	IRQ2		0x0004
-#define	IRQ3		0x0008
-#define	IRQ4		0x0010
-#define	IRQ5		0x0020
-#define	IRQ6		0x0040
-#define	IRQ7		0x0080
-#define	IRQ_SLAVE	0x0080
-#define	IRQ8		0x0100
-#define	IRQ9		0x0200
-#define	IRQ10		0x0400
-#define	IRQ11		0x0800
-#define	IRQ12		0x1000
-#define	IRQ13		0x2000
-#define	IRQ14		0x4000
-#define	IRQ15		0x8000
-#else
-#define	IRQ0		0x0001		/* highest priority - timer */
-#define	IRQ1		0x0002
-#define	IRQ_SLAVE	0x0004
-#define	IRQ8		0x0100
-#define	IRQ9		0x0200
-#define	IRQ2		IRQ9
-#define	IRQ10		0x0400
-#define	IRQ11		0x0800
-#define	IRQ12		0x1000
-#define	IRQ13		0x2000
-#define	IRQ14		0x4000
-#define	IRQ15		0x8000
-#define	IRQ3		0x0008		/* this is highest after rotation */
-#define	IRQ4		0x0010
-#define	IRQ5		0x0020
-#define	IRQ6		0x0040
-#define	IRQ7		0x0080		/* lowest - parallel printer */
-#endif
-
-/*
- * Interrupt Control offset into Interrupt descriptor table (IDT)
- */
-#define	ICU_OFFSET	32		/* 0-31 are processor exceptions */
-#define	ICU_LEN		16		/* 32-47 are ISA interrupts */
-
 #ifdef PC98
 #define	ICU_IMR_OFFSET	2
-#define	ICU_SLAVEID	7
 #else
 #define	ICU_IMR_OFFSET	1
-#define	ICU_SLAVEID	2
 #endif
 
-#define	ICU_EOI		(OCW2_EOI)	/* non-specific EOI */
-
-#ifndef LOCORE
 void	atpic_handle_intr(struct intrframe iframe);
 void	atpic_startup(void);
-#endif
 
 #endif /* !_I386_ISA_ICU_H_ */