On Mon, Sep 02, 2013 at 07:43:42PM -0700, Ping Cheng wrote:
> On Friday, August 30, 2013, Peter Hutterer wrote:
>
> > When the driver starts, print the list of supported models. This should
> > help with any questions like "does my driver support this or that model".
> >
> > For those models that don't have a defined name, print "usb:1234:5678"
> > instead, so users can at least try to match the usb IDs.
> >
> > Sample log output:
> > [ 25950.166] (II) wacom: Driver for Wacom graphics tablets: PenPartner,
> > PenPartner,
> > Graphire, Graphire2 4x5, Graphire2 5x7, Graphire3 4x5, Graphire3
> > 6x8,
> > Graphire4 4x5, Graphire4 6x8, BambooFun 4x5, BambooFun 6x8,
> > Bamboo1 Medium, Graphire4 6x8 BlueTooth, CTL-460, CTH-461, CTL-660,
> > CTL-461/S, Bamboo Touch, CTH-460/K, CTH-461/S, CTH-661/S1,
> > CTH-461/L,
> > CTH-661/L, Intuos 4x5, Intuos 6x8, Intuos 9x12, Intuos 12x12,
> > Intuos 12x18, PTU600, PL400, PL500, PL600, PL600SX, PL550, PL800,
> > PL700, PL510, PL710, DTI520, DTF720, DTF720a, DTF521, DTU1931,
> > DTU2231, DTU1631, Intuos2 4x5, Intuos2 6x8, Intuos2 9x12,
> > Intuos2 12x12, Intuos2 12x18, Intuos2 6x8 , Volito, PenStation,
> > Volito2 4x5, Volito2 2x3, PenPartner2, Bamboo, Bamboo1, Bamboo1
> > 4x6,
> > Bamboo1 5x8, Intuos3 4x5, Intuos3 6x8, Intuos3 9x12, Intuos3 12x12,
> > Intuos3 12x19, Intuos3 6x11, Intuos3 4x6, Intuos4 4x6, Intuos4 6x9,
> > Intuos4 8x13, Intuos4 12x19, Intuos4 WL USB Endpoint,
> > Intuos4 WL Bluetooth Endpoint, Intuos5 touch S, Intuos5 touch M,
> > Intuos5 touch L, Intuos5 S, Intuos5 M, Cintiq 21UX, Cintiq 20WSX,
> > Cintiq 12WX, Cintiq 21UX2, Cintiq 24HD, Cintiq 22HD,
> > Cintiq 24HD touch (EMR digitizer), Cintiq 13HD, DTK2241, DTH2242,
> > Cintiq 22HDT, TabletPC 0x90, TabletPC 0x93, TabletPC 0x97,
> > TabletPC 0x9A, CapPlus 0x9F, TabletPC 0xE2, TabletPC 0xE3,
> > TabletPC 0xE5, TabletPC 0xE6, TabletPC 0xEC, TabletPC 0xED,
> > TabletPC 0xEF, TabletPC 0x100, TabletPC 0x101, TabletPC 0x10D,
> > TabletPC 0x4001, usb:172f:0024, usb:172f:0025, usb:172f:0026,
> > usb:172f:0027, usb:172f:0028, usb:172f:0030, usb:172f:0031,
> > usb:172f:0032, usb:172f:0033, usb:172f:0034, usb:172f:0035,
> > usb:172f:0036, usb:172f:0037, usb:172f:0038, usb:172f:0039,
> > usb:172f:0051, usb:172f:0052, usb:172f:0053, usb:172f:0054,
> > usb:172f:0055, usb:172f:0056, usb:172f:0057, usb:172f:0058,
> > usb:172f:0500, usb:172f:0501, usb:172f:0502, usb:172f:0503,
> > usb:1b96:0001, usb:17ef:6004
>
>
> Shouldn't we add a new option in xsetwacom instead? Print all models
> ineach new log file is a bit overwhelming...
storage is virtually free these days. and even where not, having 30 lines
extra should not be a big deal :)
adding this to xsetwacom is useful too, but requires more rework, and having
this in the log file is particularly useful if backports are to be
considered (e.g. the RHEL drivers backport some, but not all HW support).
also, fwiw, the intel driver also prints all chipsets supported and I'm not
sure anyone has had issues with the storage yet.
> [ 25950.167] (II) Using input driver 'wacom' for 'Wacom Intuos4 6x9'
> >
> > Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
> > ---
> > src/wcmConfig.c | 3 +
> > src/wcmUSB.c | 312
> > ++++++++++++++++++++++++++++++++------------------------
> > src/xf86Wacom.h | 1 +
> > 3 files changed, 182 insertions(+), 134 deletions(-)
> >
> > diff --git a/src/wcmConfig.c b/src/wcmConfig.c
> > index 1955661..2d19944 100644
> > --- a/src/wcmConfig.c
> > +++ b/src/wcmConfig.c
> > @@ -659,6 +659,9 @@ static pointer wcmPlug(pointer module, pointer
> > options, int* errmaj,
> > int* errmin)
> > {
> > xf86AddInputDriver(&WACOM, module, 0);
> > +
> > + usbListModels();
> > +
> > return module;
> > }
> >
> > diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> > index f1504cf..9bdd3e8 100644
> > --- a/src/wcmUSB.c
> > +++ b/src/wcmUSB.c
> > @@ -172,172 +172,216 @@ static unsigned short mouse_codes [] = {
> > BTN_SIDE, BTN_EXTRA
> > };
> >
> > -static struct
> > +static struct WacomModelDesc
> > {
> > const unsigned int vendor_id;
> > const unsigned int model_id;
> > int yRes; /* tablet Y resolution in units/meter */
> > int xRes; /* tablet X resolution in units/meter */
> > WacomModelPtr model;
> > + const char *name;
> > } WacomModelDesc [] =
> > {
> > - { WACOM_VENDOR_ID, 0x00, 39370, 39370, &usbPenPartner }, /*
> > PenPartner */
> > - { WACOM_VENDOR_ID, 0x10, 80000, 80000, &usbGraphire }, /*
> > Graphire */
> > - { WACOM_VENDOR_ID, 0x11, 80000, 80000, &usbGraphire2 }, /*
> > Graphire2 4x5 */
> > - { WACOM_VENDOR_ID, 0x12, 80000, 80000, &usbGraphire2 }, /*
> > Graphire2 5x7 */
> > - { WACOM_VENDOR_ID, 0x13, 80000, 80000, &usbGraphire3 }, /*
> > Graphire3 4x5 */
> > - { WACOM_VENDOR_ID, 0x14, 80000, 80000, &usbGraphire3 }, /*
> > Graphire3 6x8 */
> > - { WACOM_VENDOR_ID, 0x15, 80000, 80000, &usbGraphire4 }, /*
> > Graphire4 4x5 */
> > - { WACOM_VENDOR_ID, 0x16, 80000, 80000, &usbGraphire4 }, /*
> > Graphire4 6x8 */
> > - { WACOM_VENDOR_ID, 0x17, 100000, 100000, &usbBambooFun }, /*
> > BambooFun 4x5 */
> > - { WACOM_VENDOR_ID, 0x18, 100000, 100000, &usbBambooFun }, /*
> > BambooFun 6x8 */
> > - { WACOM_VENDOR_ID, 0x19, 80000, 80000, &usbBamboo1 }, /*
> > Bamboo1 Medium*/
> > - { WACOM_VENDOR_ID, 0x81, 80000, 80000, &usbGraphire4 }, /*
> > Graphire4 6x8 BlueTooth */
> > + { WACOM_VENDOR_ID, 0x00, 39370, 39370, &usbPenPartner,
> > "PenPartner" },
> > + { WACOM_VENDOR_ID, 0x00, 39370, 39370, &usbPenPartner,
> > "PenPartner" },
>
>
> Why do we need two PenPartner?
this is just the existing modeldb converted to include what was previously a
comment. there are two PenPartner models, it'd be great to change that to
the actual product names if there are any.
Cheers,
Peter
> > + { WACOM_VENDOR_ID, 0x10, 80000, 80000, &usbGraphire,
> > "Graphire" },
> > + { WACOM_VENDOR_ID, 0x11, 80000, 80000, &usbGraphire2,
> > "Graphire2 4x5" },
> > + { WACOM_VENDOR_ID, 0x12, 80000, 80000, &usbGraphire2,
> > "Graphire2 5x7" },
> > + { WACOM_VENDOR_ID, 0x13, 80000, 80000, &usbGraphire3,
> > "Graphire3 4x5" },
> > + { WACOM_VENDOR_ID, 0x14, 80000, 80000, &usbGraphire3,
> > "Graphire3 6x8" },
> > + { WACOM_VENDOR_ID, 0x15, 80000, 80000, &usbGraphire4,
> > "Graphire4 4x5" },
> > + { WACOM_VENDOR_ID, 0x16, 80000, 80000, &usbGraphire4,
> > "Graphire4 6x8" },
> > + { WACOM_VENDOR_ID, 0x17, 100000, 100000, &usbBambooFun,
> > "BambooFun 4x5" },
> > + { WACOM_VENDOR_ID, 0x18, 100000, 100000, &usbBambooFun,
> > "BambooFun 6x8" },
> > + { WACOM_VENDOR_ID, 0x19, 80000, 80000, &usbBamboo1, "Bamboo1
> > Medium" },
> > + { WACOM_VENDOR_ID, 0x81, 80000, 80000, &usbGraphire4,
> > "Graphire4 6x8 BlueTooth" },
> >
> > - { WACOM_VENDOR_ID, 0xD1, 100000, 100000, &usbBamboo }, /*
> > CTL-460 */
> > - { WACOM_VENDOR_ID, 0xD4, 100000, 100000, &usbBamboo }, /*
> > CTH-461 */
> > - { WACOM_VENDOR_ID, 0xD3, 100000, 100000, &usbBamboo }, /*
> > CTL-660 */
> > - { WACOM_VENDOR_ID, 0xD2, 100000, 100000, &usbBamboo }, /*
> > CTL-461/S */
> > - { WACOM_VENDOR_ID, 0xD0, 100000, 100000, &usbBamboo }, /*
> > Bamboo Touch */
> > - { WACOM_VENDOR_ID, 0xD6, 100000, 100000, &usbBamboo }, /*
> > CTH-460/K */
> > - { WACOM_VENDOR_ID, 0xD7, 100000, 100000, &usbBamboo }, /*
> > CTH-461/S */
> > - { WACOM_VENDOR_ID, 0xD8, 100000, 100000, &usbBamboo }, /*
> > CTH-661/S1 */
> > - { WACOM_VENDOR_ID, 0xDA, 100000, 100000, &usbBamboo }, /*
> > CTH-461/L */
> > - { WACOM_VENDOR_ID, 0xDB, 100000, 100000, &usbBamboo }, /*
> > CTH-661/L */
> > + { WACOM_VENDOR_ID, 0xD1, 100000, 100000, &usbBamboo, "CTL-460"
> > },
> > + { WACOM_VENDOR_ID, 0xD4, 100000, 100000, &usbBamboo, "CTH-461"
> > },
> > + { WACOM_VENDOR_ID, 0xD3, 100000, 100000, &usbBamboo, "CTL-660"
> > },
> > + { WACOM_VENDOR_ID, 0xD2, 100000, 100000, &usbBamboo,
> > "CTL-461/S" },
> > + { WACOM_VENDOR_ID, 0xD0, 100000, 100000, &usbBamboo, "Bamboo
> > Touch" },
> > + { WACOM_VENDOR_ID, 0xD6, 100000, 100000, &usbBamboo,
> > "CTH-460/K" },
> > + { WACOM_VENDOR_ID, 0xD7, 100000, 100000, &usbBamboo,
> > "CTH-461/S" },
> > + { WACOM_VENDOR_ID, 0xD8, 100000, 100000, &usbBamboo,
> > "CTH-661/S1" },
> > + { WACOM_VENDOR_ID, 0xDA, 100000, 100000, &usbBamboo,
> > "CTH-461/L" },
> > + { WACOM_VENDOR_ID, 0xDB, 100000, 100000, &usbBamboo,
> > "CTH-661/L" },
> >
> > - { WACOM_VENDOR_ID, 0x20, 100000, 100000, &usbIntuos }, /*
> > Intuos 4x5 */
> > - { WACOM_VENDOR_ID, 0x21, 100000, 100000, &usbIntuos }, /*
> > Intuos 6x8 */
> > - { WACOM_VENDOR_ID, 0x22, 100000, 100000, &usbIntuos }, /*
> > Intuos 9x12 */
> > - { WACOM_VENDOR_ID, 0x23, 100000, 100000, &usbIntuos }, /*
> > Intuos 12x12 */
> > - { WACOM_VENDOR_ID, 0x24, 100000, 100000, &usbIntuos }, /*
> > Intuos 12x18 */
> > + { WACOM_VENDOR_ID, 0x20, 100000, 100000, &usbIntuos, "Intuos
> > 4x5" },
> > + { WACOM_VENDOR_ID, 0x21, 100000, 100000, &usbIntuos, "Intuos
> > 6x8" },
> > + { WACOM_VENDOR_ID, 0x22, 100000, 100000, &usbIntuos, "Intuos
> > 9x12" },
> > + { WACOM_VENDOR_ID, 0x23, 100000, 100000, &usbIntuos, "Intuos
> > 12x12" },
> > + { WACOM_VENDOR_ID, 0x24, 100000, 100000, &usbIntuos, "Intuos
> > 12x18" },
> >
> > - { WACOM_VENDOR_ID, 0x03, 20000, 20000, &usbCintiqPartner }, /*
> > PTU600 */
> > + { WACOM_VENDOR_ID, 0x03, 20000, 20000, &usbCintiqPartner,
> > "PTU600" },
> >
> > - { WACOM_VENDOR_ID, 0x30, 20000, 20000, &usbCintiq }, /*
> > PL400 */
> > - { WACOM_VENDOR_ID, 0x31, 20000, 20000, &usbCintiq }, /*
> > PL500 */
> > - { WACOM_VENDOR_ID, 0x32, 20000, 20000, &usbCintiq }, /*
> > PL600 */
> > - { WACOM_VENDOR_ID, 0x33, 20000, 20000, &usbCintiq }, /*
> > PL600SX */
> > - { WACOM_VENDOR_ID, 0x34, 20000, 20000, &usbCintiq }, /*
> > PL550 */
> > - { WACOM_VENDOR_ID, 0x35, 20000, 20000, &usbCintiq }, /*
> > PL800 */
> > - { WACOM_VENDOR_ID, 0x37, 20000, 20000, &usbCintiq }, /*
> > PL700 */
> > - { WACOM_VENDOR_ID, 0x38, 20000, 20000, &usbCintiq }, /*
> > PL510 */
> > - { WACOM_VENDOR_ID, 0x39, 20000, 20000, &usbCintiq }, /*
> > PL710 */
> > - { WACOM_VENDOR_ID, 0x3A, 20000, 20000, &usbCintiq }, /*
> > DTI520 */
> > - { WACOM_VENDOR_ID, 0xC0, 20000, 20000, &usbCintiq }, /*
> > DTF720 */
> > - { WACOM_VENDOR_ID, 0xC2, 20000, 20000, &usbCintiq }, /*
> > DTF720a */
> > - { WACOM_VENDOR_ID, 0xC4, 20000, 20000, &usbCintiq }, /*
> > DTF521 */
> > - { WACOM_VENDOR_ID, 0xC7, 100000, 100000, &usbCintiq }, /*
> > DTU1931 */
> > - { WACOM_VENDOR_ID, 0xCE, 100000, 100000, &usbCintiq }, /*
> > DTU2231 */
> > - { WACOM_VENDOR_ID, 0xF0, 100000, 100000, &usbCintiq }, /*
> > DTU1631 */
> > + { WACOM_VENDOR_ID, 0x30, 20000, 20000, &usbCintiq, "PL400"
> > },
> > + { WACOM_VENDOR_ID, 0x31, 20000, 20000, &usbCintiq, "PL500"
> > },
> > + { WACOM_VENDOR_ID, 0x32, 20000, 20000, &usbCintiq, "PL600"
> > },
> > + { WACOM_VENDOR_ID, 0x33, 20000, 20000, &usbCintiq, "PL600SX"
> > },
> > + { WACOM_VENDOR_ID, 0x34, 20000, 20000, &usbCintiq, "PL550"
> > },
> > + { WACOM_VENDOR_ID, 0x35, 20000, 20000, &usbCintiq, "PL800"
> > },
> > + { WACOM_VENDOR_ID, 0x37, 20000, 20000, &usbCintiq, "PL700"
> > },
> > + { WACOM_VENDOR_ID, 0x38, 20000, 20000, &usbCintiq, "PL510"
> > },
> > + { WACOM_VENDOR_ID, 0x39, 20000, 20000, &usbCintiq, "PL710"
> > },
> > + { WACOM_VENDOR_ID, 0x3A, 20000, 20000, &usbCintiq, "DTI520"
> > },
> > + { WACOM_VENDOR_ID, 0xC0, 20000, 20000, &usbCintiq, "DTF720"
> > },
> > + { WACOM_VENDOR_ID, 0xC2, 20000, 20000, &usbCintiq, "DTF720a"
> > },
> > + { WACOM_VENDOR_ID, 0xC4, 20000, 20000, &usbCintiq, "DTF521"
> > },
> > + { WACOM_VENDOR_ID, 0xC7, 100000, 100000, &usbCintiq, "DTU1931"
> > },
> > + { WACOM_VENDOR_ID, 0xCE, 100000, 100000, &usbCintiq, "DTU2231"
> > },
> > + { WACOM_VENDOR_ID, 0xF0, 100000, 100000, &usbCintiq, "DTU1631"
> > },
> >
> > - { WACOM_VENDOR_ID, 0x41, 100000, 100000, &usbIntuos2 }, /*
> > Intuos2 4x5 */
> > - { WACOM_VENDOR_ID, 0x42, 100000, 100000, &usbIntuos2 }, /*
> > Intuos2 6x8 */
> > - { WACOM_VENDOR_ID, 0x43, 100000, 100000, &usbIntuos2 }, /*
> > Intuos2 9x12 */
> > - { WACOM_VENDOR_ID, 0x44, 100000, 100000, &usbIntuos2 }, /*
> > Intuos2 12x12 */
> > - { WACOM_VENDOR_ID, 0x45, 100000, 100000, &usbIntuos2 }, /*
> > Intuos2 12x18 */
> > - { WACOM_VENDOR_ID, 0x47, 100000, 100000, &usbIntuos2 }, /*
> > Intuos2 6x8 */
> > + { WACOM_VENDOR_ID, 0x41, 100000, 100000, &usbIntuos2, "Intuos2
> > 4x5" },
> > + { WACOM_VENDOR_ID, 0x42, 100000, 100000, &usbIntuos2, "Intuos2
> > 6x8" },
> > + { WACOM_VENDOR_ID, 0x43, 100000, 100000, &usbIntuos2, "Intuos2
> > 9x12" },
> > + { WACOM_VENDOR_ID, 0x44, 100000, 100000, &usbIntuos2, "Intuos2
> > 12x12" },
> > + { WACOM_VENDOR_ID, 0x45, 100000, 100000, &usbIntuos2, "Intuos2
> > 12x18" },
> > + { WACOM_VENDOR_ID, 0x47, 100000, 100000, &usbIntuos2, "Intuos2
> > 6x8 " },
> >
> > - { WACOM_VENDOR_ID, 0x60, 50000, 50000, &usbVolito }, /*
> > Volito */
> > + { WACOM_VENDOR_ID, 0x60, 50000, 50000, &usbVolito, "Volito"
> > },
> >
> > - { WACOM_VENDOR_ID, 0x61, 50000, 50000, &usbVolito2 }, /*
> > PenStation */
> > - { WACOM_VENDOR_ID, 0x62, 50000, 50000, &usbVolito2 }, /*
> > Volito2 4x5 */
> > - { WACOM_VENDOR_ID, 0x63, 50000, 50000, &usbVolito2 }, /*
> > Volito2 2x3 */
> > - { WACOM_VEN
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
