From c6b21d102908104ffe9b6103894f8c8fcf2ae7f4 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Thu, 26 Apr 2007 03:04:06 +0200 Subject: [PATCH] Uniformize messages. Use xf86Msg, prepending local->name when possible and upcasing ACECAD (as per their site, and to differentiate from the software company). Also reduce verbosity by using xf86MsgVerb with verbosity 4 for messages which are not of interest for users. --- src/acecad.c | 80 +++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/src/acecad.c b/src/acecad.c index fcffc72..b6c1322 100644 --- a/src/acecad.c +++ b/src/acecad.c @@ -171,11 +171,11 @@ IsUSBLine(int fd) SYSCALL(err = ioctl(fd, EVIOCGVERSION, &version)); if (!err) { - xf86Msg(X_PROBED, "Kernel Input driver version is %d.%d.%d\n", + xf86MsgVerb(X_PROBED, 4, "Kernel Input driver version is %d.%d.%d\n", version >> 16, (version >> 8) & 0xff, version & 0xff); return 1; } else { - xf86Msg(X_PROBED, "No Kernel Input driver found\n"); + xf86MsgVerb(X_PROBED, 4, "No Kernel Input driver found\n"); return 0; } } @@ -196,7 +196,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) memset(priv,0,sizeof (AceCadPrivateRec)); local->name = dev->identifier; - local->type_name = "AceCad Tablet"; + local->type_name = "ACECAD Tablet"; local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; local->motion_history_proc = xf86GetMotionEvents; local->control_proc = NULL; @@ -220,7 +220,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) local->fd = xf86OpenSerial (local->options); if (local->fd == -1) { - xf86Msg(X_ERROR, "AceCad driver unable to open device\n"); + xf86Msg(X_ERROR, "%s: unable to open device\n", local->name); goto SetupProc_fail; } xf86ErrorFVerb( 6, "tty port opened successfully\n" ); @@ -233,7 +233,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) if (USBQueryHardware(local) != Success) { - ErrorF ("Unable to query/initialize AceCad hardware.\n"); + xf86Msg(X_ERROR, "%s: unable to query/initialize hardware (not an %s?).\n", local->name, local->type_name); goto SetupProc_fail; } } else @@ -268,11 +268,11 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) default: priv->acecadReportSpeed = 'R'; speed = 85; - xf86Msg(X_ERROR, "Acecad Tablet: ReportSpeed value %d invalid. Possible values: 120, 85, 10, 2. Defaulting to 85\n", speed); + xf86Msg(X_ERROR, "%s: ReportSpeed value %d invalid. Possible values: 120, 85, 10, 2. Defaulting to 85\n", local->name, speed); msgtype = X_DEFAULT; } - xf86Msg(msgtype, "Acecad Tablet report %d points/s\n", speed); + xf86Msg(msgtype, "%s report %d points/s\n", local->name, speed); priv->buffer = XisbNew (local->fd, 200); @@ -281,7 +281,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) */ if (QueryHardware(priv) != Success) { - xf86Msg(X_ERROR, "Unable to query/initialize AceCad hardware.\n"); + xf86Msg(X_ERROR, "%s: unable to query/initialize hardware (not an %s?).\n", local->name, local->type_name); goto SetupProc_fail; } } @@ -297,7 +297,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) priv->flags = priv->flags | ABSOLUTE_FLAG; } - xf86Msg(msgtype, "Acecad Tablet is in %s mode\n", (priv->flags & ABSOLUTE_FLAG) ? "absolute" : "relative"); + xf86Msg(msgtype, "%s is in %s mode\n", local->name, (priv->flags & ABSOLUTE_FLAG) ? "absolute" : "relative"); DBG (9, XisbTrace (priv->buffer, 1)); local->history_size = xf86SetIntOption(local->options , "HistorySize", 0); @@ -367,7 +367,7 @@ DeviceOn (DeviceIntPtr dev) LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); - xf86Msg(X_INFO, "Acecad Tablet Device On\n"); + xf86MsgVerb(X_INFO, 4, "%s Device On\n", local->name); local->fd = xf86OpenSerial(local->options); if (local->fd == -1) @@ -403,6 +403,7 @@ DeviceOff (DeviceIntPtr dev) LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); + xf86MsgVerb(X_INFO, 4, "%s Device Off\n", local->name); if (local->fd != -1) { @@ -424,15 +425,19 @@ DeviceOff (DeviceIntPtr dev) static Bool DeviceClose (DeviceIntPtr dev) { - xf86Msg(X_INFO, "Acecad Tablet Device Close\n"); + LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; + + xf86MsgVerb(X_INFO, 4, "%s Device Close\n", local->name); + return (Success); } static void -ControlProc(DeviceIntPtr device, - PtrCtrl *ctrl) +ControlProc(DeviceIntPtr dev, PtrCtrl *ctrl) { - xf86Msg(X_INFO, "Acecad Tablet Control Proc\n"); + LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; + + xf86MsgVerb(X_INFO, 4, "%s Control Proc\n", local->name); } static Bool @@ -444,24 +449,23 @@ DeviceInit (DeviceIntPtr dev) unsigned char map[] = {0, 1, 2, 3}; - xf86Msg(X_INFO, "Acecad Tablet Device Init\n"); + xf86MsgVerb(X_INFO, 4, "%s Init\n", local->name); /* 3 boutons */ if (InitButtonClassDeviceStruct (dev, 3, map) == FALSE) { - ErrorF ("Unable to allocate AceCad ButtonClassDeviceStruct\n"); + xf86Msg(X_ERROR, "%s: unable to allocate ButtonClassDeviceStruct\n", local->name); return !Success; } if (InitFocusClassDeviceStruct (dev) == FALSE) { - ErrorF("Unable to allocate AceCad FocusClassDeviceStruct\n"); + xf86Msg(X_ERROR, "%s: unable to allocate FocusClassDeviceStruct\n", local->name); return !Success; } - if (InitPtrFeedbackClassDeviceStruct(dev, - ControlProc) == FALSE) { - ErrorF("unable to init ptr feedback\n"); + if (InitPtrFeedbackClassDeviceStruct(dev, ControlProc) == FALSE) { + xf86Msg(X_ERROR, "%s: unable to init ptr feedback\n", local->name); return !Success; } @@ -472,7 +476,7 @@ DeviceInit (DeviceIntPtr dev) ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) == FALSE) { - ErrorF ("Unable to allocate AceCad ValuatorClassDeviceStruct\n"); + xf86Msg(X_ERROR, "%s: unable to allocate ValuatorClassDeviceStruct\n", local->name); return !Success; } else @@ -504,7 +508,7 @@ DeviceInit (DeviceIntPtr dev) if (InitProximityClassDeviceStruct (dev) == FALSE) { - ErrorF ("Unable to allocate ProximityClassDeviceStruct\n"); + xf86Msg(X_ERROR, "%s: unable to allocate ProximityClassDeviceStruct\n", local->name); return !Success; } @@ -529,7 +533,7 @@ DeviceInit (DeviceIntPtr dev) priv->acecadInc = 1; } - xf86Msg(X_INFO, "Acecad Tablet Increment: %d\n", priv->acecadInc); + xf86Msg(X_INFO, "%s Increment: %d\n", local->name, priv->acecadInc); return (Success); } @@ -542,7 +546,7 @@ ReadInput (LocalDevicePtr local) int is_core_pointer, is_absolute; AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); - /*xf86Msg(X_INFO, "Acecad Tablet Read Input\n");*/ + /*xf86Msg(X_INFO, "ACECAD Tablet Read Input\n");*/ is_absolute = (priv->flags & ABSOLUTE_FLAG); is_core_pointer = xf86IsCorePointer(local->dev); @@ -585,7 +589,7 @@ ReadInput (LocalDevicePtr local) if (!(priv->acecadOldProximity)) if (!is_core_pointer) { - /*xf86Msg(X_INFO, "Acecad Tablet ProxIN %d %d %d\n",x, y, z);*/ + /*xf86Msg(X_INFO, "ACECAD Tablet ProxIN %d %d %d\n",x, y, z);*/ xf86PostProximityEvent(local->dev, 1, 0, 3 , x, y, z); } @@ -594,7 +598,7 @@ ReadInput (LocalDevicePtr local) { if (is_absolute || priv->acecadOldProximity) { - /*xf86Msg(X_INFO, "Acecad Tablet Motion %d %d %d\n", x, y, z);*/ + /*xf86Msg(X_INFO, "ACECAD Tablet Motion %d %d %d\n", x, y, z);*/ xf86PostMotionEvent(local->dev, is_absolute, 0, 3, x, y, z); } } @@ -611,7 +615,7 @@ ReadInput (LocalDevicePtr local) id=ffs(delta); delta &= ~(1 << (id-1)); - /*xf86Msg(X_INFO, "Acecad Tablet Button %d 0x%x\n",id,(buttons&(1<<(id-1))));*/ + /*xf86Msg(X_INFO, "ACECAD Tablet Button %d 0x%x\n",id,(buttons&(1<<(id-1))));*/ xf86PostButtonEvent(local->dev, is_absolute, id, (buttons&(1<<(id-1))), 0, 3, x, y,z); } } @@ -627,13 +631,13 @@ ReadInput (LocalDevicePtr local) if (!is_core_pointer) if (priv->acecadOldProximity) { - /*xf86Msg(X_INFO, "Acecad Tablet ProxOUT %d %d %d\n",x, y, z);*/ + /*xf86Msg(X_INFO, "ACECAD Tablet ProxOUT %d %d %d\n",x, y, z);*/ xf86PostProximityEvent(local->dev, 0, 0, 3, x,y,z); } priv->acecadOldProximity = 0; } } - /*xf86Msg(X_INFO, "Acecad Tablet Sortie Read Input\n");*/ + /*xf86Msg(X_INFO, "ACECAD Tablet Sortie Read Input\n");*/ } #ifdef LINUX_INPUT @@ -657,7 +661,7 @@ USBReadInput (LocalDevicePtr local) SYSCALL(len = read(local->fd, eventbuf, sizeof(eventbuf))); if (len <= 0) { - ErrorF("Error reading wacom device : %s\n", strerror(errno)); + xf86Msg(X_ERROR, "%s: error reading device: %s\n", local->name, strerror(errno)); return; } @@ -667,7 +671,7 @@ USBReadInput (LocalDevicePtr local) switch (event->type) { case EV_SYN: /* 2.6.x */ if (event->code != SYN_REPORT) - xf86Msg(X_ERROR, "UNKNOWN EV_SYN code %d\n", event->code); + xf86Msg(X_ERROR, "%s: unknown EV_SYN code %d\n", local->name, event->code); break; case EV_ABS: switch (event->code) { @@ -709,7 +713,7 @@ USBReadInput (LocalDevicePtr local) } break; /* EV_KEY */ default: - xf86Msg(X_ERROR, "UNKNOWN event type/code %d/%d\n", event->type, event->code); + xf86Msg(X_ERROR, "%s: unknown event type/code %d/%d\n", local->name, event->type, event->code); } /* switch event->type */ /* Linux Kernel 2.6.x sends EV_SYN/SYN_REPORT as an event terminator, @@ -764,7 +768,7 @@ USBReadInput (LocalDevicePtr local) priv->acecadOldZ = z; priv->acecadOldProximity = prox; } - /*xf86Msg(X_INFO, "Acecad Tablet Sortie Read Input\n");*/ + /*xf86Msg(X_INFO, "ACECAD Tablet Sortie Read Input\n");*/ } #endif @@ -841,19 +845,19 @@ QueryHardware (AceCadPrivatePtr priv) XisbBlockDuration (priv->buffer, 1000000); NewPacket (priv); - /*xf86Msg(X_CONFIG, "Acecad Tablet init envoyé \n");*/ + /*xf86Msg(X_CONFIG, "ACECAD Tablet init envoyé \n");*/ if ((AceCadGetPacket (priv) == Success)) { priv->acecadMaxX = (int)priv->packet[1] + ((int)priv->packet[2] << 7); priv->acecadMaxY = (int)priv->packet[3] + ((int)priv->packet[4] << 7); priv->acecadMaxZ = 512; - xf86Msg(X_INFO, "Acecad Tablet MaxX:%d MaxY:%d\n",priv->acecadMaxX,priv->acecadMaxY); + xf86Msg(X_PROBED, "ACECAD Tablet MaxX:%d MaxY:%d\n", priv->acecadMaxX, priv->acecadMaxY); } else return (!Success); - /*xf86Msg(X_INFO, "Acecad Tablet query hardware fini \n");*/ + /*xf86Msg(X_INFO, "ACECAD Tablet query hardware fini \n");*/ return (Success); } @@ -874,7 +878,7 @@ USBQueryHardware (LocalDevicePtr local) char name[256] = "Unknown"; ioctl(local->fd, EVIOCGNAME(sizeof(name)), name); - xf86Msg(X_PROBED, "Kernel Input device name: \"%s\"\n", name); + xf86MsgVerb(X_PROBED, 4, "Kernel Input device name: \"%s\"\n", name); memset(bit, 0, sizeof(bit)); ioctl(local->fd, EVIOCGBIT(0, EV_MAX), bit[0]); @@ -903,7 +907,7 @@ USBQueryHardware (LocalDevicePtr local) } } - xf86Msg(X_PROBED, "Acecad Tablet MaxX:%d MaxY:%d MaxZ:%d\n", priv->acecadMaxX, priv->acecadMaxY,priv->acecadMaxZ); + xf86Msg(X_PROBED, "ACECAD Tablet MaxX:%d MaxY:%d MaxZ:%d\n", priv->acecadMaxX, priv->acecadMaxY,priv->acecadMaxZ); return (Success); } #endif -- 2.32.0.93.g670b81a890