Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26634 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2008-07-25 15:36:05 +00:00
parent 60b11851d4
commit e70ba4e482
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/private/kernel/arch/m68k/arch_platform.h
View File

@ -42,9 +42,9 @@ public:
virtual char SerialDebugGetChar() = 0;
virtual void SerialDebugPutChar(char c) = 0;
virtual void EnableIOInterrupt(int irq);
virtual void DisableIOInterrupt(int irq);
virtual void AcknowledgeIOInterrupt(int irq);
virtual void EnableIOInterrupt(int irq) = 0;
virtual void DisableIOInterrupt(int irq) = 0;
virtual void AcknowledgeIOInterrupt(int irq) = 0;
virtual void SetHardwareRTC(uint32 seconds) = 0;
virtual uint32 GetHardwareRTC() = 0;

2
src/system/kernel/arch/m68k/arch_int.cpp
View File

@ -272,7 +272,7 @@ dprintf("handling I/O interrupts done\n");
default:
// vectors >= 64 are user defined vectors, used for IRQ
if (vector >= 64) {
M68KPlatform::Default()->AcknowledgeIOInterrupt(irq);
M68KPlatform::Default()->AcknowledgeIOInterrupt(vector);
ret = int_io_interrupt_handler(vector, true);
break;
}

17
src/system/kernel/platform/atari_m68k/platform.cpp
View File

@ -36,7 +36,7 @@ namespace BPrivate {
class M68KAtari : public M68KPlatform {
public:
class MFP {
public:
MFP(uint32 base, int vector);
@ -54,7 +54,6 @@ class M68KAtari : public M68KPlatform {
int fVector;
};
public:
M68KAtari();
virtual ~M68KAtari();
@ -108,21 +107,21 @@ static char sMFP0Buffer[sizeof(M68KAtari::MFP)];
static char sMFP1Buffer[sizeof(M68KAtari::MFP)];
// constructor
MFP::MFP(uint32 base, int vector)
M68KAtari::MFP::MFP(uint32 base, int vector)
{
fBase = base;
fVector = vector;
}
MFP::~MFP()
M68KAtari::MFP::~MFP()
{
}
#warning M68K: use enable or mark register ?
void
MFP::EnableIOInterrupt(int irq)
M68KAtari::MFP::EnableIOInterrupt(int irq)
{
uint8 bit = 1 << (irq % 8);
// I*B[0] is vector+0, I*A[0] is vector+8
@ -136,7 +135,7 @@ MFP::EnableIOInterrupt(int irq)
void
MFP::DisableIOInterrupt(int irq)
M68KAtari::MFP::DisableIOInterrupt(int irq)
{
uint8 bit = 1 << (irq % 8);
// I*B[0] is vector+0, I*A[0] is vector+8
@ -150,7 +149,7 @@ MFP::DisableIOInterrupt(int irq)
void
MFP::AcknowledgeIOInterrupt(int irq)
M68KAtari::MFP::AcknowledgeIOInterrupt(int irq)
{
uint8 bit = 1 << (irq % 8);
// I*B[0] is vector+0, I*A[0] is vector+8
@ -346,7 +345,7 @@ M68KAtari::ShutDown(bool reboot)
}
MFP *
M68KAtari::MFP *
M68KAtari::MFPForIrq(int irq)
{
int i;
@ -354,7 +353,7 @@ M68KAtari::MFPForIrq(int irq)
for (i = 0; i < 2; i++) {
if (fMFP[i]) {
if (irq >= fMFP[i]->Vector() && irq < fMFP[i]->Vector() + 16)
return &fMFP[i];
return fMFP[i];
}
}
return NULL;