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

[NTVDM]

Browse source 
Fix the IRQ priority and routing in PicGetInterrupt.


svn path=/trunk/; revision=64759
This commit is contained in:
Aleksandar Andrejevic 2014-10-16 01:41:24 +00:00
parent cb9e70d5f7
commit 66202b4312
1 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

48
reactos/subsystems/ntvdm/hardware/pic.c
View file

@ -250,31 +250,11 @@ VOID PicInterruptRequest(BYTE Number)
BYTE PicGetInterrupt(VOID) BYTE PicGetInterrupt(VOID)
{ {
INT i, j; INT i;
/* Search interrupts by priority */ /* Search the master PIC interrupts by priority */
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
/* Check if this line is cascaded to the slave PIC */
if ((i == 2)
&& MasterPic.CascadeRegister & (1 << 2)
&& SlavePic.Slave
&& (SlavePic.CascadeRegister == 2))
{
/* Search the slave PIC interrupts by priority */
for (j = 0; j < 8; j++) if ((j != 1) && SlavePic.IntRequestRegister & (1 << j))
{
/* Clear the IRR flag */
SlavePic.IntRequestRegister &= ~(1 << j);
/* Set the ISR flag, unless AEOI is enabled */
if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= (1 << j);
/* Return the interrupt number */
return SlavePic.IntOffset + j;
}
}
if (MasterPic.IntRequestRegister & (1 << i)) if (MasterPic.IntRequestRegister & (1 << i))
{ {
/* Clear the IRR flag */ /* Clear the IRR flag */
@ -287,6 +267,30 @@ BYTE PicGetInterrupt(VOID)
return MasterPic.IntOffset + i; return MasterPic.IntOffset + i;
} }
} }
/* Search the slave PIC interrupts by priority */
for (i = 0; i < 8; i++)
{
if (SlavePic.IntRequestRegister & (1 << i))
{
/* Clear the IRR flag */
SlavePic.IntRequestRegister &= ~(1 << i);
if ((i == 1) && SlavePic.CascadeRegisterSet)
{
/* This interrupt is routed to the master PIC */
return MasterPic.IntOffset + SlavePic.CascadeRegister;
}
else
{
/* Set the ISR flag, unless AEOI is enabled */
if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= (1 << i);
/* Return the interrupt number */
return SlavePic.IntOffset + i;
}
}
}
/* Spurious interrupt */ /* Spurious interrupt */
if (MasterPic.InServiceRegister & (1 << 2)) return SlavePic.IntOffset + 7; if (MasterPic.InServiceRegister & (1 << 2)) return SlavePic.IntOffset + 7;