Author: ion Date: Wed Aug 23 20:58:43 2006 New Revision: 23669
URL: http://svn.reactos.org/svn/reactos?rev=23669&view=rev Log: - Switch PRIMARY_VECTOR_BASE to 0x30 instead of 0x40, as it should be.
Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/include/halirq.h trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ke/i386/irq.c
Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?re... ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 20:58:43 2006 @@ -21,14 +21,14 @@ /* Master PIC */ .short 0x20 /* Port */ .byte 0x11 /* Edge,, cascade, CAI 8, ICW4 */ - .byte 0x40 /* Base */ + .byte PRIMARY_VECTOR_BASE /* Base */ .byte 4 /* IRQ 4 connected to slave */ .byte 1 /* Non buffered, not nested, 8086 */
/* Slave PIC */ .short 0xA0 /* Port */ .byte 0x11 /* Edge, cascade, CAI 8, ICW4 */ - .byte 0x48 /* Base */ + .byte PRIMARY_VECTOR_BASE + 8 /* Base */ .byte 2 /* Slave ID: Slave 2 */ .byte 1 /* Non buffered, not nested, 8086 */
Modified: trunk/reactos/hal/halx86/include/halirq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halirq.h... ============================================================================== --- trunk/reactos/hal/halx86/include/halirq.h (original) +++ trunk/reactos/hal/halx86/include/halirq.h Wed Aug 23 20:58:43 2006 @@ -23,7 +23,7 @@
#else
-#define IRQ_BASE (0x40) +#define IRQ_BASE (0x30) #define NR_IRQS (16)
#define VECTOR2IRQ(vector) ((vector) - IRQ_BASE)
Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=23669... ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Wed Aug 23 20:58:43 2006 @@ -445,7 +445,7 @@ // // Generic Definitions // -#define PRIMARY_VECTOR_BASE 0x40 // FIXME: HACK +#define PRIMARY_VECTOR_BASE 0x30 // FIXME: HACK #define MAXIMUM_IDTVECTOR 0xFF #endif // !_ASM_H
Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Wed Aug 23 20:58:43 2006 @@ -88,7 +88,7 @@ void irq_handler_14(void); void irq_handler_15(void);
-static unsigned int irq_handler[NR_IRQS]= +unsigned int irq_handler[NR_IRQS]= { (int)&irq_handler_0, (int)&irq_handler_1,