Commit 2e03f1cde879fb9d16d21d79f4c71fcab703a578

Peter Hutterer <peter.hutterer @wh…t.net>
Thu Dec 24 00:01:05 CET 2009

Tree SHA1: 7572515
Parent SHA1: 2429513 (Auto-prepend device name/file to debug messages.)
raw diff | raw patch

Remove now superfluous name prints.

The DBG macro prints the device name/device file automatically.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Diff rendering mode:
inline
side by side


227	227	int button, mask;
228	228	WacomDevicePtr priv = (WacomDevicePtr) local->private;
229	229	WacomCommonPtr common = priv->common;
230		DBG(6, priv, "buttons=%d for %s\n", buttons, local->name);
	230	DBG(6, priv, "buttons=%d\n", buttons);
231	231
232	232	/* Tablet PC buttons only apply to penabled devices */
233	233	if (common->wcmTPCButton && (priv->flags & STYLUS_ID))
…	…
461	461	return;
462	462
463	463	DBG(4, priv, "TPCButton(%s) button=%d state=%d "
464		"code=%08x, for %s coreEvent=%s \n",
	464	"code=%08x, coreEvent=%s \n",
465	465	common->wcmTPCButton ? "on" : "off",
466	466	button, mask, priv->button[button],
467		local->name, (priv->button[button] & AC_CORE) ? "yes" : "no");
	467	(priv->button[button] & AC_CORE) ? "yes" : "no");
468	468
469	469	if (!priv->keys[button][0])
470	470	{
…	…
577	577	unsigned *keyP = 0;
578	578	int is_absolute = priv->flags & ABSOLUTE_FLAG;
579	579
580		DBG(10, priv, "strip events for %s \n", local->name);
	580	DBG(10, priv, "\n");
581	581
582	582	/* emulate events for relative wheel */
583	583	if ( ds->relwheel )
…	…
745	745
746	746	if (priv->serial && serial != priv->serial)
747	747	{
748		DBG(10, priv, "[%s] serial number"
	748	DBG(10, priv, "serial number"
749	749	" is %u but your system configured %u",
750		local->name, serial, (int)priv->serial);
	750	serial, (int)priv->serial);
751	751	return;
752	752	}
753	753
…	…
820	820	}
821	821	v5 = wheel;
822	822
823		DBG(6, priv, "[%s] %s prox=%d\tx=%d"
	823	DBG(6, priv, "%s prox=%d\tx=%d"
824	824	"\ty=%d\tz=%d\tv3=%d\tv4=%d\tv5=%d\tid=%d"
825	825	"\tserial=%u\tbutton=%s\tbuttons=%d\n",
826		local->name,
827	826	is_absolute ? "abs" : "rel",
828	827	is_proximity,
829	828	x, y, z, v3, v4, v5, id, serial,
…	…
1801	1801	priv->screenBottomY[1] = priv->tvResolution[1];
1802	1802	}
1803	1803
1804		DBG(10, priv, "\"%s\":"
	1804	DBG(10, priv,
1805	1805	"topX0=%d topY0=%d bottomX0=%d bottomY0=%d "
1806	1806	"topX1=%d topY1=%d bottomX1=%d bottomY1=%d \n",
1807		local->name, priv->screenTopX[0], priv->screenTopY[0],
	1807	priv->screenTopX[0], priv->screenTopY[0],
1808	1808	priv->screenBottomX[0], priv->screenBottomY[0],
1809	1809	priv->screenTopX[1], priv->screenTopY[1],
1810	1810	priv->screenBottomX[1], priv->screenBottomY[1]);
…	…
1819	1819	WacomDevicePtr priv = (WacomDevicePtr)local->private;
1820	1820	int i;
1821	1821
1822		DBG(2, priv, "\"%s\":"
1823		"number of screen=%d \n", local->name, screenInfo.numScreens);
	1822	DBG(2, priv, "number of screen=%d \n", screenInfo.numScreens);
1824	1823	priv->tvoffsetX = 0;
1825	1824	priv->tvoffsetY = 0;
1826	1825	if (priv->twinview != TV_NONE)
…	…
1843	1843	priv->screenBottomX[i] = dixScreenOrigins[i].x;
1844	1844	priv->screenBottomY[i] = dixScreenOrigins[i].y;
1845	1845
1846		DBG(10, priv, "from dix for \"%s\" "
	1846	DBG(10, priv, "from dix: "
1847	1847	"ScreenOrigins[%d].x=%d ScreenOrigins[%d].y=%d \n",
1848		local->name, i, priv->screenTopX[i], i,
1849		priv->screenTopY[i]);
	1848	i, priv->screenTopX[i], i, priv->screenTopY[i]);
1850	1849	}
1851	1850
1852	1851	priv->screenBottomX[i] += screenInfo.screens[i]->width;
1853	1852	priv->screenBottomY[i] += screenInfo.screens[i]->height;
1854	1853
1855		DBG(10, priv, "\"%s\":"
	1854	DBG(10, priv,
1856	1855	"topX[%d]=%d topY[%d]=%d bottomX[%d]=%d bottomY[%d]=%d \n",
1857		local->name, i, priv->screenTopX[i], i, priv->screenTopY[i],
	1856	i, priv->screenTopX[i], i, priv->screenTopY[i],
1858	1857	i, priv->screenBottomX[i], i, priv->screenBottomY[i]);
1859	1858	}
1860	1859	}
…	…
1868	1868	WacomToolAreaPtr area = priv->toolarea;
1869	1869	int tmpTopX, tmpTopY, tmpBottomX, tmpBottomY, oldMaxX, oldMaxY;
1870	1870
1871		DBG(10, priv, "\"%s\"", priv->local->name);
	1871	DBG(10, priv, "\n");
