Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-04 10:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]

Browse source 
Fix the PIC IRQ code. Interrupt requests only occur when no higher-priority IRQ is busy.


svn path=/branches/ntvdm/; revision=59272
This commit is contained in:
Aleksandar Andrejevic 2013-06-21 01:44:56 +00:00
parent da877e495e
commit 03b2c06c97
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
subsystems/ntvdm/hardware.c
View file

@ -219,17 +219,21 @@ VOID PicWriteData(BYTE Port, BYTE Value)
}
VOID PicInterruptRequest(BYTE Number)
{
{
BYTE i;
if (Number >= 0 && Number < 8)
{
/* Check if the interrupt is busy, in a cascade or masked */
if (MasterPic.CascadeRegister & (1 << Number)
|| MasterPic.InServiceRegister & (1 << Number)
|| MasterPic.MaskRegister & (1 << Number))
/* Check if any of the higher-priorirty interrupts are busy */
for (i = 0; i <= Number ; i++)
{
return;
if (MasterPic.InServiceRegister & (1 << Number)) return;
}
/* Check if the interrupt is masked */
if (MasterPic.MaskRegister & (1 << Number)) return;
/* Set the appropriate bit in the ISR and interrupt the CPU */
if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number;
EmulatorInterrupt(MasterPic.IntOffset + Number);
}
@ -246,22 +250,21 @@ VOID PicInterruptRequest(BYTE Number)
{
return;
}
/* Check the if the slave PIC is busy or masked */
if (MasterPic.InServiceRegister & (1 << 2)
|| MasterPic.MaskRegister & (1 << 2)) return;
/* Check if any of the higher-priorirty interrupts are busy */
if (MasterPic.InServiceRegister != 0) return;
for (i = 0; i <= Number ; i++)
{
if (SlavePic.InServiceRegister & (1 << Number)) return;
}
/* Check if the interrupt is masked */
if (SlavePic.MaskRegister & (1 << Number)) return;
/* Set the IRQ 2 bit in the master ISR */
if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2;
/* Check if the interrupt is busy, in a cascade or masked */
if (SlavePic.CascadeRegister & (1 << Number)
|| SlavePic.InServiceRegister & (1 << Number)
|| SlavePic.MaskRegister & (1 << Number))
{
return;
}
/* Set the appropriate bit in the ISR and interrupt the CPU */
if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number;
EmulatorInterrupt(SlavePic.IntOffset + Number);
}