This commit is contained in:
ond 2011-11-02 21:26:08 +01:00
parent c5f01d41af
commit 64235e67e6
2 changed files with 53 additions and 40 deletions

11
README
View File

@ -1,5 +1,5 @@
Hanvon Artmaster 0806,1209 Tablet Driver Hanvon Artmaster I Tablet Driver
======================================== ================================
Driver for Linux kernels which supports complete functionality of the tablet: Driver for Linux kernels which supports complete functionality of the tablet:
pen coordinates, touch/float/click detection, pressure, x and y tilt, pen button, pen coordinates, touch/float/click detection, pressure, x and y tilt, pen button,
@ -22,7 +22,7 @@ Diagnostics
=========== ===========
After insmod, check with dmesg, if the module was loaded properly. After insmod, check with dmesg, if the module was loaded properly.
"v0.3b:USB Hanvon AM0806,AM1209 tablet driver" should appear in the listing. "USB Hanvon Artmaster I tablet driver v0.3d" should appear in the listing.
lsmod should also contain hanvon in its listing: lsmod | grep hanvon lsmod should also contain hanvon in its listing: lsmod | grep hanvon
@ -33,5 +33,6 @@ Revision history
0.0.1 - initial release 0.0.1 - initial release
0.2 - corrected pressure detection, working slider button 0.2 - corrected pressure detection, working slider button
0.3 - remaining buttons also working, added x and y tilting 0.3 - remaining buttons also working, added x and y tilting
0.3b - patch for AM1209 support from Markus Zucker applied 0.3b - patch for AM1209 from Markus Zucker applied
0.3c - patch for AM1107 from Daniel Koch applied
0.3d - support for right side buttons of AM1107 and AM1209

View File