1872	1872
1873	1873	if (!IsTouch(priv))
1874	1874	{
…	…
1945	1945	int oldRotation;
1946	1946	int tmpTopX, tmpTopY, tmpBottomX, tmpBottomY, oldMaxX, oldMaxY;
1947	1947
1948		DBG(10, priv, "\"%s\":\n", local->name);
	1948	DBG(10, priv, "\n");
1949	1949
1950	1950	if (common->wcmRotate == value) /* initialization */
1951	1951	{


71	71	WacomDevicePtr priv = (WacomDevicePtr)local->private;
72	72	int is_absolute = priv->flags & ABSOLUTE_FLAG;
73	73
74		DBG(3, priv, "%s to mode=%d\n",
75		local->name, mode);
	74	DBG(3, priv, "to mode=%d\n", mode);
76	75
77	76	/* Pad is always in relative mode when it's a core device.
78	77	* Always in absolute mode when it is not a core device.
…	…
95	95	}
96	96	else if ( (mode != Absolute) && (mode != Relative))
97	97	{
98		DBG(10, priv,
99		"%s invalid mode=%d\n", local->name, mode);
	98	DBG(10, priv, "invalid mode=%d\n", mode);
100	99	return BadMatch;
101	100	}
102	101
…	…
209	209	WacomCommonPtr common = priv->common;
210	210	int values[WCM_MAX_MOUSE_BUTTONS];
211	211
212		DBG(10, priv, "%s\n", local->name);
	212	DBG(10, priv, "\n");
213	213
214	214	values[0] = priv->topX;
215	215	values[1] = priv->topY;
…	…
297	297	WacomDevicePtr priv = (WacomDevicePtr) local->private;
298	298	WacomCommonPtr common = priv->common;
299	299
300		DBG(10, priv, "%s\n", local->name);
	300	DBG(10, priv, "\n");
301	301
302	302	if (property == prop_tablet_area)
303	303	{


296	296	priv->topPadding = (int)((double)(priv->screenTopY[i] * priv->topPadding)
297	297	/ ((double)(priv->screenBottomY[i] - priv->screenTopY[i])) + 0.5);
298	298	}
299		DBG(10, priv, "\"%s\" "
300		"x=%d y=%d \n", local->name, priv->leftPadding, priv->topPadding);
	299	DBG(10, priv, "x=%d y=%d \n", priv->leftPadding, priv->topPadding);
301	300	return;
302	301	}
303	302
…	…
335	335	priv->sizeY += (int)((double)((priv->maxHeight - priv->screenBottomY[i])
336	336	* tabletSize) / ((double)(priv->screenBottomY[i] - priv->screenTopY[i])) + 0.5);
337	337	}
338		DBG(10, priv, "\"%s\" "
339		"x=%d y=%d \n", local->name, priv->sizeX, priv->sizeY);
	338	DBG(10, priv, "x=%d y=%d \n", priv->sizeX, priv->sizeY);
340	339	return;
341	340	}
342	341
…	…
974	974	int rc;
975	975	struct serial_struct ser;
976	976
977		DBG(1, priv, "opening %s\n", common->wcmDevice);
	977	DBG(1, priv, "opening device file\n");
978	978
979	979	local->fd = xf86OpenSerial(local->options);
980	980	if (local->fd < 0)
…	…
1064	1064	if (fstat(local->fd, &st) == -1)
1065	1065	{
1066	1066	/* can not access major/minor */
1067		DBG(1, priv, "%s: stat failed (%s). "
1068		"cannot check status.\n", local->name, strerror(errno));
	1067	DBG(1, priv, "stat failed (%s). "
	1068	"cannot check status.\n", strerror(errno));
1069	1069
1070	1070	/* older systems don't support the required ioctl.
1071	1071	* So, we have to let it pass */
…	…
1096	1096	WacomDevicePtr priv = (WacomDevicePtr)local->private;
1097	1097	#endif
1098	1098	int n = xf86WaitForInput(local->fd, 0);
1099		DBG(10, priv, "%s with %d numbers of data\n", local->name, n);
	1099	DBG(10, priv, "%d numbers of data\n", n);
1100	1100
1101	1101	if (n >= 0) return n ? 1 : 0;
1102	1102	xf86Msg(X_ERROR, "%s: select error: %s\n", local->name, strerror(errno));
…	…
1140	1140	int len, pos, cnt, remaining;
1141	1141	unsigned char * data;
1142	1142
1143		DBG(10, common, "device=%s"
1144		" fd=%d \n", common->wcmDevice, local->fd);
	1143	DBG(10, common, "fd=%d\n", local->fd);
1145	1144
1146	1145	remaining = sizeof(common->buffer) - common->bufpos;
1147	1146
…	…
1282	1282	WacomDevicePtr priv = (WacomDevicePtr)local->private;
1283	1283
1284	1284	DBG(2, priv, "BEGIN dev=%p priv=%p "
1285		"type=%s(%s) flags=%d fd=%d what=%s\n",
	1285	"type=%s flags=%d fd=%d what=%s\n",
1286	1286	(void )pWcm, (void )priv,
1287	1287	IsStylus(priv) ? "stylus" :
1288	1288	IsCursor(priv) ? "cursor" :
1289	1289	IsPad(priv) ? "pad" : "eraser",
1290		local->name, priv->flags, local ? local->fd : -1,
	1290	priv->flags, local ? local->fd : -1,
1291	1291	(what == DEVICE_INIT) ? "INIT" :
1292	1292	(what == DEVICE_OFF) ? "OFF" :
1293	1293	(what == DEVICE_ON) ? "ON" :

Commit 2e03f1cde879fb9d16d21d79f4c71fcab703a578

Gitorious