Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-08-14 20:27:24 +00:00
Code Issues Projects Releases Wiki Activity

- fixed compilation problem under Linux

Browse Source 
- TriggerNMI() declaration moved to cpu_emulation.h
This commit is contained in:
cebix
2000-08-22 12:44:30 +00:00
parent 46612d3008
commit 2bebaceabc
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BasiliskII/src/include/main.h
View File

@@ -63,6 +63,5 @@ enum {
extern uint32 InterruptFlags; // Currently pending interrupts extern uint32 InterruptFlags; // Currently pending interrupts
extern void SetInterruptFlag(uint32 flag); // Set/clear interrupt flags extern void SetInterruptFlag(uint32 flag); // Set/clear interrupt flags
extern void ClearInterruptFlag(uint32 flag); extern void ClearInterruptFlag(uint32 flag);
extern void TriggerNMI(void);
#endif #endif

1
BasiliskII/src/native_cpu/cpu_emulation.h
View File

@@ -61,5 +61,6 @@ extern "C" void Execute68kTrap(uint16 trap, M68kRegisters *r); // Execute MacOS
// Interrupt functions // Interrupt functions
extern void TriggerInterrupt(void); // Trigger interrupt (InterruptFlag must be set first) extern void TriggerInterrupt(void); // Trigger interrupt (InterruptFlag must be set first)
extern void TriggerNMI(void); // Trigger interrupt level 7
#endif #endif

5
BasiliskII/src/uae_cpu/basilisk_glue.cpp
View File

@@ -118,6 +118,11 @@ void TriggerInterrupt(void)
regs.spcflags |= SPCFLAG_INT; regs.spcflags |= SPCFLAG_INT;
} }
void TriggerNMI(void)
{
//!! not implemented yet
}
/* /*
* Get 68k interrupt level * Get 68k interrupt level

1
BasiliskII/src/uae_cpu/cpu_emulation.h
View File

@@ -97,5 +97,6 @@ extern "C" void Execute68kTrap(uint16 trap, M68kRegisters *r); // Execute MacOS
// Interrupt functions // Interrupt functions
extern void TriggerInterrupt(void); // Trigger interrupt level 1 (InterruptFlag must be set first) extern void TriggerInterrupt(void); // Trigger interrupt level 1 (InterruptFlag must be set first)
extern void TriggerNMI(void); // Trigger interrupt level 7
#endif #endif

2
BasiliskII/src/video.cpp
View File

@@ -244,7 +244,7 @@ int16 VideoDriverStatus(uint32 pb, uint32 dce)
case cscGetModeTiming: // Get video timing for mode case cscGetModeTiming: // Get video timing for mode
D(bug(" GetModeTiming mode %08lx\n", ReadMacInt32(param + csTimingMode))); D(bug(" GetModeTiming mode %08lx\n", ReadMacInt32(param + csTimingMode)));
WriteMacInt32(param + csTimingFormat, 'decl'); WriteMacInt32(param + csTimingFormat, FOURCC('d', 'e', 'c', 'l'));
WriteMacInt32(param + csTimingData, 220); // 21" Multiscan WriteMacInt32(param + csTimingData, 220); // 21" Multiscan
WriteMacInt32(param + csTimingFlags, 0x0f); // Mode valid, safe, default and shown in Monitors panel WriteMacInt32(param + csTimingFlags, 0x0f); // Mode valid, safe, default and shown in Monitors panel
return noErr; return noErr;