Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b18b493f authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Jaroslav Kysela
Browse files

[ALSA] caiaq - misc input handling fixes 



 - link input device with its parent so that it placed in proper spot
   in sysfs hierarchy
 - drivers that allow changing their keymaps should use private copy
   of the keymap so that one instance of a device does not affect
   another instance
 - it is preferred for drivers to properly set up input_dev->phys to
   help userspace locate devices
 - drivers should use usb_to_input_id(), or perform endianess conversion,
   themselves, otherwise ID is not correct on big-endian boxes
 - whitespace and formatting cleanup
Acked-by: default avatarDaniel Mack <daniel@caiaq.de>

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent ee6df2e1

sound/usb/caiaq/caiaq-device.h

+6 −4
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct snd_usb_caiaqdev { 
	/* Linux input */

#ifdef CONFIG_SND_USB_CAIAQ_INPUT

	struct input_dev *input_dev;

	char phys[64];			/* physical device path */

	unsigned short keycode[10];

#endif



	/* ALSA */

sound/usb/caiaq/caiaq-input.c

+65 −61
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/moduleparam.h>

#include <linux/input.h>

#include <linux/usb.h>

#include <linux/usb/input.h>

#include <linux/spinlock.h>

#include <sound/driver.h>

#include <sound/core.h>
@@ -31,10 +32,10 @@ 


#ifdef CONFIG_SND_USB_CAIAQ_INPUT



static unsigned char keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };

static unsigned char keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4, 

static unsigned short keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };

static unsigned short keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

					 KEY_5, KEY_6, KEY_7 };

static unsigned char keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

static unsigned short keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

					 KEY_5, KEY_6, KEY_7, KEY_5, KEY_6 };



#define DEG90		(range / 2)
@@ -112,18 +113,20 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, 
					const unsigned char *buf,

					unsigned int len)

{

	switch(dev->input_dev->id.product) {

	struct input_dev *input_dev = dev->input_dev;



	switch (input_dev->id.product) {

	case USB_PID_RIGKONTROL2:

		input_report_abs(dev->input_dev, ABS_X, (buf[4] << 8) |buf[5]);

		input_report_abs(dev->input_dev, ABS_Y, (buf[0] << 8) |buf[1]);

		input_report_abs(dev->input_dev, ABS_Z, (buf[2] << 8) |buf[3]);

		input_sync(dev->input_dev);

		input_report_abs(input_dev, ABS_X, (buf[4] << 8) | buf[5]);

		input_report_abs(input_dev, ABS_Y, (buf[0] << 8) | buf[1]);

		input_report_abs(input_dev, ABS_Z, (buf[2] << 8) | buf[3]);

		input_sync(input_dev);

		break;

	case USB_PID_RIGKONTROL3:

		input_report_abs(dev->input_dev, ABS_X, (buf[0] << 8) |buf[1]);

		input_report_abs(dev->input_dev, ABS_Y, (buf[2] << 8) |buf[3]);

		input_report_abs(dev->input_dev, ABS_Z, (buf[4] << 8) |buf[5]);

		input_sync(dev->input_dev);

		input_report_abs(input_dev, ABS_X, (buf[0] << 8) | buf[1]);

		input_report_abs(input_dev, ABS_Y, (buf[2] << 8) | buf[3]);

		input_report_abs(input_dev, ABS_Z, (buf[4] << 8) | buf[5]);

		input_sync(input_dev);

		break;

	}

}
@@ -131,13 +134,14 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, 
static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,

				     const char *buf, unsigned int len)

