diff mbox

[1/1] Support for CMedia CM6533 HID audio jack controls.

Message ID 1450164999-3130-1-git-send-email-ben_chen@bizlinktech.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Ben Chen Dec. 15, 2015, 7:36 a.m. UTC 
Signed-off-by: Ben Chen <ben_chen@bizlinktech.com>
---
 drivers/hid/Kconfig      |   6 ++
 drivers/hid/Makefile     |   1 +
 drivers/hid/hid-cm6533.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/hid/hid-core.c   |   1 +
 drivers/hid/hid-ids.h    |   1 +
 5 files changed, 177 insertions(+)
 create mode 100644 drivers/hid/hid-cm6533.c

Comments

kernel test robot Dec. 15, 2015, 8:09 a.m. UTC | #1 
Hi Ben,

[auto build test WARNING on hid/for-next]
[also build test WARNING on v4.4-rc5 next-20151214]

url:    https://github.com/0day-ci/linux/commits/Ben-Chen/Support-for-CMedia-CM6533-HID-audio-jack-controls/20151215-153958
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git for-next
config: x86_64-allmodconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

>> drivers/hid/hid-cm6533.c:162:22: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
     .input_configured = cmhid_input_configured,
                         ^
   drivers/hid/hid-cm6533.c:162:22: note: (near initialization for 'cmhid_driver.input_configured')

vim +162 drivers/hid/hid-cm6533.c

   146		struct cmhid *cm = hid_get_drvdata(hid);
   147	
   148		hid_hw_stop(hid);
   149		kfree(cm);
   150	}
   151	
   152	static const struct hid_device_id cmhid_devices[] = {
   153		{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },
   154		{ }
   155	};
   156	MODULE_DEVICE_TABLE(hid, cmhid_devices);
   157	
   158	static struct hid_driver cmhid_driver = {
   159		.name = "cm6533_jd",
   160		.id_table = cmhid_devices,
   161		.raw_event = cmhid_raw_event,
 > 162		.input_configured = cmhid_input_configured,
   163		.probe = cmhid_probe,
   164		.remove = cmhid_remove,
   165		.input_mapping = cmhid_input_mapping,
   166	};
   167	module_hid_driver(cmhid_driver);
   168	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Jiri Kosina Dec. 16, 2015, 1:45 p.m. UTC | #2 
On Tue, 15 Dec 2015, Ben Chen wrote:

> Signed-off-by: Ben Chen <ben_chen@bizlinktech.com>

Please provide a changelog. At least a description of the device and 
overview of changes that are needed on top of generic HID should be 
provided. Thanks.

