- fixed compilation problem under Linux

- TriggerNMI() declaration moved to cpu_emulation.h

BasiliskII/src/include/main.h

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

BasiliskII/src/native_cpu/cpu_emulation.h

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

BasiliskII/src/uae_cpu/basilisk_glue.cpp

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

BasiliskII/src/uae_cpu/cpu_emulation.h

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

BasiliskII/src/video.cpp

@@ -244,7 +244,7 @@ int16 VideoDriverStatus(uint32 pb, uint32 dce)
 
 		case cscGetModeTiming:		// Get video timing for mode
 			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 + csTimingFlags, 0x0f);		// Mode valid, safe, default and shown in Monitors panel
 			return noErr;