{

	struct input_dev *input_dev = dev->input_dev;

	int i;



	switch(dev->input_dev->id.product) {

	switch (input_dev->id.product) {

	case USB_PID_AK1:

		i = decode_erp(buf[0], buf[1]);

		input_report_abs(dev->input_dev, ABS_X, i);

		input_sync(dev->input_dev);

		input_report_abs(input_dev, ABS_X, i);

		input_sync(input_dev);

		break;

	}

}
@@ -145,28 +149,29 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev, 
static void snd_caiaq_input_read_io(struct snd_usb_caiaqdev *dev,

				    char *buf, unsigned int len)

{

	struct input_dev *input_dev = dev->input_dev;

	unsigned short *keycode = input_dev->keycode;

	int i;

	unsigned char *keycode = dev->input_dev->keycode;



	if (!keycode)

		return;



	if (dev->input_dev->id.product == USB_PID_RIGKONTROL2)

	if (input_dev->id.product == USB_PID_RIGKONTROL2)

		for (i = 0; i < len; i++)

			buf[i] = ~buf[i];



	for (i=0; (i<dev->input_dev->keycodemax) && (i < len); i++)

		input_report_key(dev->input_dev, keycode[i], 

	for (i = 0; i < input_dev->keycodemax && i < len; i++)

		input_report_key(input_dev, keycode[i],

				 buf[i / 8] & (1 << (i % 8)));



	input_sync(dev->input_dev);

	input_sync(input_dev);

}



void snd_usb_caiaq_input_dispatch(struct snd_usb_caiaqdev *dev,

				  char *buf,

				  unsigned int len)

{

	if (!dev->input_dev || (len < 1))

	if (!dev->input_dev || len < 1)

		return;



	switch (buf[0]) {
@@ -192,37 +197,34 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev) 
	if (!input)

		return -ENOMEM;



	usb_make_path(usb_dev, dev->phys, sizeof(dev->phys));

	strlcat(dev->phys, "/input0", sizeof(dev->phys));



	input->name = dev->product_name;

	input->id.bustype = BUS_USB;

	input->id.vendor  = usb_dev->descriptor.idVendor;

	input->id.product = usb_dev->descriptor.idProduct;

	input->id.version = usb_dev->descriptor.bcdDevice;

	input->phys = dev->phys;

	usb_to_input_id(usb_dev, &input->id);

	input->dev.parent = &usb_dev->dev;



        switch (dev->chip.usb_id) {

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):

		input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

		input->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |

			BIT_MASK(ABS_Z);

		input->keycode = keycode_rk2;

		input->keycodesize = sizeof(char);

		BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_rk2));

		memcpy(dev->keycode, keycode_rk2, sizeof(keycode_rk2));

		input->keycodemax = ARRAY_SIZE(keycode_rk2);

		for (i=0; i<ARRAY_SIZE(keycode_rk2); i++)

			set_bit(keycode_rk2[i], input->keybit);



		input_set_abs_params(input, ABS_X, 0, 4096, 0, 10);

		input_set_abs_params(input, ABS_Y, 0, 4096, 0, 10);

		input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);

		snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);

		break;



	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):

		input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

		input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_Z);

		input->keycode = keycode_rk3;

		input->keycodesize = sizeof(char);

		BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_rk3));

		memcpy(dev->keycode, keycode_rk3, sizeof(keycode_rk3));

		input->keycodemax = ARRAY_SIZE(keycode_rk3);

		for (i=0; i<ARRAY_SIZE(keycode_rk3); i++)

			set_bit(keycode_rk3[i], input->keybit);



		input_set_abs_params(input, ABS_X, 0, 1024, 0, 10);

		input_set_abs_params(input, ABS_Y, 0, 1024, 0, 10);

		input_set_abs_params(input, ABS_Z, 0, 1024, 0, 10);
@@ -231,12 +233,9 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev) 
	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):

		input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

		input->absbit[0] = BIT_MASK(ABS_X);

		input->keycode = keycode_ak1;

		input->keycodesize = sizeof(char);

		BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_ak1));

		memcpy(dev->keycode, keycode_ak1, sizeof(keycode_ak1));

		input->keycodemax = ARRAY_SIZE(keycode_ak1);

		for (i=0; i<ARRAY_SIZE(keycode_ak1); i++)

			set_bit(keycode_ak1[i], input->keybit);



		input_set_abs_params(input, ABS_X, 0, 999, 0, 10);

		snd_usb_caiaq_set_auto_msg(dev, 1, 0, 5);

		break;
@@ -246,6 +245,11 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev) 
		return 0;

	}



	input->keycode = dev->keycode;

	input->keycodesize = sizeof(unsigned short);

	for (i = 0; i < input->keycodemax; i++)

		__set_bit(dev->keycode[i], input->keybit);



	ret = input_register_device(input);

	if (ret < 0) {

		input_free_device(input);