> ---
>  drivers/hid/Kconfig      |   6 ++
>  drivers/hid/Makefile     |   1 +
>  drivers/hid/hid-cm6533.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++
>  drivers/hid/hid-core.c   |   1 +
>  drivers/hid/hid-ids.h    |   1 +
>  5 files changed, 177 insertions(+)
>  create mode 100644 drivers/hid/hid-cm6533.c
> 
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index 513a16c..4e0ca39 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -196,6 +196,12 @@ config HID_PRODIKEYS
>  	  multimedia keyboard, but will lack support for the musical keyboard
>  	  and some additional multimedia keys.
>  
> +config HID_CM6533
> +	tristate "CMedia CM6533 HID audio jack controls"
> +	depends on HID
> +	---help---
> +	Support for CMedia CM6533 HID audio jack controls.
> +
>  config HID_CP2112
>  	tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"
>  	depends on USB_HID && I2C && GPIOLIB
> diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
> index 00011fe..63f99bd 100644
> --- a/drivers/hid/Makefile
> +++ b/drivers/hid/Makefile
> @@ -29,6 +29,7 @@ obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o
>  obj-$(CONFIG_HID_BETOP_FF)	+= hid-betopff.o
>  obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o
>  obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o
> +obj-$(CONFIG_HID_CM6533)	+= hid-cm6533.o
>  obj-$(CONFIG_HID_CORSAIR)	+= hid-corsair.o
>  obj-$(CONFIG_HID_CP2112)	+= hid-cp2112.o
>  obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o
> diff --git a/drivers/hid/hid-cm6533.c b/drivers/hid/hid-cm6533.c
> new file mode 100644
> index 0000000..a097f8b
> --- /dev/null
> +++ b/drivers/hid/hid-cm6533.c
> @@ -0,0 +1,168 @@
> +/*
> + * HID driver for CMedia CM6533 audio jack controls
> + *
> + * Copyright (C) 2015 Ben Chen <ben_chen@bizlinktech.com>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/device.h>
> +#include <linux/hid.h>
> +#include <linux/module.h>
> +#include "hid-ids.h"
> +
> +MODULE_AUTHOR("Ben Chen");
> +MODULE_DESCRIPTION("CM6533 HID jack controls");
> +MODULE_LICENSE("GPL");
> +
> +#define CM6533_JD_TYPE_COUNT      1
> +#define CM6533_JD_RAWEV_LEN	 16
> +#define CM6533_JD_SFX_OFFSET	  8
> +
> +/*
> +*
> +*CM6533 audio jack HID raw events:
> +*
> +*Plug in:
> +*01000600 002083xx 080008c0 10000000
> +*about 3 seconds later...
> +*01000a00 002083xx 08000380 10000000
> +*01000600 002083xx 08000380 10000000
> +*
> +*Plug out:
> +*01000400 002083xx 080008c0 x0000000
> +*/
> +
> +static const u8 ji_sfx[] = { 0x08, 0x00, 0x08, 0xc0 };
> +static const u8 ji_in[]  = { 0x01, 0x00, 0x06, 0x00 };
> +static const u8 ji_out[] = { 0x01, 0x00, 0x04, 0x00 };
> +
> +static int jack_switch_types[CM6533_JD_TYPE_COUNT] = {
> +	SW_HEADPHONE_INSERT,
> +};
> +
> +struct cmhid {
> +	struct input_dev *input_dev;
> +	struct hid_device *hid;
> +	unsigned short switch_map[CM6533_JD_TYPE_COUNT];
> +};
> +
> +static void hp_ev(struct hid_device *hid, struct cmhid *cm, int value)
> +{
> +	input_report_switch(cm->input_dev, SW_HEADPHONE_INSERT, value);
> +	input_sync(cm->input_dev);
> +}
> +
> +static int cmhid_raw_event(struct hid_device *hid, struct hid_report *report,
> +	 u8 *data, int len)
> +{
> +	struct cmhid *cm = hid_get_drvdata(hid);
> +
> +	if (len != CM6533_JD_RAWEV_LEN)
> +		goto out;
> +	if (memcmp(data+CM6533_JD_SFX_OFFSET, ji_sfx, sizeof(ji_sfx)))
> +		goto out;
> +
> +	if (!memcmp(data, ji_out, sizeof(ji_out))) {
> +		hp_ev(hid, cm, 0);
> +		goto out;
> +	}
> +	if (!memcmp(data, ji_in, sizeof(ji_in))) {
> +		hp_ev(hid, cm, 1);
> +		goto out;
> +	}
> +
> +out:
> +	return 0;
> +}
> +
> +static void cmhid_input_configured(struct hid_device *hid,

input_configured callback is prototyped to return int.

> +		struct hid_input *hidinput)
> +{
> +	struct input_dev *input_dev = hidinput->input;
> +	struct cmhid *cm = hid_get_drvdata(hid);
> +	int i;
> +
> +	hid_info(hid, "cmhid_input_configured\n");
> +	cm->input_dev = input_dev;
> +	memcpy(cm->switch_map, jack_switch_types, sizeof(cm->switch_map));
> +	input_dev->evbit[0] = BIT(EV_SW);
> +	for (i = 0; i < CM6533_JD_TYPE_COUNT; i++)
> +		input_set_capability(cm->input_dev,
> +				EV_SW, jack_switch_types[i]);
> +}
> +
> +static int cmhid_input_mapping(struct hid_device *hid,
> +		struct hid_input *hi, struct hid_field *field,
> +		struct hid_usage *usage, unsigned long **bit, int *max)
> +{
> +	return -1;
> +}

