Code:
static struct wacom_features wacom_features[] = {
{ "Wacom Penpartner", 7, 5040, 3780, 255, 0, PENPARTNER },
{ "Wacom Graphire", 8, 10206, 7422, 511, 63, GRAPHIRE },
{ "Wacom Graphire2 4x5", 8, 10206, 7422, 511, 63, GRAPHIRE },
{ "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 63, GRAPHIRE },
{ "Wacom Graphire3", 8, 10208, 7424, 511, 63, GRAPHIRE },
{ "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 63, GRAPHIRE },
{ "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 63, WACOM_G4 },
{ "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 63, WACOM_G4 },
{ "Wacom BambooFun 4x5", 9, 14760, 9225, 511, 63, WACOM_MO },
{ "Wacom BambooFun 6x8", 9, 21648, 13530, 511, 63, WACOM_MO },
{ "Wacom Bamboo1 Medium", 8, 16704, 12064, 511, 63, GRAPHIRE },
{ "Wacom Volito", 8, 5104, 3712, 511, 63, GRAPHIRE },
{ "Wacom PenStation2", 8, 3250, 2320, 255, 63, GRAPHIRE },
{ "Wacom Volito2 4x5", 8, 5104, 3712, 511, 63, GRAPHIRE },
{ "Wacom Volito2 2x3", 8, 3248, 2320, 511, 63, GRAPHIRE },
{ "Wacom PenPartner2", 8, 3250, 2320, 511, 63, GRAPHIRE },
{ "Wacom Bamboo", 9, 14760, 9225, 511, 63, WACOM_MO },
{ "Wacom Bamboo1", 8, 5104, 3712, 511, 63, GRAPHIRE },
{ "Wacom Intuos 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
{ "Wacom Intuos 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
{ "Wacom Intuos 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
{ "Wacom Intuos 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
{ "Wacom Intuos 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
{ "Wacom PL400", 8, 5408, 4056, 255, 0, PL },
{ "Wacom PL500", 8, 6144, 4608, 255, 0, PL },
{ "Wacom PL600", 8, 6126, 4604, 255, 0, PL },
{ "Wacom PL600SX", 8, 6260, 5016, 255, 0, PL },
{ "Wacom PL550", 8, 6144, 4608, 511, 0, PL },
{ "Wacom PL800", 8, 7220, 5780, 511, 0, PL },
{ "Wacom PL700", 8, 6758, 5406, 511, 0, PL },
{ "Wacom PL510", 8, 6282, 4762, 511, 0, PL },
{ "Wacom DTU710", 8, 34080, 27660, 511, 0, PL },
{ "Wacom DTF521", 8, 6282, 4762, 511, 0, PL },
{ "Wacom DTF720", 8, 6858, 5506, 511, 0, PL },
{ "Wacom DTF720a", 8, 6858, 5506, 511, 0, PL },
{ "Wacom Cintiq Partner", 8, 20480, 15360, 511, 0, PTU },
{ "Wacom Intuos2 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
{ "Wacom Intuos2 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
{ "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
{ "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
{ "Wacom Intuos3 4x5", 10, 25400, 20320, 1023, 63, INTUOS3S },
{ "Wacom Intuos3 6x8", 10, 40640, 30480, 1023, 63, INTUOS3 },
{ "Wacom Intuos3 9x12", 10, 60960, 45720, 1023, 63, INTUOS3 },
{ "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
{ "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
{ "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3 },
{ "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S },
{ "Wacom Intuos4 4x6", 10, 31496, 19685, 2047, 63, INTUOS4S },
{ "Wacom Intuos4 6x9", 10, 44704, 27940, 2047, 63, INTUOS4 },
{ "Wacom Intuos4 8x13", 10, 65024, 40640, 2047, 63, INTUOS4L },
{ "Wacom Intuos4 12x19", 10, 97536, 60960, 2047, 63, INTUOS4L },
{ "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ },
{ "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE },
{ "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE },
{ "Wacom DTU1931", 8, 37832, 30305, 511, 0, PL },
{ "Wacom Graphire Bluetooth", 8, 10208, 7424, 511, 63, WACOM_GB },
{ "Wacom ISDv4 90", 8, 26202, 16325, 255, 0, TABLETPC },
{ "Wacom ISDv4 93", 8, 26202, 16325, 255, 0, TABLETPC },
{ "Wacom ISDv4 9A", 8, 26202, 16325, 255, 0, TABLETPC },
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
{ "Wacom Bamboo Pen/Touch", 9, 14760, 9225, 511, 63, WACOM_MO }, // add this line
{ }
};
static struct usb_device_id wacom_ids[] = {
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x00) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x10) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x11) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x15) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x19) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x63) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x64) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x65) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x69) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x23) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x24) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x30) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x31) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x32) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x33) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x34) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x35) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x37) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x38) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x39) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC2) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x41) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x42) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x43) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x44) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x45) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB0) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB1) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB2) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB3) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB4) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB8) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB9) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xBA) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xBB) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC7) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x81) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x90) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x93) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9A) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xd1) }, // add this line
{ }
};
They both have to be additional lines as they match each other - one added without the other would cause problems.
Code:
static struct
{
unsigned char model_id;
int yRes; /* tablet Y resolution in points/inch */
int xRes; /* tablet X resolution in points/inch */
WacomModelPtr model;
} WacomModelDesc [] =
{
{ 0x00, 1000, 1000, &usbPenPartner }, /* PenPartner */
{ 0x10, 2032, 2032, &usbGraphire }, /* Graphire */
{ 0x11, 2032, 2032, &usbGraphire2 }, /* Graphire2 4x5 */
{ 0x12, 2032, 2032, &usbGraphire2 }, /* Graphire2 5x7 */
{ 0x13, 2032, 2032, &usbGraphire3 }, /* Graphire3 4x5 */
{ 0x14, 2032, 2032, &usbGraphire3 }, /* Graphire3 6x8 */
{ 0x15, 2032, 2032, &usbGraphire4 }, /* Graphire4 4x5 */
{ 0x16, 2032, 2032, &usbGraphire4 }, /* Graphire4 6x8 */
{ 0x17, 2540, 2540, &usbBambooFun }, /* BambooFun 4x5 */
{ 0x18, 2540, 2540, &usbBambooFun }, /* BambooFun 6x8 */
{ 0x19, 2032, 2032, &usbBamboo1 }, /* Bamboo1 Medium*/
{ 0x81, 2032, 2032, &usbGraphire4 }, /* Graphire4 6x8 BlueTooth */
{ 0x20, 2540, 2540, &usbIntuos1 }, /* Intuos 4x5 */
{ 0x21, 2540, 2540, &usbIntuos1 }, /* Intuos 6x8 */
{ 0x22, 2540, 2540, &usbIntuos1 }, /* Intuos 9x12 */
{ 0x23, 2540, 2540, &usbIntuos1 }, /* Intuos 12x12 */
{ 0x24, 2540, 2540, &usbIntuos1 }, /* Intuos 12x18 */
{ 0x03, 508, 508, &usbCintiqPartner }, /* PTU600 */
{ 0x30, 508, 508, &usbCintiq }, /* PL400 */
{ 0x31, 508, 508, &usbCintiq }, /* PL500 */
{ 0x32, 508, 508, &usbCintiq }, /* PL600 */
{ 0x33, 508, 508, &usbCintiq }, /* PL600SX */
{ 0x34, 508, 508, &usbCintiq }, /* PL550 */
{ 0x35, 508, 508, &usbCintiq }, /* PL800 */
{ 0x37, 508, 508, &usbCintiq }, /* PL700 */
{ 0x38, 508, 508, &usbCintiq }, /* PL510 */
{ 0x39, 508, 508, &usbCintiq }, /* PL710 */
{ 0xC0, 508, 508, &usbCintiq }, /* DTF720 */
{ 0xC2, 508, 508, &usbCintiq }, /* DTF720a */
{ 0xC4, 508, 508, &usbCintiq }, /* DTF521 */
{ 0xC7, 2540, 2540, &usbCintiq }, /* DTU1931 */
{ 0x41, 2540, 2540, &usbIntuos2 }, /* Intuos2 4x5 */
{ 0x42, 2540, 2540, &usbIntuos2 }, /* Intuos2 6x8 */
{ 0x43, 2540, 2540, &usbIntuos2 }, /* Intuos2 9x12 */
{ 0x44, 2540, 2540, &usbIntuos2 }, /* Intuos2 12x12 */
{ 0x45, 2540, 2540, &usbIntuos2 }, /* Intuos2 12x18 */
{ 0x47, 2540, 2540, &usbIntuos2 }, /* Intuos2 6x8 */
{ 0x60, 1016, 1016, &usbVolito }, /* Volito */
{ 0x61, 1016, 1016, &usbVolito2 }, /* PenStation */
{ 0x62, 1016, 1016, &usbVolito2 }, /* Volito2 4x5 */
{ 0x63, 1016, 1016, &usbVolito2 }, /* Volito2 2x3 */
{ 0x64, 1016, 1016, &usbVolito2 }, /* PenPartner2 */
{ 0x65, 2540, 2540, &usbBamboo }, /* Bamboo */
{ 0x69, 1012, 1012, &usbBamboo1 }, /* Bamboo1 */
{ 0xB0, 5080, 5080, &usbIntuos3 }, /* Intuos3 4x5 */
{ 0xB1, 5080, 5080, &usbIntuos3 }, /* Intuos3 6x8 */
{ 0xB2, 5080, 5080, &usbIntuos3 }, /* Intuos3 9x12 */
{ 0xB3, 5080, 5080, &usbIntuos3 }, /* Intuos3 12x12 */
{ 0xB4, 5080, 5080, &usbIntuos3 }, /* Intuos3 12x19 */
{ 0xB5, 5080, 5080, &usbIntuos3 }, /* Intuos3 6x11 */
{ 0xB7, 5080, 5080, &usbIntuos3 }, /* Intuos3 4x6 */
{ 0xB8, 5080, 5080, &usbIntuos4 }, /* Intuos4 4x6 */
{ 0xB9, 5080, 5080, &usbIntuos4 }, /* Intuos4 6x9 */
{ 0xBA, 5080, 5080, &usbIntuos4 }, /* Intuos4 8x13 */
{ 0xBB, 5080, 5080, &usbIntuos4 }, /* Intuos4 12x19*/
{ 0x3F, 5080, 5080, &usbCintiqV5 }, /* Cintiq 21UX */
{ 0xC5, 5080, 5080, &usbCintiqV5 }, /* Cintiq 20WSX */
{ 0xC6, 5080, 5080, &usbCintiqV5 }, /* Cintiq 12WX */
{ 0x90, 2540, 2540, &usbTabletPC }, /* TabletPC 0x90 */
{ 0x93, 2540, 2540, &usbTabletPC }, /* TabletPC 0x93 */
{ 0x9A, 2540, 2540, &usbTabletPC }, /* TabletPC 0x9A */ // add a comma after the "}" here!
{ 0xD1, 2540, 2540, &usbBamboo } /* Bamboo Pen/Touch */ // add this line
};
Let me know how that works.
Bookmarks