Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Switch PRIMARY_VECTOR_BASE to 0x30 instead of 0x40, as it should be.

Browse source 
svn path=/trunk/; revision=23669
This commit is contained in:
Alex Ionescu 2006-08-23 16:58:43 +00:00
parent 7ad1947410
commit 8401f43ab0
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/hal/halx86/generic/irq.S
View file

@ -21,14 +21,14 @@ PICInitTable:
/* Master PIC */ /* Master PIC */
.short 0x20 /* Port */ .short 0x20 /* Port */
.byte 0x11 /* Edge,, cascade, CAI 8, ICW4 */ .byte 0x11 /* Edge,, cascade, CAI 8, ICW4 */
.byte 0x40 /* Base */ .byte PRIMARY_VECTOR_BASE /* Base */
.byte 4 /* IRQ 4 connected to slave */ .byte 4 /* IRQ 4 connected to slave */
.byte 1 /* Non buffered, not nested, 8086 */ .byte 1 /* Non buffered, not nested, 8086 */
/* Slave PIC */ /* Slave PIC */
.short 0xA0 /* Port */ .short 0xA0 /* Port */
.byte 0x11 /* Edge, cascade, CAI 8, ICW4 */ .byte 0x11 /* Edge, cascade, CAI 8, ICW4 */
.byte 0x48 /* Base */ .byte PRIMARY_VECTOR_BASE + 8 /* Base */
.byte 2 /* Slave ID: Slave 2 */ .byte 2 /* Slave ID: Slave 2 */
.byte 1 /* Non buffered, not nested, 8086 */ .byte 1 /* Non buffered, not nested, 8086 */

2
reactos/hal/halx86/include/halirq.h
View file

@ -23,7 +23,7 @@
#else #else
#define IRQ_BASE (0x40) #define IRQ_BASE (0x30)
#define NR_IRQS (16) #define NR_IRQS (16)
#define VECTOR2IRQ(vector) ((vector) - IRQ_BASE) #define VECTOR2IRQ(vector) ((vector) - IRQ_BASE)

2
reactos/include/ndk/asm.h
View file

@ -445,7 +445,7 @@ Author:
// //
// Generic Definitions // Generic Definitions
// //
#define PRIMARY_VECTOR_BASE 0x40 // FIXME: HACK #define PRIMARY_VECTOR_BASE 0x30 // FIXME: HACK
#define MAXIMUM_IDTVECTOR 0xFF #define MAXIMUM_IDTVECTOR 0xFF
#endif // !_ASM_H #endif // !_ASM_H

2
reactos/ntoskrnl/ke/i386/irq.c
View file

@ -88,7 +88,7 @@ void irq_handler_13(void);
void irq_handler_14(void); void irq_handler_14(void);
void irq_handler_15(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_0,
(int)&irq_handler_1, (int)&irq_handler_1,