mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- IOAPIC calls added in functions raise_irq() and lower_irq() (untested)

Browse Source
This commit is contained in:
Volker Ruppert 2002-01-30 18:33:41 +00:00
parent ac91aa0d3c
commit 0b6ab60780
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bochs/iodev/pic.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: pic.cc,v 1.20 2002-01-29 17:20:11 vruppert Exp $ // $Id: pic.cc,v 1.21 2002-01-30 18:33:41 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -525,6 +525,11 @@ bx_pic_c::write(Bit32u address, Bit32u value, unsigned io_len)
void void
bx_pic_c::lower_irq(unsigned irq_no) bx_pic_c::lower_irq(unsigned irq_no)
{ {
#if BX_SUPPORT_APIC
// forward this function call to the ioapic too
BX_PIC_THIS devices->ioapic->untrigger_irq (irq_no, -1);
#endif
if ((irq_no <= 7) && (BX_PIC_THIS s.master_pic.IRQ_line[irq_no])) { if ((irq_no <= 7) && (BX_PIC_THIS s.master_pic.IRQ_line[irq_no])) {
BX_DEBUG(("IRQ line %d now low", (unsigned) irq_no)); BX_DEBUG(("IRQ line %d now low", (unsigned) irq_no));
BX_PIC_THIS s.master_pic.IRQ_line[irq_no] = 0; BX_PIC_THIS s.master_pic.IRQ_line[irq_no] = 0;
@ -548,6 +553,11 @@ bx_pic_c::lower_irq(unsigned irq_no)
void void
bx_pic_c::raise_irq(unsigned irq_no) bx_pic_c::raise_irq(unsigned irq_no)
{ {
#if BX_SUPPORT_APIC
// forward this function call to the ioapic too
BX_PIC_THIS devices->ioapic->trigger_irq (irq_no, -1);
#endif
if ((irq_no <= 7) && (!BX_PIC_THIS s.master_pic.IRQ_line[irq_no])) { if ((irq_no <= 7) && (!BX_PIC_THIS s.master_pic.IRQ_line[irq_no])) {
BX_DEBUG(("IRQ line %d now high", (unsigned) irq_no)); BX_DEBUG(("IRQ line %d now high", (unsigned) irq_no));
BX_PIC_THIS s.master_pic.IRQ_line[irq_no] = 1; BX_PIC_THIS s.master_pic.IRQ_line[irq_no] = 1;