Why do you need this at all?

[ ... snip ... ]
> -- 
> Legal Disclaimer:
> The information contained in this message may be privileged and 
> confidential. It is intended to be read only by the individual or entity to 
> whom it is addressed or by their designee. If the reader of this message is 
> not the intended recipient, you  are not to copy,disclose,or distribute 
> this e-mail or its contents to any other person and any such actions are 
> unlawful. If you have received this message in error, please immediately 
> notify the sender and delete or destroy any copy of this message!

I would feel more comfortable if your further patch submissions do not 
contain this.

Thanks,
diff mbox

Patch

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 513a16c..4e0ca39 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -196,6 +196,12 @@  config HID_PRODIKEYS
 	  multimedia keyboard, but will lack support for the musical keyboard
 	  and some additional multimedia keys.
 
+config HID_CM6533
+	tristate "CMedia CM6533 HID audio jack controls"
+	depends on HID
+	---help---
+	Support for CMedia CM6533 HID audio jack controls.
+
 config HID_CP2112
 	tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"
 	depends on USB_HID && I2C && GPIOLIB
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 00011fe..63f99bd 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -29,6 +29,7 @@  obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o
 obj-$(CONFIG_HID_BETOP_FF)	+= hid-betopff.o
 obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o
 obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o
+obj-$(CONFIG_HID_CM6533)	+= hid-cm6533.o
 obj-$(CONFIG_HID_CORSAIR)	+= hid-corsair.o
 obj-$(CONFIG_HID_CP2112)	+= hid-cp2112.o
 obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o
