HID: roccat: clean up isku driver (6e5920dd) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/hid/hid-roccat-isku.c

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -167,7 +167,7 @@ static ssize_t isku_sysfs_write_ ## thingy(struct file fp, struct kobject kobj
	loff_t off, size_t count) \		loff_t off, size_t count) \
	{ \		{ \
	return isku_sysfs_write(fp, kobj, buf, off, count, \		return isku_sysfs_write(fp, kobj, buf, off, count, \
	sizeof(struct isku_ ## thingy), ISKU_COMMAND_ ## THINGY); \		ISKU_SIZE_ ## THINGY, ISKU_COMMAND_ ## THINGY); \
	}		}

	#define ISKU_SYSFS_R(thingy, THINGY) \		#define ISKU_SYSFS_R(thingy, THINGY) \
	@@ -176,32 +176,32 @@ static ssize_t isku_sysfs_read_ ## thingy(struct file fp, struct kobject kobj,
	loff_t off, size_t count) \		loff_t off, size_t count) \
	{ \		{ \
	return isku_sysfs_read(fp, kobj, buf, off, count, \		return isku_sysfs_read(fp, kobj, buf, off, count, \
	sizeof(struct isku_ ## thingy), ISKU_COMMAND_ ## THINGY); \		ISKU_SIZE_ ## THINGY, ISKU_COMMAND_ ## THINGY); \
	}		}

	#define ISKU_SYSFS_RW(thingy, THINGY) \		#define ISKU_SYSFS_RW(thingy, THINGY) \
	ISKU_SYSFS_R(thingy, THINGY) \		ISKU_SYSFS_R(thingy, THINGY) \
	ISKU_SYSFS_W(thingy, THINGY)		ISKU_SYSFS_W(thingy, THINGY)

	#define ISKU_BIN_ATTR_RW(thingy) \		#define ISKU_BIN_ATTR_RW(thingy, THINGY) \
	{ \		{ \
	.attr = { .name = #thingy, .mode = 0660 }, \		.attr = { .name = #thingy, .mode = 0660 }, \
	.size = sizeof(struct isku_ ## thingy), \		.size = ISKU_SIZE_ ## THINGY, \
	.read = isku_sysfs_read_ ## thingy, \		.read = isku_sysfs_read_ ## thingy, \
	.write = isku_sysfs_write_ ## thingy \		.write = isku_sysfs_write_ ## thingy \
	}		}

	#define ISKU_BIN_ATTR_R(thingy) \		#define ISKU_BIN_ATTR_R(thingy, THINGY) \
	{ \		{ \
	.attr = { .name = #thingy, .mode = 0440 }, \		.attr = { .name = #thingy, .mode = 0440 }, \
	.size = sizeof(struct isku_ ## thingy), \		.size = ISKU_SIZE_ ## THINGY, \
	.read = isku_sysfs_read_ ## thingy, \		.read = isku_sysfs_read_ ## thingy, \
	}		}

	#define ISKU_BIN_ATTR_W(thingy) \		#define ISKU_BIN_ATTR_W(thingy, THINGY) \
	{ \		{ \
	.attr = { .name = #thingy, .mode = 0220 }, \		.attr = { .name = #thingy, .mode = 0220 }, \
	.size = sizeof(struct isku_ ## thingy), \		.size = ISKU_SIZE_ ## THINGY, \
	.write = isku_sysfs_write_ ## thingy \		.write = isku_sysfs_write_ ## thingy \
	}		}

	@@ -220,19 +220,19 @@ ISKU_SYSFS_R(info, INFO)
	ISKU_SYSFS_W(control, CONTROL)		ISKU_SYSFS_W(control, CONTROL)

	static struct bin_attribute isku_bin_attributes[] = {		static struct bin_attribute isku_bin_attributes[] = {
	ISKU_BIN_ATTR_RW(macro),		ISKU_BIN_ATTR_RW(macro, MACRO),
	ISKU_BIN_ATTR_RW(keys_function),		ISKU_BIN_ATTR_RW(keys_function, KEYS_FUNCTION),
	ISKU_BIN_ATTR_RW(keys_easyzone),		ISKU_BIN_ATTR_RW(keys_easyzone, KEYS_EASYZONE),
	ISKU_BIN_ATTR_RW(keys_media),		ISKU_BIN_ATTR_RW(keys_media, KEYS_MEDIA),
	ISKU_BIN_ATTR_RW(keys_thumbster),		ISKU_BIN_ATTR_RW(keys_thumbster, KEYS_THUMBSTER),
	ISKU_BIN_ATTR_RW(keys_macro),		ISKU_BIN_ATTR_RW(keys_macro, KEYS_MACRO),
	ISKU_BIN_ATTR_RW(keys_capslock),		ISKU_BIN_ATTR_RW(keys_capslock, KEYS_CAPSLOCK),
	ISKU_BIN_ATTR_RW(light),		ISKU_BIN_ATTR_RW(light, LIGHT),
	ISKU_BIN_ATTR_RW(key_mask),		ISKU_BIN_ATTR_RW(key_mask, KEY_MASK),
	ISKU_BIN_ATTR_RW(last_set),		ISKU_BIN_ATTR_RW(last_set, LAST_SET),
	ISKU_BIN_ATTR_W(talk),		ISKU_BIN_ATTR_W(talk, TALK),
	ISKU_BIN_ATTR_R(info),		ISKU_BIN_ATTR_R(info, INFO),
	ISKU_BIN_ATTR_W(control),		ISKU_BIN_ATTR_W(control, CONTROL),
	__ATTR_NULL		__ATTR_NULL
	};		};

drivers/hid/hid-roccat-isku.h

+16 −60

Original line number	Original line	Diff line number	Diff line
	@@ -14,77 +14,33 @@

	#include <linux/types.h>		#include <linux/types.h>

			enum {
			ISKU_SIZE_CONTROL = 0x03,
			ISKU_SIZE_INFO = 0x06,
			ISKU_SIZE_KEY_MASK = 0x06,
			ISKU_SIZE_KEYS_FUNCTION = 0x29,
			ISKU_SIZE_KEYS_EASYZONE = 0x41,
			ISKU_SIZE_KEYS_MEDIA = 0x1d,
			ISKU_SIZE_KEYS_THUMBSTER = 0x17,
			ISKU_SIZE_KEYS_MACRO = 0x23,
			ISKU_SIZE_KEYS_CAPSLOCK = 0x06,
			ISKU_SIZE_LAST_SET = 0x14,
			ISKU_SIZE_LIGHT = 0x0a,
			ISKU_SIZE_MACRO = 0x823,
			ISKU_SIZE_TALK = 0x10,
			};

	enum {		enum {
	ISKU_PROFILE_NUM = 5,		ISKU_PROFILE_NUM = 5,
	ISKU_USB_INTERFACE_PROTOCOL = 0,		ISKU_USB_INTERFACE_PROTOCOL = 0,
	};		};

	struct isku_control {
	uint8_t command; /* ISKU_COMMAND_CONTROL */
	uint8_t value;
	uint8_t request;
	} __packed;

	struct isku_actual_profile {		struct isku_actual_profile {
	uint8_t command; /* ISKU_COMMAND_ACTUAL_PROFILE */		uint8_t command; /* ISKU_COMMAND_ACTUAL_PROFILE */
	uint8_t size; /* always 3 */		uint8_t size; /* always 3 */
	uint8_t actual_profile;		uint8_t actual_profile;
	} __packed;		} __packed;

	struct isku_key_mask {
	uint8_t command; /* ISKU_COMMAND_KEY_MASK */
	uint8_t size; /* 6 */
	uint8_t profile_number; /* 0-4 */
	uint8_t mask;
	uint16_t checksum;
	} __packed;

	struct isku_keys_function {
	uint8_t data[0x29];
	} __packed;

	struct isku_keys_easyzone {
	uint8_t data[0x41];
	} __packed;

	struct isku_keys_media {
	uint8_t data[0x1d];
	} __packed;

	struct isku_keys_thumbster {
	uint8_t data[0x17];
	} __packed;

	struct isku_keys_macro {
	uint8_t data[0x23];
	} __packed;

	struct isku_keys_capslock {
	uint8_t data[0x6];
	} __packed;

	struct isku_macro {
	uint8_t data[0x823];
	} __packed;

	struct isku_light {
	uint8_t data[0xa];
	} __packed;

	struct isku_info {
	uint8_t data[2];
	uint8_t firmware_version;
	uint8_t unknown[3];
	} __packed;

	struct isku_talk {
	uint8_t data[0x10];
	} __packed;

	struct isku_last_set {
	uint8_t data[0x14];
	} __packed;

	enum isku_commands {		enum isku_commands {
	ISKU_COMMAND_CONTROL = 0x4,		ISKU_COMMAND_CONTROL = 0x4,
	ISKU_COMMAND_ACTUAL_PROFILE = 0x5,		ISKU_COMMAND_ACTUAL_PROFILE = 0x5,