--- hatari/src/includes/m68000.h	2019/04/01 07:14:46	1.1.1.11
+++ hatari/src/includes/m68000.h	2019/04/09 08:47:15	1.1.1.13
@@ -148,11 +148,17 @@ static inline void M68000_SetSR(Uint16 v
 #define BUS_ERROR_READ 1
 
 
+/* bus acces mode */
+#define	BUS_MODE_CPU		0			/* bus is owned by the cpu */
+#define	BUS_MODE_BLITTER	1			/* bus is owned by the blitter */
+
+
 extern Uint32 BusErrorAddress;
 extern Uint32 BusErrorPC;
 extern bool bBusErrorReadWrite;
 extern int nCpuFreqShift;
 extern int nWaitStateCycles;
+extern int BusMode;
 
 extern int	LastOpcodeFamily;
 extern int	LastInstrCycles;
@@ -191,10 +197,10 @@ static inline void M68000_AddCyclesWithP
 	    && ( ( cycles & 3 ) == 2 ) && ( ( LastInstrCycles & 3 ) == 2 ) )
 	{
 		Pairing = 1;
-		HATARI_TRACE( HATARI_TRACE_CPU_PAIRING ,
-		              "pairing detected pc=%x family %s/%s cycles %d/%d\n" ,
-		              m68k_getpc(), OpcodeName[LastOpcodeFamily] ,
-		              OpcodeName[OpcodeFamily], LastInstrCycles, cycles );
+		LOG_TRACE(TRACE_CPU_PAIRING,
+		          "cpu pairing detected pc=%x family %s/%s cycles %d/%d\n",
+		          m68k_getpc(), OpcodeName[LastOpcodeFamily],
+		          OpcodeName[OpcodeFamily], LastInstrCycles, cycles);
 	}
 
 	/* [NP] This part is only needed to track possible pairing instructions, */
@@ -203,10 +209,10 @@ static inline void M68000_AddCyclesWithP
 	if ( (LastOpcodeFamily!=OpcodeFamily) && ( Pairing == 0 )
 		&& ( ( cycles & 3 ) == 2 ) && ( ( LastInstrCycles & 3 ) == 2 ) )
 	{
-		HATARI_TRACE( HATARI_TRACE_CPU_PAIRING ,
-		              "could pair pc=%x family %s/%s cycles %d/%d\n" ,
-		              m68k_getpc(), OpcodeName[LastOpcodeFamily] ,
-		              OpcodeName[OpcodeFamily], LastInstrCycles, cycles );
+		LOG_TRACE(TRACE_CPU_PAIRING,
+		          "cpu could pair pc=%x family %s/%s cycles %d/%d\n",
+		          m68k_getpc(), OpcodeName[LastOpcodeFamily],
+		          OpcodeName[OpcodeFamily], LastInstrCycles, cycles);
 	}
 #endif