git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
[pandora-kernel.git]
/
drivers
/
hid
/
hid-roccat-common.c
diff --git
a/drivers/hid/hid-roccat-common.c
b/drivers/hid/hid-roccat-common.c
index
13b1eb0
..
edf898d
100644
(file)
--- a/
drivers/hid/hid-roccat-common.c
+++ b/
drivers/hid/hid-roccat-common.c
@@
-11,10
+11,16
@@
* any later version.
*/
* any later version.
*/
+#include <linux/hid.h>
#include <linux/slab.h>
#include "hid-roccat-common.h"
#include <linux/slab.h>
#include "hid-roccat-common.h"
-int roccat_common_receive(struct usb_device *usb_dev, uint usb_command,
+static inline uint16_t roccat_common_feature_report(uint8_t report_id)
+{
+ return 0x300 | report_id;
+}
+
+int roccat_common_receive(struct usb_device *usb_dev, uint report_id,
void *data, uint size)
{
char *buf;
void *data, uint size)
{
char *buf;
@@
-25,9
+31,10
@@
int roccat_common_receive(struct usb_device *usb_dev, uint usb_command,
return -ENOMEM;
len = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0),
return -ENOMEM;
len = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0),
-
USB_REQ_CLEAR_FEATURE
,
+
HID_REQ_GET_REPORT
,
USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
- usb_command, 0, buf, size, USB_CTRL_SET_TIMEOUT);
+ roccat_common_feature_report(report_id),
+ 0, buf, size, USB_CTRL_SET_TIMEOUT);
memcpy(data, buf, size);
kfree(buf);
memcpy(data, buf, size);
kfree(buf);
@@
-35,7
+42,7
@@
int roccat_common_receive(struct usb_device *usb_dev, uint usb_command,
}
EXPORT_SYMBOL_GPL(roccat_common_receive);
}
EXPORT_SYMBOL_GPL(roccat_common_receive);
-int roccat_common_send(struct usb_device *usb_dev, uint
usb_comman
d,
+int roccat_common_send(struct usb_device *usb_dev, uint
report_i
d,
void const *data, uint size)
{
char *buf;
void const *data, uint size)
{
char *buf;
@@
-48,9
+55,10
@@
int roccat_common_send(struct usb_device *usb_dev, uint usb_command,
memcpy(buf, data, size);
len = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
memcpy(buf, data, size);
len = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
-
USB_REQ_SET_CONFIGURATION
,
+
HID_REQ_SET_REPORT
,
USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
- usb_command, 0, buf, size, USB_CTRL_SET_TIMEOUT);
+ roccat_common_feature_report(report_id),
+ 0, buf, size, USB_CTRL_SET_TIMEOUT);
kfree(buf);
return ((len < 0) ? len : ((len != size) ? -EIO : 0));
kfree(buf);
return ((len < 0) ? len : ((len != size) ? -EIO : 0));