| Message ID | 1406330411-7851-1-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Whole series (after including bt image fix): Tested-By: Przemo Firszt <przemo@firszt.eu> Dnia 2014-07-25, pi? o godzinie 19:20 -0400, Benjamin Tissoires pisze: > Bluetooth Intuos 4 use 1-bit definition while the USB ones use a 4-bits > definition. This changes the size of the raw image we receive, and thus > the kernel will only accept 1-bit images for Bluetooth and 4-bits for > USB. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > --- > drivers/hid/wacom_sys.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c > index 3adc6ef..42f139f 100644 > --- a/drivers/hid/wacom_sys.c > +++ b/drivers/hid/wacom_sys.c > @@ -531,12 +531,14 @@ static int wacom_led_control(struct wacom *wacom) > return retval; > } > > -static int wacom_led_putimage(struct wacom *wacom, int button_id, const void *img) > +static int wacom_led_putimage(struct wacom *wacom, int button_id, > + const unsigned len, const void *img) > { > unsigned char *buf; > int i, retval; > + const unsigned chunk_len = len / 4; /* 4 chunks are needed to be sent */ > > - buf = kzalloc(259, GFP_KERNEL); > + buf = kzalloc(chunk_len + 3 , GFP_KERNEL); > if (!buf) > return -ENOMEM; > > @@ -552,11 +554,11 @@ static int wacom_led_putimage(struct wacom *wacom, int button_id, const void *im > buf[1] = button_id & 0x07; > for (i = 0; i < 4; i++) { > buf[2] = i; > - memcpy(buf + 3, img + i * 256, 256); > + memcpy(buf + 3, img + i * chunk_len, chunk_len); > > retval = wacom_set_report(wacom->hdev, HID_FEATURE_REPORT, > WAC_CMD_ICON_XFER, > - buf, 259, WAC_CMD_RETRIES); > + buf, chunk_len + 3, WAC_CMD_RETRIES); > if (retval < 0) > break; > } > @@ -657,13 +659,14 @@ static ssize_t wacom_button_image_store(struct device *dev, int button_id, > struct hid_device *hdev = container_of(dev, struct hid_device, dev); > struct wacom *wacom = hid_get_drvdata(hdev); > int err; > + const unsigned len = hdev->bus == BUS_BLUETOOTH ? 256 : 1024; > > - if (count != 1024) > + if (count != len) > return -EINVAL; > > mutex_lock(&wacom->lock); > > - err = wacom_led_putimage(wacom, button_id, buf); > + err = wacom_led_putimage(wacom, button_id, len, buf); > > mutex_unlock(&wacom->lock); >
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 3adc6ef..42f139f 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -531,12 +531,14 @@ static int wacom_led_control(struct wacom *wacom) return retval; } -static int wacom_led_putimage(struct wacom *wacom, int button_id, const void *img) +static int wacom_led_putimage(struct wacom *wacom, int button_id, + const unsigned len, const void *img) { unsigned char *buf; int i, retval; + const unsigned chunk_len = len / 4; /* 4 chunks are needed to be sent */ - buf = kzalloc(259, GFP_KERNEL); + buf = kzalloc(chunk_len + 3 , GFP_KERNEL); if (!buf) return -ENOMEM; @@ -552,11 +554,11 @@ static int wacom_led_putimage(struct wacom *wacom, int button_id, const void *im buf[1] = button_id & 0x07; for (i = 0; i < 4; i++) { buf[2] = i; - memcpy(buf + 3, img + i * 256, 256); + memcpy(buf + 3, img + i * chunk_len, chunk_len); retval = wacom_set_report(wacom->hdev, HID_FEATURE_REPORT, WAC_CMD_ICON_XFER, - buf, 259, WAC_CMD_RETRIES); + buf, chunk_len + 3, WAC_CMD_RETRIES); if (retval < 0) break; } @@ -657,13 +659,14 @@ static ssize_t wacom_button_image_store(struct device *dev, int button_id, struct hid_device *hdev = container_of(dev, struct hid_device, dev); struct wacom *wacom = hid_get_drvdata(hdev); int err; + const unsigned len = hdev->bus == BUS_BLUETOOTH ? 256 : 1024; - if (count != 1024) + if (count != len) return -EINVAL; mutex_lock(&wacom->lock); - err = wacom_led_putimage(wacom, button_id, buf); + err = wacom_led_putimage(wacom, button_id, len, buf); mutex_unlock(&wacom->lock);
Bluetooth Intuos 4 use 1-bit definition while the USB ones use a 4-bits definition. This changes the size of the raw image we receive, and thus the kernel will only accept 1-bit images for Bluetooth and 4-bits for USB. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- drivers/hid/wacom_sys.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)