diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-17 09:09:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-17 09:42:44 +1000 |
| commit | e39d1c1ed4a3ad3f210bdfe12de511e6debb137e (patch) | |
| tree | e415c6e5a8d6ca7424a7a2a4c608856f59c98592 | |
| parent | 4d1e1aea077c0283808e2a1d8120a0eca85f2da7 (diff) | |
Remove xf86Verbose, XCONFIG_PROBED, nd XCONFIG_GIVEN.
Use xf86Msg() instead, rest is handled by the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/xf86HyperPen.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c index 0e722da..8de385f 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -71,9 +71,6 @@ #define write(a,b,c) xf86WriteSerial((a),(char*)(b),(c)) #undef close #define close(a) xf86CloseSerial((a)) -#define XCONFIG_PROBED "(==)" -#define XCONFIG_GIVEN "(**)" -#define xf86Verbose 1 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 #error "This driver requires server with ABI 12." @@ -497,9 +494,8 @@ xf86HypOpen(InputInfoPtr pInfo) if (models[i].id == priv->modelid) n = i; - if (xf86Verbose) - ErrorF("%s HyperPen Model: 0x%x (%s)\n", - XCONFIG_PROBED, priv->modelid, n==-1? "UNKNOWN":models[n].name); + xf86Msg(X_PROBED, " HyperPen Model: 0x%x (%s)\n", + priv->modelid, n==-1? "UNKNOWN":models[n].name); /* enable F-Keys */ @@ -515,7 +511,7 @@ xf86HypOpen(InputInfoPtr pInfo) if (priv->modelid == 0x43) SYSCALL(err = write(pInfo->fd, SS_MACRO_4K, strlen(SS_MACRO_4K))); else SYSCALL(err = write(pInfo->fd, SS_MACRO_56K, strlen(SS_MACRO_56K))); if (err == -1) { - ErrorF("HyperPen write error : %s\n", strerror(errno)); + xf86Msg(X_ERROR, "HyperPen write error : %s\n", strerror(errno)); return !Success; } @@ -533,9 +529,8 @@ xf86HypOpen(InputInfoPtr pInfo) priv->hypMaxY = (buffer[3] & 0x7f) | (buffer[4] << 7); priv->hypMaxZ = 512; - if (xf86Verbose) - ErrorF("%s HyperPen max tablet size %d.%02dinx%d.%02din, %dx%d " - "lines of resolution\n", XCONFIG_PROBED, + xf86Msg(X_PROBED, "HyperPen max tablet size %d.%02dinx%d.%02din, %dx%d " + "lines of resolution\n", priv->hypMaxX / priv->hypRes, (priv->hypMaxX * 100 / priv->hypRes) % 100, priv->hypMaxY / priv->hypRes, @@ -555,8 +550,8 @@ xf86HypOpen(InputInfoPtr pInfo) priv->hypXSize *= res100; priv->hypYSize *= res100; } else { - ErrorF("%s HyperPen active area bigger than tablet, " - "assuming maximum\n", XCONFIG_PROBED); + xf86Msg(X_PROBED, "HyperPen active area bigger than tablet, " + "assuming maximum\n"); priv->hypXSize = priv->hypMaxX; priv->hypYSize = priv->hypMaxY; } @@ -577,8 +572,8 @@ xf86HypOpen(InputInfoPtr pInfo) priv->hypYSize = (double)priv->hypXSize / sratio; if (priv->hypYSize > priv->hypMaxY) priv->hypYSize = priv->hypMaxY; } - ErrorF("%s HyperPen using tablet area %d by %d, at res %d lpi\n", - XCONFIG_PROBED, priv->hypXSize, priv->hypYSize, priv->hypRes); + xf86Msg(X_PROBED, "HyperPen using tablet area %d by %d, at res %d lpi\n", + priv->hypXSize, priv->hypYSize, priv->hypRes); if (priv->flags & BAUD_19200_FLAG) { /* Send 19200 baud to the tablet */ |