diff --git a/drivers/hid/hid-cm6533.c b/drivers/hid/hid-cm6533.c
new file mode 100644
index 0000000..a097f8b
--- /dev/null
+++ b/drivers/hid/hid-cm6533.c
@@ -0,0 +1,168 @@ 
+/*
+ * HID driver for CMedia CM6533 audio jack controls
+ *
+ * Copyright (C) 2015 Ben Chen <ben_chen@bizlinktech.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+#include "hid-ids.h"
+
+MODULE_AUTHOR("Ben Chen");
+MODULE_DESCRIPTION("CM6533 HID jack controls");
+MODULE_LICENSE("GPL");
+
+#define CM6533_JD_TYPE_COUNT      1
+#define CM6533_JD_RAWEV_LEN	 16
+#define CM6533_JD_SFX_OFFSET	  8
+
+/*
+*
+*CM6533 audio jack HID raw events:
+*
+*Plug in:
+*01000600 002083xx 080008c0 10000000
+*about 3 seconds later...
+*01000a00 002083xx 08000380 10000000
+*01000600 002083xx 08000380 10000000
+*
+*Plug out:
+*01000400 002083xx 080008c0 x0000000
+*/
+
+static const u8 ji_sfx[] = { 0x08, 0x00, 0x08, 0xc0 };
+static const u8 ji_in[]  = { 0x01, 0x00, 0x06, 0x00 };
+static const u8 ji_out[] = { 0x01, 0x00, 0x04, 0x00 };
+
+static int jack_switch_types[CM6533_JD_TYPE_COUNT] = {
+	SW_HEADPHONE_INSERT,
+};
+
+struct cmhid {
+	struct input_dev *input_dev;
+	struct hid_device *hid;
+	unsigned short switch_map[CM6533_JD_TYPE_COUNT];
+};
+
+static void hp_ev(struct hid_device *hid, struct cmhid *cm, int value)
+{
+	input_report_switch(cm->input_dev, SW_HEADPHONE_INSERT, value);
+	input_sync(cm->input_dev);
+}
+
+static int cmhid_raw_event(struct hid_device *hid, struct hid_report *report,
+	 u8 *data, int len)
+{
+	struct cmhid *cm = hid_get_drvdata(hid);
+
+	if (len != CM6533_JD_RAWEV_LEN)
+		goto out;
+	if (memcmp(data+CM6533_JD_SFX_OFFSET, ji_sfx, sizeof(ji_sfx)))
+		goto out;
+
+	if (!memcmp(data, ji_out, sizeof(ji_out))) {
+		hp_ev(hid, cm, 0);
+		goto out;
+	}
+	if (!memcmp(data, ji_in, sizeof(ji_in))) {
+		hp_ev(hid, cm, 1);
+		goto out;
+	}
+
+out:
+	return 0;
+}
+
+static void cmhid_input_configured(struct hid_device *hid,
+		struct hid_input *hidinput)
+{
+	struct input_dev *input_dev = hidinput->input;
+	struct cmhid *cm = hid_get_drvdata(hid);
+	int i;
+
+	hid_info(hid, "cmhid_input_configured\n");
+	cm->input_dev = input_dev;
+	memcpy(cm->switch_map, jack_switch_types, sizeof(cm->switch_map));
+	input_dev->evbit[0] = BIT(EV_SW);
+	for (i = 0; i < CM6533_JD_TYPE_COUNT; i++)
+		input_set_capability(cm->input_dev,
+				EV_SW, jack_switch_types[i]);
+}
+
+static int cmhid_input_mapping(struct hid_device *hid,
+		struct hid_input *hi, struct hid_field *field,
+		struct hid_usage *usage, unsigned long **bit, int *max)
+{
+	return -1;
+}
+
+static int cmhid_probe(struct hid_device *hid, const struct hid_device_id *id)
+{
+	int ret;
+	struct cmhid *cm;
+
+	cm = kzalloc(sizeof(struct cmhid), GFP_KERNEL);
+	if (!cm) {
+		ret = -ENOMEM;
+		goto allocfail;
+	}
+
+	cm->hid = hid;
+
+	hid->quirks |= HID_QUIRK_HIDINPUT_FORCE;
+	hid_set_drvdata(hid, cm);
+
+	ret = hid_parse(hid);
+	if (ret) {
+		hid_err(hid, "parse failed\n");
+		goto fail;
+	}
+
+	ret = hid_hw_start(hid, HID_CONNECT_DEFAULT | HID_CONNECT_HIDDEV_FORCE);
+	if (ret) {
+		hid_err(hid, "hw start failed\n");
+		goto fail;
+	}
+
+	return 0;
+fail:
+	kfree(cm);
+allocfail:
+	return ret;
+}
+
+static void cmhid_remove(struct hid_device *hid)
+{
+	struct cmhid *cm = hid_get_drvdata(hid);
+
+	hid_hw_stop(hid);
+	kfree(cm);
+}
+
+static const struct hid_device_id cmhid_devices[] = {
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },
+	{ }
+};
+MODULE_DEVICE_TABLE(hid, cmhid_devices);
+
+static struct hid_driver cmhid_driver = {
+	.name = "cm6533_jd",
+	.id_table = cmhid_devices,
+	.raw_event = cmhid_raw_event,
+	.input_configured = cmhid_input_configured,
+	.probe = cmhid_probe,
+	.remove = cmhid_remove,
+	.input_mapping = cmhid_input_mapping,
+};
+module_hid_driver(cmhid_driver);
+
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c6f7a69..d8e55fe 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2056,6 +2056,7 @@  static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },
 	{ }
 };
 
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9024a3d..86fa1e6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -246,6 +246,7 @@ 
 
 #define USB_VENDOR_ID_CMEDIA		0x0d8c
 #define USB_DEVICE_ID_CM109		0x000e
+#define USB_DEVICE_ID_CM6533		0x0022
 
 #define USB_VENDOR_ID_CODEMERCS		0x07c0
 #define USB_DEVICE_ID_CODEMERCS_IOW_FIRST	0x1500