On Wed, Sep 04, 2013 at 01:37:25PM -0700, Ping Cheng wrote:
[...]
> > > > 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.
> >
>
> Sorry, I am a bit lost. Which modeldb are we talking about, xf86, kernel,
> or libwacom/test? I thought we are using WacomModelDesc in wcmUSB.c. There
> is only one 0x00 in the original list. Am I missing something?
whoah. yes, I must've been going cross-eyed when I reviewed that patch after
your comment. you're right, there's one too many in there and I'll remove
it. sorry about that.
> If we remove the extra 0x00, the patch is:
>
> Acked-by: Ping Cheng <pi...@wacom.com>
thanks.
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=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
