diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-11-26 11:19:03 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-12-20 15:01:56 +1000 |
| commit | 493ccdc8f2d1e94dde7f45b2062ac7f91b9a3cf4 (patch) | |
| tree | 8b6a6ce12cdc1917c0a8f26963b7950934bdbf71 /src | |
| parent | 3171a5cf1a597643c71eb82c85f5e5f43616deae (diff) | |
| download | xf86-input-wacom-493ccdc8f2d1e94dde7f45b2062ac7f91b9a3cf4.tar.gz | |
Move model listing to the X driver layer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/wcmUSB.c | 23 | ||||
| -rw-r--r-- | src/xf86Wacom.c | 21 | ||||
| -rw-r--r-- | src/xf86Wacom.h | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 63549ee..9125dbd 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -395,7 +395,7 @@ static struct WacomModelDesc { LENOVO_VENDOR_ID, 0x6004, 100000, 100000, &usbTabletPC, "usb:17ef:6004" } /* Pen-only */ }; -static size_t wcmListModels(const char **names, size_t len) +size_t wcmListModels(const char **names, size_t len) { for (size_t i = 0; i < min(len, ARRAY_SIZE(WacomModelDesc)); i++) { @@ -405,27 +405,6 @@ static size_t wcmListModels(const char **names, size_t len) return ARRAY_SIZE(WacomModelDesc); } -void usbListModels(void) -{ - const char *wmodels[512]; - size_t nmodels; - SymTabRec models[512 + 1] = {0}; - - nmodels = wcmListModels(wmodels, ARRAY_SIZE(models)); - - for (size_t i = 0; i < min(nmodels, ARRAY_SIZE(models)); i++) - { - models[i].token = i; - models[i].name = wmodels[i]; - } - - models[nmodels].name = NULL; - - xf86PrintChipsets("wacom", - "Driver for Wacom graphics tablets", - models); -} - static Bool usbWcmInit(WacomDevicePtr priv) { int i; diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index d8ca5c4..935e581 100644 --- a/src/xf86Wacom.c +++ b/src/xf86Wacom.c @@ -871,6 +871,27 @@ static void wcmUnplug(pointer p) { } +static void usbListModels(void) +{ + const char *wmodels[512]; + size_t nmodels; + SymTabRec models[512 + 1] = {0}; + + nmodels = wcmListModels(wmodels, ARRAY_SIZE(models)); + + for (size_t i = 0; i < min(nmodels, ARRAY_SIZE(models)); i++) + { + models[i].token = i; + models[i].name = wmodels[i]; + } + + models[nmodels].name = NULL; + + xf86PrintChipsets("wacom", + "Driver for Wacom graphics tablets", + models); +} + /* wcmPlug - called by the module loader */ static pointer wcmPlug(pointer module, pointer options, int* errmaj, diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index a99da21..e9fa1f0 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -156,7 +156,7 @@ extern void set_absolute(WacomDevicePtr priv, Bool absolute); extern WacomCommonPtr wcmRefCommon(WacomCommonPtr common); extern void wcmFreeCommon(WacomCommonPtr *common); extern WacomCommonPtr wcmNewCommon(void); -extern void usbListModels(void); +extern size_t wcmListModels(const char **names, size_t len); extern int wcmScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min); static inline void wcmActionCopy(WacomAction *dest, WacomAction *src) |