@ -7,7 +7,7 @@
#define DRIVER_VERSION "0.4" #define DRIVER_VERSION "0.4"
#define DRIVER_AUTHOR "Ondra Havel <ondra.havel@gmail.com>" #define DRIVER_AUTHOR "Ondra Havel <ondra.havel@gmail.com>"
#define DRIVER_DESC "USB Hanvon Art Master I (AM0806 and AM1209) tablet driver" #define DRIVER_DESC "USB Hanvon Artmaster I tablet driver"
#define DRIVER_LICENSE "GPL" #define DRIVER_LICENSE "GPL"
MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_AUTHOR(DRIVER_AUTHOR);
@ -16,13 +16,13 @@ MODULE_LICENSE(DRIVER_LICENSE);
#define USB_VENDOR_ID_HANVON 0x0b57 #define USB_VENDOR_ID_HANVON 0x0b57
#define USB_PRODUCT_ID_AM0806 0x8502 #define USB_PRODUCT_ID_AM0806 0x8502
#define USB_PRODUCT_ID_AM1107 0x8505
#define USB_PRODUCT_ID_AM1209 0x8501 #define USB_PRODUCT_ID_AM1209 0x8501
#define USB_AM_PACKET_LEN 10 #define USB_AM_PACKET_LEN 10
#define AM_BUTTON_0 BTN_0 static int lbuttons[]={BTN_0,BTN_1,BTN_2,BTN_3};
#define AM_BUTTON_1 BTN_1 static int rbuttons[]={BTN_4,BTN_5,BTN_6,BTN_7};
#define AM_BUTTON_2 BTN_2
#define AM_BUTTON_3 BTN_3
#define AM_WHEEL_THRESHOLD 4 #define AM_WHEEL_THRESHOLD 4
#define AM_MAX_ABS_X 0x27de #define AM_MAX_ABS_X 0x27de
@ -41,6 +41,25 @@ struct hanvon {
char phys[32]; char phys[32];
}; };
static void report_buttons(struct hanvon *hanvon, int buttons[],unsigned char dta)
{
struct input_dev *dev = hanvon->dev;
if((dta & 0xf0) == 0xa0) {
input_report_key(dev, buttons[1], dta & 0x02);
input_report_key(dev, buttons[2], dta & 0x04);
input_report_key(dev, buttons[3], dta & 0x08);
} else {
if(dta <= 0x3f) { /* slider area active */
int diff = dta - hanvon->old_wheel_pos;
if(abs(diff) < AM_WHEEL_THRESHOLD)
input_report_rel(dev, REL_WHEEL, diff);
hanvon->old_wheel_pos = dta;
}
}
}
static void hanvon_irq(struct urb *urb) static void hanvon_irq(struct urb *urb)
{ {
struct hanvon *hanvon = urb->context; struct hanvon *hanvon = urb->context;
@ -64,34 +83,26 @@ static void hanvon_irq(struct urb *urb)
} }
switch(data[0]) { switch(data[0]) {
case 0x01: /* button press */ case 0x01: /* button press */
if((data[2] & 0xf0) == 0xa0) { if(data[1]==0x55) /* left side */
input_report_key(dev, AM_BUTTON_1, data[2] & 0x02); report_buttons(hanvon,lbuttons,data[2]);
input_report_key(dev, AM_BUTTON_2, data[2] & 0x04);
input_report_key(dev, AM_BUTTON_3, data[2] & 0x08);
} else {
if(data[2] <= 0x3f) { /* slider area active */
int diff = data[2] - hanvon->old_wheel_pos;
if(abs(diff) < AM_WHEEL_THRESHOLD)
input_report_rel(dev, REL_WHEEL, diff);
hanvon->old_wheel_pos = data[2]; if(data[3]==0xaa) /* right side (am1107, am1209) */
report_buttons(hanvon,rbuttons,data[4]);
break;
case 0x02: /* position change */
if((data[1] & 0xf0) != 0) {
input_report_abs(dev, ABS_X, get_unaligned_be16(&data[2]));
input_report_abs(dev, ABS_Y, get_unaligned_be16(&data[4]));
input_report_abs(dev, ABS_TILT_X, data[7] & 0x3f);
input_report_abs(dev, ABS_TILT_Y, data[8]);
input_report_abs(dev, ABS_PRESSURE, get_unaligned_be16(&data[6])>>6);
} }
}
break;
case 0x02: /* position change */
if((data[1] & 0xf0) != 0) {
input_report_abs(dev, ABS_X, get_unaligned_be16(&data[2]));
input_report_abs(dev, ABS_Y, get_unaligned_be16(&data[4]));
input_report_abs(dev, ABS_TILT_X, data[7] & 0x3f);
input_report_abs(dev, ABS_TILT_Y, data[8]);
input_report_abs(dev, ABS_PRESSURE, get_unaligned_be16(&data[6])>>6);
}
input_report_key(dev, BTN_LEFT, data[1] & 0x1); input_report_key(dev, BTN_LEFT, data[1] & 0x1);
input_report_key(dev, BTN_RIGHT, data[1] & 0x2); /* stylus button pressed (right click) */ input_report_key(dev, BTN_RIGHT, data[1] & 0x2); /* stylus button pressed (right click) */
input_report_key(dev, AM_BUTTON_0, data[1] & 0x20); input_report_key(dev, lbuttons[0], data[1] & 0x20);
break; break;
} }
@ -105,6 +116,7 @@ exit:
static struct usb_device_id hanvon_ids[] = { static struct usb_device_id hanvon_ids[] = {
{ USB_DEVICE(USB_VENDOR_ID_HANVON, USB_PRODUCT_ID_AM1209) }, { USB_DEVICE(USB_VENDOR_ID_HANVON, USB_PRODUCT_ID_AM1209) },
{ USB_DEVICE(USB_VENDOR_ID_HANVON, USB_PRODUCT_ID_AM1107) },
{ USB_DEVICE(USB_VENDOR_ID_HANVON, USB_PRODUCT_ID_AM0806) }, { USB_DEVICE(USB_VENDOR_ID_HANVON, USB_PRODUCT_ID_AM0806) },
{ } { }
}; };
@ -136,7 +148,7 @@ static int hanvon_probe(struct usb_interface *intf, const struct usb_device_id *
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
struct hanvon *hanvon; struct hanvon *hanvon;
struct input_dev *input_dev; struct input_dev *input_dev;
int error = -ENOMEM; int error = -ENOMEM, i;
hanvon = kzalloc(sizeof(struct hanvon), GFP_KERNEL); hanvon = kzalloc(sizeof(struct hanvon), GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
@ -157,7 +169,7 @@ static int hanvon_probe(struct usb_interface *intf, const struct usb_device_id *
usb_make_path(dev, hanvon->phys, sizeof(hanvon->phys)); usb_make_path(dev, hanvon->phys, sizeof(hanvon->phys));
strlcat(hanvon->phys, "/input0", sizeof(hanvon->phys)); strlcat(hanvon->phys, "/input0", sizeof(hanvon->phys));
input_dev->name = "Hanvon Art Master Tablet"; input_dev->name = "Hanvon Artmaster I tablet";
input_dev->phys = hanvon->phys; input_dev->phys = hanvon->phys;
usb_to_input_id(dev, &input_dev->id); usb_to_input_id(dev, &input_dev->id);
input_dev->dev.parent = &intf->dev; input_dev->dev.parent = &intf->dev;
@ -170,10 +182,10 @@ static int hanvon_probe(struct usb_interface *intf, const struct usb_device_id *
input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) | BIT_MASK(EV_REL); input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) | BIT_MASK(EV_REL);
input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_TOUCH); input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_TOUCH);
input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT); input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
__set_bit(AM_BUTTON_0, input_dev->keybit); for(i=0;i<sizeof(lbuttons)/sizeof(lbuttons[0]);i++)
__set_bit(AM_BUTTON_1, input_dev->keybit); __set_bit(lbuttons[i], input_dev->keybit);
__set_bit(AM_BUTTON_2, input_dev->keybit); for(i=0;i<sizeof(rbuttons)/sizeof(rbuttons[0]);i++)
__set_bit(AM_BUTTON_3, input_dev->keybit); __set_bit(rbuttons[i], input_dev->keybit);
input_set_abs_params(input_dev, ABS_X, 0, AM_MAX_ABS_X, 4, 0); input_set_abs_params(input_dev, ABS_X, 0, AM_MAX_ABS_X, 4, 0);
input_set_abs_params(input_dev, ABS_Y, 0, AM_MAX_ABS_Y, 4, 0); input_set_abs_params(input_dev, ABS_Y, 0, AM_MAX_ABS_Y, 4, 0);
@ -233,7 +245,7 @@ static int __init hanvon_init(void)
if((rv = usb_register(&hanvon_driver)) != 0) if((rv = usb_register(&hanvon_driver)) != 0)
return rv; return rv;
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n"); printk(DRIVER_DESC " " DRIVER_VERSION "\n");
return 0; return 0;
} }