subject:"\[PATCH v3\] HID\: Support for CMedia CM6533 HID audio jack controls"

Re: [PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

2016-03-02 Thread Jiri Kosina

On Fri, 22 Jan 2016, Ben Chen wrote:

> Thanks for your time.
> 
> The C-Media CM6533 is a USB audio chip featuring it's jack detection 
> capability.The device originates an interrupt transfer via HID interface 
> each time when a jack event occurs.
> The purpose of this patch is to handle hid raw events to keep the operating 
> system informed of user interactions.

Applied to for-4.6/cmedia.

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

2016-03-02 Thread Jiri Kosina

On Fri, 22 Jan 2016, Ben Chen wrote:

> Thanks for your time.
> 
> The C-Media CM6533 is a USB audio chip featuring it's jack detection 
> capability.The device originates an interrupt transfer via HID interface 
> each time when a jack event occurs.
> The purpose of this patch is to handle hid raw events to keep the operating 
> system informed of user interactions.

Applied to for-4.6/cmedia.

-- 
Jiri Kosina
SUSE Labs

[PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

2016-01-21 Thread Ben Chen

Thanks for your time.

The C-Media CM6533 is a USB audio chip featuring it's jack detection 
capability.The device originates an interrupt transfer via HID interface 
each time when a jack event occurs.
The purpose of this patch is to handle hid raw events to keep the operating 
system informed of user interactions.

Signed-off-by: Ben Chen 
---
Changes in v3:
- Renaming the driver to hid-cmedia.
Changes in v2:
- The return type of input_configured callback has been changed from void to be 
int.
 drivers/hid/Kconfig  |   6 ++
 drivers/hid/Makefile |   1 +
 drivers/hid/hid-cmedia.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-cmedia.c

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 513a16c..4117225 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_CMEDIA
+   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..be56ab6 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_CMEDIA)   += hid-cmedia.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-cmedia.c b/drivers/hid/hid-cmedia.c
new file mode 100644
index 000..7230f85
--- /dev/null
+++ b/drivers/hid/hid-cmedia.c
@@ -0,0 +1,168 @@
+/*
+ * HID driver for CMedia CM6533 audio jack controls
+ *
+ * Copyright (C) 2015 Ben Chen 
+ *
+ * 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 
+#include 
+#include 
+#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 1000
+*about 3 seconds later...
+*01000a00 002083xx 08000380 1000
+*01000600 002083xx 08000380 1000
+*
+*Plug out:
+*01000400 002083xx 080008c0 x000
+*/
+
+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 int 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;
+
+   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]);
+   return 0;
+}
+

[PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

2016-01-21 Thread Ben Chen

Thanks for your time.

The C-Media CM6533 is a USB audio chip featuring it's jack detection 
capability.The device originates an interrupt transfer via HID interface 
each time when a jack event occurs.
The purpose of this patch is to handle hid raw events to keep the operating 
system informed of user interactions.

Signed-off-by: Ben Chen 
---
Changes in v3:
- Renaming the driver to hid-cmedia.
Changes in v2:
- The return type of input_configured callback has been changed from void to be 
int.
 drivers/hid/Kconfig  |   6 ++
 drivers/hid/Makefile |   1 +
 drivers/hid/hid-cmedia.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-cmedia.c

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 513a16c..4117225 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_CMEDIA
+   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..be56ab6 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_CMEDIA)   += hid-cmedia.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-cmedia.c b/drivers/hid/hid-cmedia.c
new file mode 100644
index 000..7230f85
--- /dev/null
+++ b/drivers/hid/hid-cmedia.c
@@ -0,0 +1,168 @@
+/*
+ * HID driver for CMedia CM6533 audio jack controls
+ *
+ * Copyright (C) 2015 Ben Chen 
+ *
+ * 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 
+#include 
+#include 
+#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 1000
+*about 3 seconds later...
+*01000a00 002083xx 08000380 1000
+*01000600 002083xx 08000380 1000
+*
+*Plug out:
+*01000400 002083xx 080008c0 x000
+*/
+
+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 int 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;
+
+   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,
+

Re: [PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

Re: [PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

[PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

[PATCH v3] HID: Support for CMedia CM6533 HID audio jack controls

4 matches

Site Navigation

Mail list logo

Footer information