Converted to the new debug interface.
diff --git a/tsx11/ts_xf86vmode.c b/tsx11/ts_xf86vmode.c
index 4f36b13..21161e1 100644
--- a/tsx11/ts_xf86vmode.c
+++ b/tsx11/ts_xf86vmode.c
@@ -15,7 +15,7 @@
#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
-#include "debug.h"
+#include "debugtools.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11)
@@ -23,154 +23,154 @@
Bool TSXF86VidModeQueryVersion(Display*a0,int*a1,int*a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeQueryVersion\n");
+ TRACE("Call XF86VidModeQueryVersion\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeQueryVersion(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeQueryVersion\n");
+ TRACE("Ret XF86VidModeQueryVersion\n");
return r;
}
Bool TSXF86VidModeQueryExtension(Display*a0,int*a1,int*a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeQueryExtension\n");
+ TRACE("Call XF86VidModeQueryExtension\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeQueryExtension(a0,a2,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeQueryExtension\n");
+ TRACE("Ret XF86VidModeQueryExtension\n");
return r;
}
Bool TSXF86VidModeGetModeLine(Display*a0,int a1,int*a2,XF86VidModeModeLine*a3)
{
Bool r;
- TRACE(x11, "Call XF86VidModeGetModeLine\n");
+ TRACE("Call XF86VidModeGetModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetModeLine(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeGetModeLine\n");
+ TRACE("Ret XF86VidModeGetModeLine\n");
return r;
}
Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo***a3)
{
Bool r;
- TRACE(x11, "Call XF86VidModeGetAllModeLines\n");
+ TRACE("Call XF86VidModeGetAllModeLines\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetAllModeLines(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeGetAllModeLines\n");
+ TRACE("Ret XF86VidModeGetAllModeLines\n");
return r;
}
Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3)
{
Bool r;
- TRACE(x11, "Call XF86VidModeAddModeLine\n");
+ TRACE("Call XF86VidModeAddModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeAddModeLine(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeAddModeLine\n");
+ TRACE("Ret XF86VidModeAddModeLine\n");
return r;
}
Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeDeleteModeLine\n");
+ TRACE("Call XF86VidModeDeleteModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeDeleteModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeDeleteModeLine\n");
+ TRACE("Ret XF86VidModeDeleteModeLine\n");
return r;
}
Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeModModeLine\n");
+ TRACE("Call XF86VidModeModModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeModModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeModModeLine\n");
+ TRACE("Ret XF86VidModeModModeLine\n");
return r;
}
Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Status r;
- TRACE(x11, "Call XF86VidModeValidateModeLine\n");
+ TRACE("Call XF86VidModeValidateModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeValidateModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeValidateModeLine\n");
+ TRACE("Ret XF86VidModeValidateModeLine\n");
return r;
}
Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeSwitchMode\n");
+ TRACE("Call XF86VidModeSwitchMode\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeSwitchMode(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeSwitchMode\n");
+ TRACE("Ret XF86VidModeSwitchMode\n");
return r;
}
Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeSwitchToMode\n");
+ TRACE("Call XF86VidModeSwitchToMode\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeSwitchToMode(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeSwitchToMode\n");
+ TRACE("Ret XF86VidModeSwitchToMode\n");
return r;
}
Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeLockModeSwitch\n");
+ TRACE("Call XF86VidModeLockModeSwitch\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeLockModeSwitch(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeLockModeSwitch\n");
+ TRACE("Ret XF86VidModeLockModeSwitch\n");
return r;
}
Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2)
{
Bool r;
- TRACE(x11, "Call XF86VidModeGetMonitor\n");
+ TRACE("Call XF86VidModeGetMonitor\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetMonitor(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeGetMonitor\n");
+ TRACE("Ret XF86VidModeGetMonitor\n");
return r;
}
Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3)
{
Bool r;
- TRACE(x11, "Call XF86VidModeGetViewPort\n");
+ TRACE("Call XF86VidModeGetViewPort\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeGetViewPort\n");
+ TRACE("Ret XF86VidModeGetViewPort\n");
return r;
}
Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
{
Bool r;
- TRACE(x11, "Call XF86VidModeSetViewPort\n");
+ TRACE("Call XF86VidModeSetViewPort\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeSetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
- TRACE(x11, "Ret XF86VidModeSetViewPort\n");
+ TRACE("Ret XF86VidModeSetViewPort\n");
return r;
}
