diff options
| -rw-r--r-- | src/wcmConfig.c | 1 | ||||
| -rw-r--r-- | src/xf86Wacom.h | 3 | ||||
| -rw-r--r-- | src/xf86WacomDefs.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 2cb9de1..6f317b0 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -360,6 +360,7 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) goto SetupProc_fail; priv = (WacomDevicePtr) local->private; + priv->name = local->name; common = priv->common; common->wcmDevice = device; diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index 194655a..c2194a7 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -77,7 +77,8 @@ #define DBG(lvl, priv, ...) \ do { \ if ((lvl) <= priv->debugLevel) { \ - xf86Msg(X_INFO, "%s: ", __func__); \ + xf86Msg(X_INFO, "%s (%s): ", \ + ((WacomDeviceRec*)priv)->name, __func__); \ xf86Msg(X_NONE, __VA_ARGS__); \ } \ } while (0) diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h index 6634d5c..80976b9 100644 --- a/src/xf86WacomDefs.h +++ b/src/xf86WacomDefs.h @@ -159,6 +159,7 @@ struct _PROPINFO struct _WacomDeviceRec { + char *name; /* Do not move, same offset as common->wcmDevice */ /* configuration fields */ struct _WacomDeviceRec *next; LocalDevicePtr local; @@ -370,6 +371,7 @@ struct _WacomDeviceClass struct _WacomCommonRec { + /* Do not move wcmDevice, same offset as priv->name */ char* wcmDevice; /* device file name */ dev_t min_maj; /* minor/major number */ unsigned char wcmFlags; /* various flags (handle tilt) */ |