* [PATCH, 1/6] HID Sensors: Add to special driver list
2012-06-26 0:54 [PATCH, 0/6] HID-Sensors v3 srinivas pandruvada
@ 2012-06-26 0:54 ` srinivas pandruvada
2012-06-26 0:54 ` [PATCH, 5/6] HID-Sensors: Added Compass 3D srinivas pandruvada
2012-06-26 12:03 ` [PATCH, 0/6] HID-Sensors v3 Jiri Kosina
2 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio-u79uwXL29TY76Z2rM5mHXA
Cc: jic23.cam.ac.uk-u79uwXL29TY76Z2rM5mHXA, jkosina-AlSwsSmVLrQ,
linux-input-u79uwXL29TY76Z2rM5mHXA, srinivas pandruvada
Adding Intel and STM sensor hub in the list of drivers with
specialized driver.
Change-Id: I91591b663f62a29ac4823f3c6f282d9da22a141a
Signed-off-by: srinivas pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/hid/hid-core.c | 10 ++++++++++
drivers/hid/hid-ids.h | 6 ++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b7d758c..5eb3faa 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1444,6 +1444,14 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) },
{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
{ HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
@@ -1548,6 +1556,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) },
{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
+ USB_DEVICE_ID_SENSOR_HUB_7014) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e39aecb..928fe57 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -401,6 +401,11 @@
#define USB_VENDOR_ID_IMATION 0x0718
#define USB_DEVICE_ID_DISC_STAKKA 0xd000
+#define USB_VENDOR_ID_INTEL_8086 0x8086
+#define USB_VENDOR_ID_INTEL_8087 0x8087
+#define USB_DEVICE_ID_SENSOR_HUB_1020 0x1020
+#define USB_DEVICE_ID_SENSOR_HUB_09FA 0x09FA
+
#define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615
#define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070
@@ -664,6 +669,7 @@
#define USB_VENDOR_ID_STANTUM_STM 0x0483
#define USB_DEVICE_ID_MTP_STM 0x3261
+#define USB_DEVICE_ID_SENSOR_HUB_7014 0x7014
#define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403
#define USB_DEVICE_ID_MTP_SITRONIX 0x5001
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH, 1/6] HID Sensors: Add to special driver list
@ 2012-06-26 0:54 ` srinivas pandruvada
0 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio; +Cc: jic23.cam.ac.uk, jkosina, linux-input, srinivas pandruvada
Adding Intel and STM sensor hub in the list of drivers with
specialized driver.
Change-Id: I91591b663f62a29ac4823f3c6f282d9da22a141a
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/hid/hid-core.c | 10 ++++++++++
drivers/hid/hid-ids.h | 6 ++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b7d758c..5eb3faa 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1444,6 +1444,14 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) },
{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
{ HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
@@ -1548,6 +1556,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) },
{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
+ USB_DEVICE_ID_SENSOR_HUB_7014) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e39aecb..928fe57 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -401,6 +401,11 @@
#define USB_VENDOR_ID_IMATION 0x0718
#define USB_DEVICE_ID_DISC_STAKKA 0xd000
+#define USB_VENDOR_ID_INTEL_8086 0x8086
+#define USB_VENDOR_ID_INTEL_8087 0x8087
+#define USB_DEVICE_ID_SENSOR_HUB_1020 0x1020
+#define USB_DEVICE_ID_SENSOR_HUB_09FA 0x09FA
+
#define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615
#define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070
@@ -664,6 +669,7 @@
#define USB_VENDOR_ID_STANTUM_STM 0x0483
#define USB_DEVICE_ID_MTP_STM 0x3261
+#define USB_DEVICE_ID_SENSOR_HUB_7014 0x7014
#define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403
#define USB_DEVICE_ID_MTP_SITRONIX 0x5001
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH, 2/6] HID-Sensors: Sensor framework
2012-06-26 0:54 [PATCH, 0/6] HID-Sensors v3 srinivas pandruvada
@ 2012-06-26 0:54 ` srinivas pandruvada
2012-06-26 0:54 ` [PATCH, 5/6] HID-Sensors: Added Compass 3D srinivas pandruvada
2012-06-26 12:03 ` [PATCH, 0/6] HID-Sensors v3 Jiri Kosina
2 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio-u79uwXL29TY76Z2rM5mHXA
Cc: jic23.cam.ac.uk-u79uwXL29TY76Z2rM5mHXA, jkosina-AlSwsSmVLrQ,
linux-input-u79uwXL29TY76Z2rM5mHXA, srinivas pandruvada
Adding processing for HID Sensor usage table as defined by
HID 1.12, Request #: HUTRR39, dated 05 May, 2011.
This driver uses HID driver framework to register, send and
receive events.
This uses MFD framework, so that actual processing for a
specific usage id can be done in a different driver. For
example an accelerometer driver can be a separate driver and
use the interface provided by this driver to register for
events.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/hid/Kconfig | 18 +
drivers/hid/Makefile | 1 +
drivers/hid/hid-sensor-hub.c | 883 ++++++++++++++++++++++++++++++++++++++++
include/linux/hid-sensor-hub.h | 99 +++++
include/linux/hid-sensor-ids.h | 116 ++++++
5 files changed, 1117 insertions(+), 0 deletions(-)
create mode 100644 drivers/hid/hid-sensor-hub.c
create mode 100644 include/linux/hid-sensor-hub.h
create mode 100644 include/linux/hid-sensor-ids.h
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ffddcba..0c86ab0 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -644,6 +644,24 @@ config HID_ZYDACRON
---help---
Support for Zydacron remote control.
+config HID_SENSOR_HUB
+ tristate "HID Sensors framework support"
+ depends on USB_HID
+ select MFD_CORE
+ default n
+ -- help---
+ Support for HID Sensor framework. This will provide MFD framework for
+ adding different sensors, using HID sensor usage table. This defines
+ a set of interface functions to register callbacks for events so
+ that the events are transferred to user space using either input
+ or IIO ineterfaces.
+
+config HID_SENSOR_HUB_DEBUG
+ tristate "HID Sensor debug support"
+ default n
+ -- help---
+ Debug support for Hid sensors. Enable this flag to debug only.
+
endmenu
endif # HID_SUPPORT
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 22f1d16..04f7086 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -84,6 +84,7 @@ obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
obj-$(CONFIG_HID_WACOM) += hid-wacom.o
obj-$(CONFIG_HID_WALTOP) += hid-waltop.o
obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o
+obj-$(CONFIG_HID_SENSOR_HUB) += hid-sensor-hub.o
obj-$(CONFIG_USB_HID) += usbhid/
obj-$(CONFIG_USB_MOUSE) += usbhid/
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
new file mode 100644
index 0000000..b8d4b68
--- /dev/null
+++ b/drivers/hid/hid-sensor-hub.c
@@ -0,0 +1,883 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/usb.h>
+#include "usbhid/usbhid.h"
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/mfd/core.h>
+#include <linux/list.h>
+#include <linux/hid-sensor-ids.h>
+#include <linux/hid-sensor-hub.h>
+
+#include "hid-ids.h"
+
+#define MAX_HUB_SENSORS 20
+#define MAX_DRIVER_NAME_SIZE 30
+#define RAW_BUFFER_SIZE 128
+#define MAXIMUM_SAMP_FREQUENCY 1000
+#define sensor_hub_in_report(id, dev) sensor_hub_report(id, dev,\
+ HID_INPUT_REPORT)
+#define sensor_hub_out_report(id, dev) sensor_hub_report(id, dev,\
+ HID_OUTPUT_REPORT)
+#define sensor_hub_feature_report(id, dev) sensor_hub_report(id, dev,\
+ HID_FEATURE_REPORT)
+
+/* Description of in-progress IO operation, used for operations
+ * that trigger response from device */
+struct sensor_hub_pending {
+ struct completion ready;
+ u32 usage_id;
+ u32 attr_usage_id;
+ int raw_size;
+ u8 raw_data[RAW_BUFFER_SIZE];
+};
+
+struct sensor_hub_data {
+ struct hid_sensor_hub_device *hsdev;
+ struct mutex mutex;
+ spinlock_t lock;
+ struct sensor_hub_pending *pending;
+ struct list_head dyn_callback_list;
+ spinlock_t dyn_lock;
+};
+
+struct hid_sensor_hub_callbacks_list {
+ struct list_head list;
+ u32 usage_id;
+ struct hid_sensor_hub_callbacks *usage_callback;
+ int initialized;
+ void *priv;
+};
+
+static struct mfd_cell hid_sensor_hub_client_devs[MAX_HUB_SENSORS];
+static int hid_sensor_client_cnt;
+
+static int sensor_hub_check_for_sensor_page(struct hid_device *hdev)
+{
+ int i;
+ int ret = -EINVAL;
+
+ for (i = 0; i < hdev->maxcollection; i++) {
+ struct hid_collection *col = &hdev->collection[i];
+ if (col->type == HID_COLLECTION_PHYSICAL &&
+ (col->usage & HID_USAGE_PAGE) == HID_UP_SENSOR) {
+ ret = 0;
+ break;
+ }
+ }
+ return ret;
+}
+
+static struct hid_report *sensor_hub_report(int id, struct hid_device *hdev,
+ int dir)
+{
+ struct list_head *feature_report_list =
+ &hdev->report_enum[dir].report_list;
+ struct hid_report *report = NULL;
+
+ list_for_each_entry(report, feature_report_list, list) {
+ if (report->id == id)
+ return report;
+ }
+ hid_warn(hdev, "No report with id 0x%x found\n", id);
+ return NULL;
+}
+
+#if (defined CONFIG_HID_SENSOR_HUB_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_HUB_DEBUG_MODULE)
+static void dump_report(struct hid_device *hdev)
+{
+ int i, j;
+ struct hid_report *report;
+ struct hid_field *field;
+ struct hid_report_enum *report_enum;
+
+ hid_dbg(hdev, "Bus:0x%x Vendor:0x%x Product:0x%x\n", hdev->bus,
+ hdev->vendor, hdev->product);
+ hid_dbg(hdev, "rsize=%d, max_collections:%d\n", hdev->rsize,
+ hdev->maxcollection);
+ for (i = 0; i < hdev->maxcollection; ++i) {
+ struct hid_collection *collection = &hdev->collection[i];
+ hid_dbg(hdev, "c:%d t:0x%x u:0x%x l:0x%x\n",
+ i, collection->type, collection->usage,
+ collection->level);
+ }
+
+ hid_dbg(hdev, "report_enum[HID_INPUT_REPORT]\n");
+ report_enum = &hdev->report_enum[HID_INPUT_REPORT];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ hid_dbg(hdev, "Report id:%x\n", report->id);
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ hid_dbg(hdev, "usage hid:%x c_index:%x\n",
+ field->usage[j].hid,
+ field->usage[j].collection_index);
+ }
+ hid_dbg(hdev, "units:%x expo:%x\n",
+ field->unit,
+ field->unit_exponent);
+ }
+ }
+
+ hid_dbg(hdev, "report_enum[HID_OUTPUT_REPORT]\n");
+ report_enum = &hdev->report_enum[HID_OUTPUT_REPORT];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ hid_dbg(hdev, "Report id:%x\n", report->id);
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ hid_dbg(hdev, "usage hid:%x c_index:%x\n",
+ field->usage[j].hid,
+ field->usage[j].collection_index);
+ }
+ hid_dbg(hdev, "units:%x expo:%x\n",
+ field->unit,
+ field->unit_exponent);
+
+ }
+ }
+
+ hid_dbg(hdev, "report_enum[HID_FEATURE_REPORT]\n");
+ report_enum = &hdev->report_enum[HID_FEATURE_REPORT];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ hid_dbg(hdev, "Report id:%x\n", report->id);
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ hid_dbg(hdev, "u hid:%x c_index:%x\n",
+ field->usage[j].hid,
+ field->usage[j].collection_index);
+ }
+ hid_dbg(hdev, "units:%x expo:%x\n",
+ field->unit,
+ field->unit_exponent);
+ }
+ }
+}
+
+static void dump_raw_data(struct hid_device *hdev, int size, u8 *pdata)
+{
+ int j = 0;
+
+ for (j = 0; j < size; ++j)
+ hid_dbg(hdev, "0x%x\n", *pdata++);
+}
+#endif
+
+static struct hid_sensor_hub_callbacks *sensor_hub_get_callback(
+ struct hid_device *hdev,
+ u32 usage_id, void **priv)
+{
+ struct hid_sensor_hub_callbacks_list *callback = NULL;
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+
+
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+ if (callback->usage_id == usage_id) {
+ *priv = callback->priv;
+ spin_unlock(&pdata->dyn_lock);
+ return callback->usage_callback;
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return NULL;
+}
+
+int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ struct hid_sensor_hub_callbacks *usage_callback)
+{
+ struct hid_sensor_hub_callbacks_list *callback;
+ struct sensor_hub_data *pdata =
+ (struct sensor_hub_data *)hid_get_drvdata(hsdev->hdev);
+
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+ if (callback->usage_id == usage_id) {
+ spin_unlock(&pdata->dyn_lock);
+ return -EINVAL;
+ }
+ callback = kzalloc(sizeof(*callback), GFP_KERNEL);
+ if (!callback) {
+ spin_unlock(&pdata->dyn_lock);
+ return -ENOMEM;
+ }
+ callback->usage_callback = usage_callback;
+ callback->usage_id = usage_id;
+ callback->priv = NULL;
+ list_add_tail(&callback->list, &pdata->dyn_callback_list);
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_register_callback);
+
+int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id)
+{
+ struct hid_sensor_hub_callbacks_list *callback, *n;
+ struct sensor_hub_data *pdata =
+ (struct sensor_hub_data *)hid_get_drvdata(hsdev->hdev);
+
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry_safe(callback, n,
+ &pdata->dyn_callback_list, list)
+ if (callback->usage_id == usage_id) {
+ list_del(&callback->list);
+ kfree(callback);
+ break;
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_remove_callback);
+
+int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 value)
+{
+ struct hid_report *report;
+ struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
+ int ret = 0;
+
+ if (report_id < 0)
+ return -EINVAL;
+
+ mutex_lock(&data->mutex);
+ report = sensor_hub_feature_report(report_id, hsdev->hdev);
+ if (!report) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ if (field_index >= report->maxfield) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ hid_set_field(report->field[field_index], 0, value);
+ usbhid_submit_report(hsdev->hdev, report, USB_DIR_OUT);
+ usbhid_wait_io(hsdev->hdev);
+done_proc:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_set_feature);
+
+int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 *value)
+{
+ struct hid_report *report;
+ struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
+ int ret = 0;
+
+ if (report_id < 0)
+ return -EINVAL;
+
+ mutex_lock(&data->mutex);
+ report = sensor_hub_feature_report(report_id, hsdev->hdev);
+ if (!report) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ if (field_index >= report->maxfield) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN);
+ usbhid_wait_io(hsdev->hdev);
+ *value = report->field[field_index]->value[0];
+done_proc:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_get_feature);
+
+
+int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ u32 attr_usage_id, u32 report_id)
+{
+ struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
+ struct sensor_hub_pending *work;
+ unsigned long flags;
+ struct hid_report *report;
+ int ret_val = 0;
+
+ if (report_id < 0)
+ return -EINVAL;
+
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
+ if (!work)
+ return ret_val;
+
+ init_completion(&work->ready);
+ work->usage_id = usage_id;
+ work->attr_usage_id = attr_usage_id;
+ work->raw_size = 0;
+
+ mutex_lock(&data->mutex);
+ spin_lock_irqsave(&data->lock, flags);
+ data->pending = work;
+ report = sensor_hub_in_report(report_id, hsdev->hdev);
+ if (!report)
+ goto err_free;
+ usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN);
+ spin_unlock_irqrestore(&data->lock, flags);
+ wait_for_completion_interruptible_timeout(&work->ready, HZ*5);
+ if (work->raw_size)
+ ret_val = *(u32 *)work->raw_data;
+
+err_free:
+ data->pending = NULL;
+ mutex_unlock(&data->mutex);
+
+ kfree(work);
+ return ret_val;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_input_attr_get_raw_value);
+
+int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
+ u8 type,
+ u32 usage_id,
+ u32 attr_usage_id,
+ struct hid_sensor_hub_attribute_info *info)
+{
+ int ret = -1;
+ int i, j;
+ int collection_index = -1;
+ struct hid_report *report;
+ struct hid_field *field;
+ struct hid_report_enum *report_enum;
+ struct hid_device *hdev = hsdev->hdev;
+
+ /* Initialize with defaults */
+ info->usage_id = usage_id;
+ info->attrib_id = attr_usage_id;
+ info->report_id = -1;
+ info->index = -1;
+ info->units = -1;
+ info->unit_expo = -1;
+
+ for (i = 0; i < hdev->maxcollection; ++i) {
+ struct hid_collection *collection = &hdev->collection[i];
+ if (usage_id == collection->usage) {
+ collection_index = i;
+ break;
+ }
+ }
+ if (collection_index == -1)
+ goto err_ret;
+
+ report_enum = &hdev->report_enum[type];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ if (field->usage[j].hid == attr_usage_id &&
+ field->usage[j].collection_index ==
+ collection_index) {
+ info->index = i;
+ info->report_id = report->id;
+ info->units = field->unit;
+ info->unit_expo = field->unit_exponent;
+ info->size = field->report_size/8;
+ break;
+ }
+ }
+ }
+ }
+err_ret:
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_input_get_attribute_info);
+
+struct hid_sensor_common_attributes *sensor_hub_allocate_common_attributes(
+ struct hid_sensor_hub_device *hsdev, unsigned usage_id)
+{
+ int ret;
+ struct hid_sensor_common_attributes *st;
+
+ st = kzalloc(sizeof(struct hid_sensor_common_attributes), GFP_KERNEL);
+ if (st == NULL) {
+ hid_err(hsdev->hdev, "Mem Allocation Failure\n");
+ goto error_ret;
+ }
+ st->hsdev = hsdev;
+ st->usage_id = usage_id;
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_POLLING, &st->poll);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_REPORT_STATE,
+ &st->report_state);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_POWER_STATE,
+ &st->power_state);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS,
+ &st->sensitivity);
+
+ hid_dbg(hsdev->hdev, "common attributes: %x:%x, %x:%x, %x:%x %x:%x\n",
+ st->poll.index, st->poll.report_id,
+ st->report_state.index, st->report_state.report_id,
+ st->power_state.index, st->power_state.report_id,
+ st->sensitivity.index, st->sensitivity.report_id);
+
+ return st;
+
+error_ret:
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_allocate_common_attributes);
+
+void sensor_hub_free_common_attributes(
+ struct hid_sensor_common_attributes *attrb)
+{
+ kfree(attrb);
+}
+EXPORT_SYMBOL_GPL(sensor_hub_free_common_attributes);
+
+ssize_t hid_sensor_read_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf)
+{
+ __s32 value;
+ int len;
+ int ret;
+ int conv_value;
+
+ ret = sensor_hub_get_feature(attrb->hsdev,
+ attrb->poll.report_id,
+ attrb->poll.index, &value);
+ if (ret < 0 || value <= 0)
+ len = sprintf(buf, "0\n");
+ else {
+ if (attrb->poll.units == HID_USAGE_SENSOR_UNITS_MILLISECOND)
+ conv_value = 1000/value;
+ else if (attrb->poll.units == HID_USAGE_SENSOR_UNITS_SECOND)
+ conv_value = 1/value;
+ else
+ conv_value = value; /*Assume HZ*/
+ len = sprintf(buf, "%d\n", conv_value);
+ }
+ return len;
+}
+EXPORT_SYMBOL_GPL(hid_sensor_read_samp_freq);
+
+ssize_t hid_sensor_write_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int conv_value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value > MAXIMUM_SAMP_FREQUENCY)
+ value = MAXIMUM_SAMP_FREQUENCY;
+
+ if (value && attrb->poll.units == HID_USAGE_SENSOR_UNITS_MILLISECOND)
+ conv_value = 1000/value;
+ else if (value && attrb->poll.units == HID_USAGE_SENSOR_UNITS_SECOND)
+ conv_value = 1/value;
+ else
+ conv_value = value; /*Assume HZ*/
+
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->poll.report_id,
+ attrb->poll.index,
+ conv_value);
+
+ if (ret < 0)
+ return ret;
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_samp_freq);
+
+ssize_t hid_sensor_read_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf)
+{
+ __s32 value;
+ int len;
+ int ret;
+
+ ret = sensor_hub_get_feature(attrb->hsdev,
+ attrb->sensitivity.report_id,
+ attrb->sensitivity.index, &value);
+ if (ret < 0 || value < 0) {
+ len = sprintf(buf, "0\n");
+ hid_err(attrb->hsdev->hdev, "Failed\n");
+ } else
+ len = sprintf(buf, "units:%d,exp:%d,value:%d\n",
+ attrb->sensitivity.units,
+ attrb->sensitivity.unit_expo, value);
+ return len;
+}
+EXPORT_SYMBOL_GPL(hid_sensor_read_hyst_raw);
+
+ssize_t hid_sensor_write_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->sensitivity.report_id,
+ attrb->sensitivity.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_hyst_raw);
+
+ssize_t hid_sensor_write_report_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->report_state.report_id,
+ attrb->report_state.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_report_state);
+
+ssize_t hid_sensor_write_power_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->power_state.report_id,
+ attrb->power_state.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_power_state);
+
+
+#ifdef CONFIG_PM
+static int sensor_hub_suspend(struct hid_device *hdev, pm_message_t message)
+{
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+ struct hid_sensor_hub_callbacks_list *callback;
+
+ hid_dbg(hdev, " sensor_hub_suspend\n");
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list) {
+ if (callback->initialized && callback->usage_callback->suspend)
+ callback->usage_callback->suspend(
+ pdata->hsdev, callback->priv);
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+
+static int sensor_hub_resume(struct hid_device *hdev)
+{
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+ struct hid_sensor_hub_callbacks_list *callback;
+
+ hid_dbg(hdev, " sensor_hub_resume\n");
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list) {
+ if (callback->initialized && callback->usage_callback->resume)
+ callback->usage_callback->resume(
+ pdata->hsdev, callback->priv);
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+
+static int sensor_hub_reset_resume(struct hid_device *hdev)
+{
+ return 0;
+}
+#endif
+/*
+ * Handle raw report as sent by device
+ */
+static int sensor_hub_raw_event(struct hid_device *hdev,
+ struct hid_report *report, u8 *raw_data, int size)
+{
+ int i;
+ u8 *ptr;
+ int sz;
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+ unsigned long flags;
+ struct hid_sensor_hub_callbacks *callback = NULL;
+ struct hid_collection *collection = NULL;
+ void *priv = NULL;
+
+ hid_dbg(hdev, "sensor_hub_raw_event report id:0x%x size:%d type:%d\n",
+ report->id, size, report->type);
+ hid_dbg(hdev, "maxfield:%d\n", report->maxfield);
+#if (defined CONFIG_HID_SENSOR_HUB_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_HUB_DEBUG_MODULE)
+ dump_raw_data(hdev, size, raw_data);
+#endif
+ if (report->type != HID_INPUT_REPORT)
+ return 1;
+
+ ptr = raw_data;
+ ptr++; /*Skip report id*/
+
+ if (!report)
+ goto err_report;
+
+ spin_lock_irqsave(&pdata->lock, flags);
+
+ for (i = 0; i < report->maxfield; ++i) {
+
+ hid_dbg(hdev, "%d collection_index:%x hid:%x sz:%x\n",
+ i, report->field[i]->usage->collection_index,
+ report->field[i]->usage->hid,
+ report->field[i]->report_size/8);
+
+ sz = report->field[i]->report_size/8;
+ if (pdata->pending && pdata->pending->attr_usage_id ==
+ report->field[i]->usage->hid) {
+ hid_dbg(hdev, "data was pending ...\n");
+ sz = (sz > RAW_BUFFER_SIZE) ? RAW_BUFFER_SIZE : sz;
+ memcpy(pdata->pending->raw_data, ptr, sz);
+ pdata->pending->raw_size = sz;
+ complete(&pdata->pending->ready);
+ }
+ collection = &hdev->collection[
+ report->field[i]->usage->collection_index];
+ hid_dbg(hdev, "collection->usage %x\n",
+ collection->usage);
+ callback = sensor_hub_get_callback(pdata->hsdev->hdev,
+ collection->usage,
+ &priv);
+ if (callback && callback->capture_sample) {
+ callback->capture_sample(pdata->hsdev,
+ report->field[i]->usage->hid, sz, ptr, callback->pdev);
+ }
+ ptr += sz;
+ }
+ if (callback && collection && callback->send_event)
+ callback->send_event(pdata->hsdev, collection->usage,
+ callback->pdev);
+
+ spin_unlock_irqrestore(&pdata->lock, flags);
+
+err_report:
+ return 1;
+}
+
+static int sensor_hub_probe(struct hid_device *hdev,
+ const struct hid_device_id *id)
+{
+ int ret;
+ struct sensor_hub_data *sd;
+ int i;
+ char *name;
+
+ sd = kzalloc(sizeof(struct sensor_hub_data), GFP_KERNEL);
+ if (!sd) {
+ hid_err(hdev, "cannot allocate Sensor data\n");
+ return -ENOMEM;
+ }
+ sd->hsdev = kzalloc(sizeof(struct hid_sensor_hub_device), GFP_KERNEL);
+ if (!sd->hsdev) {
+ hid_err(hdev, "cannot allocate hid_sensor_hub_device\n");
+ ret = -ENOMEM;
+ goto err_free_hub;
+ }
+ hid_set_drvdata(hdev, sd);
+ sd->hsdev->hdev = hdev;
+ spin_lock_init(&sd->lock);
+ spin_lock_init(&sd->dyn_lock);
+ mutex_init(&sd->mutex);
+ ret = hid_parse(hdev);
+ if (ret) {
+ hid_err(hdev, "parse failed\n");
+ goto err_free;
+ }
+#if (defined CONFIG_HID_SENSOR_HUB_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_HUB_DEBUG_MODULE)
+ dump_report(hdev);
+#endif
+ if (sensor_hub_check_for_sensor_page(hdev) < 0) {
+ hid_err(hdev, "sensor page not found\n");
+ goto err_free;
+ }
+ INIT_LIST_HEAD(&hdev->inputs);
+
+ hdev->claimed = HID_CLAIMED_INPUT;
+ ret = hid_hw_start(hdev, 0);
+ if (ret) {
+ hid_err(hdev, "hw start failed\n");
+ goto err_free;
+ }
+ ret = hid_hw_open(hdev);
+ if (ret) {
+ hid_err(hdev, "failed to open input interrupt pipe\n");
+ goto err_stop_hw;
+ }
+
+ INIT_LIST_HEAD(&sd->dyn_callback_list);
+ hid_sensor_client_cnt = 0;
+ for (i = 0; i < hdev->maxcollection && i < MAX_HUB_SENSORS ; ++i) {
+ struct hid_collection *collection = &hdev->collection[i];
+ name = kmalloc(MAX_DRIVER_NAME_SIZE+1, GFP_KERNEL);
+ if (name == NULL) {
+ hid_err(hdev,
+ "memory alloc failed for MFD device name\n");
+ ret = -ENOMEM;
+ goto err_close;
+ }
+ snprintf(name, MAX_DRIVER_NAME_SIZE, "HID-SENSOR-%x",
+ collection->usage);
+ hid_sensor_hub_client_devs[i].name = name;
+ hid_sensor_hub_client_devs[i].platform_data = &sd->hsdev;
+ hid_sensor_hub_client_devs[i].pdata_size = sizeof(sd->hsdev);
+ hid_dbg(hdev, "Adding %s:%x\n", name, (unsigned int)sd);
+ hid_sensor_client_cnt++;
+ }
+ ret = mfd_add_devices(&hdev->dev, 0, hid_sensor_hub_client_devs,
+ hid_sensor_client_cnt, NULL, 0);
+ if (ret < 0) {
+ for (i = 0; i < hid_sensor_client_cnt ; ++i)
+ kfree(hid_sensor_hub_client_devs[i].name);
+ goto err_close;
+ }
+ return ret;
+
+err_close:
+ hid_hw_stop(hdev);
+ hid_hw_close(hdev);
+err_stop_hw:
+ hid_hw_stop(hdev);
+err_free:
+ kfree(sd->hsdev);
+err_free_hub:
+ kfree(sd);
+
+ return ret;
+}
+
+static void sensor_hub_remove(struct hid_device *hdev)
+{
+ struct sensor_hub_data *data = hid_get_drvdata(hdev);
+ unsigned long flags;
+ int i;
+
+ hid_dbg(hdev, " hardware removed\n");
+ hdev->claimed &= ~HID_CLAIMED_INPUT;
+ hid_hw_stop(hdev);
+ hid_hw_close(hdev);
+ spin_lock_irqsave(&data->lock, flags);
+ if (data->pending)
+ complete(&data->pending->ready);
+ spin_unlock_irqrestore(&data->lock, flags);
+ mfd_remove_devices(&hdev->dev);
+ for (i = 0; i < hid_sensor_client_cnt ; ++i)
+ kfree(hid_sensor_hub_client_devs[i].name);
+ hid_set_drvdata(hdev, NULL);
+ mutex_destroy(&data->mutex);
+ kfree(data->hsdev);
+ kfree(data);
+}
+
+static const struct hid_device_id sensor_hub_devices[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
+ USB_DEVICE_ID_SENSOR_HUB_7014) },
+ { }
+};
+
+static const struct hid_usage_id sensor_hub_grabbed_usages[] = {
+ { HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
+ { HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1 }
+};
+
+static struct hid_driver sensor_hub_driver = {
+ .name = "hid-sensor-hub",
+ .id_table = sensor_hub_devices,
+ .probe = sensor_hub_probe,
+ .remove = sensor_hub_remove,
+ .raw_event = sensor_hub_raw_event,
+#ifdef CONFIG_PM
+ .suspend = sensor_hub_suspend,
+ .resume = sensor_hub_resume,
+ .reset_resume = sensor_hub_reset_resume,
+#endif
+};
+
+static int __init sensor_hub_init(void)
+{
+ return hid_register_driver(&sensor_hub_driver);
+}
+
+static void __exit sensor_hub_exit(void)
+{
+ hid_unregister_driver(&sensor_hub_driver);
+}
+
+module_init(sensor_hub_init);
+module_exit(sensor_hub_exit);
+
+MODULE_DESCRIPTION("HID Sensor Hub driver");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
new file mode 100644
index 0000000..f7ce790
--- /dev/null
+++ b/include/linux/hid-sensor-hub.h
@@ -0,0 +1,99 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef _HID_SENSORS_HUB_H
+#define _HID_SENSORS_HUB_H
+
+#include <linux/hid.h>
+#include <linux/hid-sensor-ids.h>
+
+struct hid_sensor_hub_attribute_info {
+ u32 usage_id;
+ u32 attrib_id;
+ s32 report_id;
+ s32 index;
+ s32 units;
+ s32 unit_expo;
+ s32 size;
+};
+
+struct hid_sensor_common_attributes {
+ struct hid_sensor_hub_device *hsdev;
+ unsigned usage_id;
+ struct hid_sensor_hub_attribute_info poll;
+ struct hid_sensor_hub_attribute_info report_state;
+ struct hid_sensor_hub_attribute_info power_state;
+ struct hid_sensor_hub_attribute_info sensitivity;
+};
+
+struct hid_sensor_hub_device {
+ struct hid_device *hdev;
+};
+
+
+struct hid_sensor_hub_callbacks {
+ struct platform_device *pdev;
+ int (*suspend)(struct hid_sensor_hub_device *hsdev, void *priv);
+ int (*resume)(struct hid_sensor_hub_device *hsdev, void *priv);
+ int (*capture_sample)(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id, size_t raw_len, char *raw_data,
+ void *priv);
+ int (*send_event)(struct hid_sensor_hub_device *hsdev, u32 usage_id,
+ void *priv);
+};
+
+/* Registeration functions */
+int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ struct hid_sensor_hub_callbacks *usage_callback);
+int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id);
+
+/* Hid sensor hub core interfaces */
+int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
+ u8 type,
+ u32 usage_id, u32 attr_usage_id,
+ struct hid_sensor_hub_attribute_info *info);
+int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ u32 attr_usage_id, u32 report_id);
+int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 value);
+int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 *value);
+
+struct hid_sensor_common_attributes *sensor_hub_allocate_common_attributes(
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id);
+void sensor_hub_free_common_attributes(
+ struct hid_sensor_common_attributes *attrb);
+ssize_t hid_sensor_read_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf);
+ssize_t hid_sensor_write_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+ssize_t hid_sensor_read_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf);
+ssize_t hid_sensor_write_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+ssize_t hid_sensor_write_report_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+ssize_t hid_sensor_write_power_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+#endif
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h
new file mode 100644
index 0000000..34cc779
--- /dev/null
+++ b/include/linux/hid-sensor-ids.h
@@ -0,0 +1,116 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef _HID_SENSORS_IDS_H
+#define _HID_SENSORS_IDS_H
+
+#define HID_UP_SENSOR 0x00200000
+#define HID_SENSOR_POLLING 0x0020030E
+#define HID_SENSOR_REPORT_STATE 0x00200316
+#define HID_SENSOR_POWER_STATE 0x00200319
+
+
+/* Accel 3D (200073) */
+#define HID_USAGE_SENSOR_ACCEL_3D 0x200073
+#define HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS 0x200453
+#define HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS 0x200454
+#define HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS 0x200455
+
+/* ALS (200041) */
+#define HID_USAGE_SENSOR_ALS 0x200041
+#define HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE 0x2004d1
+
+/* Compass 3D: (200083) */
+
+/* Gyro 3D: (200076) */
+#define HID_USAGE_SENSOR_GYRO_3D 0x200076
+#define HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS 0x200457
+#define HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS 0x200458
+#define HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS 0x200459
+
+/*ORIENTATION: Compass 3D: (200083) */
+#define HID_USAGE_SENSOR_COMPASS_3D 0x200083
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING 0x200471
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING_X 0x200472
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING_Y 0x200473
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING_Z 0x200474
+
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_COMPENSATED_MAGNETIC_NORTH 0x200475
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_COMPENSATED_TRUE_NORTH 0x200476
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_NORTH 0x200477
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TRUE_NORTH 0x200478
+
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE 0x200479
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_X 0x20047A
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_Y 0x20047B
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_Z 0x20047C
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_OUT_OF_RANGE 0x20047D
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT 0x20047E
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT_X 0x20047F
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT_Y 0x200480
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT_Z 0x200481
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_ROTATION_MATRIX 0x200482
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_QUATERNION 0x200483
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX 0x200484
+
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_X_AXIS 0x200485
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Y_AXIS 0x200486
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Z_AXIS 0x200487
+
+/* Units */
+#define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED 0x00
+#define HID_USAGE_SENSOR_UNITS_LUX 0x01
+#define HID_USAGE_SENSOR_UNITS_KELVIN 0x01000100
+#define HID_USAGE_SENSOR_UNITS_FAHRENHEIT 0x03000100
+#define HID_USAGE_SENSOR_UNITS_PASCAL 0xF1E1
+#define HID_USAGE_SENSOR_UNITS_NEWTON 0x11E1
+#define HID_USAGE_SENSOR_UNITS_METERS_PER_SECOND 0x11F0
+#define HID_USAGE_SENSOR_UNITS_METERS_PER_SEC_SQRD 0x11E0
+#define HID_USAGE_SENSOR_UNITS_FARAD 0xE14F2000
+#define HID_USAGE_SENSOR_UNITS_AMPERE 0x01001000
+#define HID_USAGE_SENSOR_UNITS_WATT 0x21d1
+#define HID_USAGE_SENSOR_UNITS_HENRY 0x21E1E000
+#define HID_USAGE_SENSOR_UNITS_OHM 0x21D1E000
+#define HID_USAGE_SENSOR_UNITS_VOLT 0x21D1F000
+#define HID_USAGE_SENSOR_UNITS_HERTZ 0x01F0
+#define HID_USAGE_SENSOR_UNITS_DEGREES_PER_SEC_SQRD 0x14E0
+#define HID_USAGE_SENSOR_UNITS_RADIANS 0x12
+#define HID_USAGE_SENSOR_UNITS_RADIANS_PER_SECOND 0x12F0
+#define HID_USAGE_SENSOR_UNITS_RADIANS_PER_SEC_SQRD 0x12E0
+#define HID_USAGE_SENSOR_UNITS_SECOND 0x0110
+#define HID_USAGE_SENSOR_UNITS_GAUSS 0x01E1F000
+#define HID_USAGE_SENSOR_UNITS_GRAM 0x0101
+#define HID_USAGE_SENSOR_UNITS_CENTIMETER 0x11
+#define HID_USAGE_SENSOR_UNITS_G 0x1A
+#define HID_USAGE_SENSOR_UNITS_MILLISECOND 0x19
+#define HID_USAGE_SENSOR_UNITS_PERCENT 0x17
+#define HID_USAGE_SENSOR_UNITS_DEGREES 0x14
+#define HID_USAGE_SENSOR_UNITS_DEGREES_PER_SECOND 0x15
+
+/* Common selectors */
+#define HID_USAGE_SENSOR_PROPERTY_REPORT_INTERVAL 0x20030E
+#define HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS 0x20030F
+#define HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_RANGE_PCT 0x200310
+#define HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_REL_PCT 0x200311
+#define HID_USAGE_SENSOR_PROPERTY_ACCURACY 0x200312
+#define HID_USAGE_SENSOR_PROPERTY_RESOLUTION 0x200313
+#define HID_USAGE_SENSOR_PROPERTY_RANGE_MAXIMUM 0x200314
+#define HID_USAGE_SENSOR_PROPERTY_RANGE_MINIMUM 0x200315
+#define HID_USAGE_SENSOR_PROPERTY_REPORTING_STATE 0x200316
+
+#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH, 2/6] HID-Sensors: Sensor framework
@ 2012-06-26 0:54 ` srinivas pandruvada
0 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio; +Cc: jic23.cam.ac.uk, jkosina, linux-input, srinivas pandruvada
Adding processing for HID Sensor usage table as defined by
HID 1.12, Request #: HUTRR39, dated 05 May, 2011.
This driver uses HID driver framework to register, send and
receive events.
This uses MFD framework, so that actual processing for a
specific usage id can be done in a different driver. For
example an accelerometer driver can be a separate driver and
use the interface provided by this driver to register for
events.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/hid/Kconfig | 18 +
drivers/hid/Makefile | 1 +
drivers/hid/hid-sensor-hub.c | 883 ++++++++++++++++++++++++++++++++++++++++
include/linux/hid-sensor-hub.h | 99 +++++
include/linux/hid-sensor-ids.h | 116 ++++++
5 files changed, 1117 insertions(+), 0 deletions(-)
create mode 100644 drivers/hid/hid-sensor-hub.c
create mode 100644 include/linux/hid-sensor-hub.h
create mode 100644 include/linux/hid-sensor-ids.h
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ffddcba..0c86ab0 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -644,6 +644,24 @@ config HID_ZYDACRON
---help---
Support for Zydacron remote control.
+config HID_SENSOR_HUB
+ tristate "HID Sensors framework support"
+ depends on USB_HID
+ select MFD_CORE
+ default n
+ -- help---
+ Support for HID Sensor framework. This will provide MFD framework for
+ adding different sensors, using HID sensor usage table. This defines
+ a set of interface functions to register callbacks for events so
+ that the events are transferred to user space using either input
+ or IIO ineterfaces.
+
+config HID_SENSOR_HUB_DEBUG
+ tristate "HID Sensor debug support"
+ default n
+ -- help---
+ Debug support for Hid sensors. Enable this flag to debug only.
+
endmenu
endif # HID_SUPPORT
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 22f1d16..04f7086 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -84,6 +84,7 @@ obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
obj-$(CONFIG_HID_WACOM) += hid-wacom.o
obj-$(CONFIG_HID_WALTOP) += hid-waltop.o
obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o
+obj-$(CONFIG_HID_SENSOR_HUB) += hid-sensor-hub.o
obj-$(CONFIG_USB_HID) += usbhid/
obj-$(CONFIG_USB_MOUSE) += usbhid/
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
new file mode 100644
index 0000000..b8d4b68
--- /dev/null
+++ b/drivers/hid/hid-sensor-hub.c
@@ -0,0 +1,883 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/usb.h>
+#include "usbhid/usbhid.h"
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/mfd/core.h>
+#include <linux/list.h>
+#include <linux/hid-sensor-ids.h>
+#include <linux/hid-sensor-hub.h>
+
+#include "hid-ids.h"
+
+#define MAX_HUB_SENSORS 20
+#define MAX_DRIVER_NAME_SIZE 30
+#define RAW_BUFFER_SIZE 128
+#define MAXIMUM_SAMP_FREQUENCY 1000
+#define sensor_hub_in_report(id, dev) sensor_hub_report(id, dev,\
+ HID_INPUT_REPORT)
+#define sensor_hub_out_report(id, dev) sensor_hub_report(id, dev,\
+ HID_OUTPUT_REPORT)
+#define sensor_hub_feature_report(id, dev) sensor_hub_report(id, dev,\
+ HID_FEATURE_REPORT)
+
+/* Description of in-progress IO operation, used for operations
+ * that trigger response from device */
+struct sensor_hub_pending {
+ struct completion ready;
+ u32 usage_id;
+ u32 attr_usage_id;
+ int raw_size;
+ u8 raw_data[RAW_BUFFER_SIZE];
+};
+
+struct sensor_hub_data {
+ struct hid_sensor_hub_device *hsdev;
+ struct mutex mutex;
+ spinlock_t lock;
+ struct sensor_hub_pending *pending;
+ struct list_head dyn_callback_list;
+ spinlock_t dyn_lock;
+};
+
+struct hid_sensor_hub_callbacks_list {
+ struct list_head list;
+ u32 usage_id;
+ struct hid_sensor_hub_callbacks *usage_callback;
+ int initialized;
+ void *priv;
+};
+
+static struct mfd_cell hid_sensor_hub_client_devs[MAX_HUB_SENSORS];
+static int hid_sensor_client_cnt;
+
+static int sensor_hub_check_for_sensor_page(struct hid_device *hdev)
+{
+ int i;
+ int ret = -EINVAL;
+
+ for (i = 0; i < hdev->maxcollection; i++) {
+ struct hid_collection *col = &hdev->collection[i];
+ if (col->type == HID_COLLECTION_PHYSICAL &&
+ (col->usage & HID_USAGE_PAGE) == HID_UP_SENSOR) {
+ ret = 0;
+ break;
+ }
+ }
+ return ret;
+}
+
+static struct hid_report *sensor_hub_report(int id, struct hid_device *hdev,
+ int dir)
+{
+ struct list_head *feature_report_list =
+ &hdev->report_enum[dir].report_list;
+ struct hid_report *report = NULL;
+
+ list_for_each_entry(report, feature_report_list, list) {
+ if (report->id == id)
+ return report;
+ }
+ hid_warn(hdev, "No report with id 0x%x found\n", id);
+ return NULL;
+}
+
+#if (defined CONFIG_HID_SENSOR_HUB_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_HUB_DEBUG_MODULE)
+static void dump_report(struct hid_device *hdev)
+{
+ int i, j;
+ struct hid_report *report;
+ struct hid_field *field;
+ struct hid_report_enum *report_enum;
+
+ hid_dbg(hdev, "Bus:0x%x Vendor:0x%x Product:0x%x\n", hdev->bus,
+ hdev->vendor, hdev->product);
+ hid_dbg(hdev, "rsize=%d, max_collections:%d\n", hdev->rsize,
+ hdev->maxcollection);
+ for (i = 0; i < hdev->maxcollection; ++i) {
+ struct hid_collection *collection = &hdev->collection[i];
+ hid_dbg(hdev, "c:%d t:0x%x u:0x%x l:0x%x\n",
+ i, collection->type, collection->usage,
+ collection->level);
+ }
+
+ hid_dbg(hdev, "report_enum[HID_INPUT_REPORT]\n");
+ report_enum = &hdev->report_enum[HID_INPUT_REPORT];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ hid_dbg(hdev, "Report id:%x\n", report->id);
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ hid_dbg(hdev, "usage hid:%x c_index:%x\n",
+ field->usage[j].hid,
+ field->usage[j].collection_index);
+ }
+ hid_dbg(hdev, "units:%x expo:%x\n",
+ field->unit,
+ field->unit_exponent);
+ }
+ }
+
+ hid_dbg(hdev, "report_enum[HID_OUTPUT_REPORT]\n");
+ report_enum = &hdev->report_enum[HID_OUTPUT_REPORT];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ hid_dbg(hdev, "Report id:%x\n", report->id);
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ hid_dbg(hdev, "usage hid:%x c_index:%x\n",
+ field->usage[j].hid,
+ field->usage[j].collection_index);
+ }
+ hid_dbg(hdev, "units:%x expo:%x\n",
+ field->unit,
+ field->unit_exponent);
+
+ }
+ }
+
+ hid_dbg(hdev, "report_enum[HID_FEATURE_REPORT]\n");
+ report_enum = &hdev->report_enum[HID_FEATURE_REPORT];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ hid_dbg(hdev, "Report id:%x\n", report->id);
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ hid_dbg(hdev, "u hid:%x c_index:%x\n",
+ field->usage[j].hid,
+ field->usage[j].collection_index);
+ }
+ hid_dbg(hdev, "units:%x expo:%x\n",
+ field->unit,
+ field->unit_exponent);
+ }
+ }
+}
+
+static void dump_raw_data(struct hid_device *hdev, int size, u8 *pdata)
+{
+ int j = 0;
+
+ for (j = 0; j < size; ++j)
+ hid_dbg(hdev, "0x%x\n", *pdata++);
+}
+#endif
+
+static struct hid_sensor_hub_callbacks *sensor_hub_get_callback(
+ struct hid_device *hdev,
+ u32 usage_id, void **priv)
+{
+ struct hid_sensor_hub_callbacks_list *callback = NULL;
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+
+
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+ if (callback->usage_id == usage_id) {
+ *priv = callback->priv;
+ spin_unlock(&pdata->dyn_lock);
+ return callback->usage_callback;
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return NULL;
+}
+
+int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ struct hid_sensor_hub_callbacks *usage_callback)
+{
+ struct hid_sensor_hub_callbacks_list *callback;
+ struct sensor_hub_data *pdata =
+ (struct sensor_hub_data *)hid_get_drvdata(hsdev->hdev);
+
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+ if (callback->usage_id == usage_id) {
+ spin_unlock(&pdata->dyn_lock);
+ return -EINVAL;
+ }
+ callback = kzalloc(sizeof(*callback), GFP_KERNEL);
+ if (!callback) {
+ spin_unlock(&pdata->dyn_lock);
+ return -ENOMEM;
+ }
+ callback->usage_callback = usage_callback;
+ callback->usage_id = usage_id;
+ callback->priv = NULL;
+ list_add_tail(&callback->list, &pdata->dyn_callback_list);
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_register_callback);
+
+int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id)
+{
+ struct hid_sensor_hub_callbacks_list *callback, *n;
+ struct sensor_hub_data *pdata =
+ (struct sensor_hub_data *)hid_get_drvdata(hsdev->hdev);
+
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry_safe(callback, n,
+ &pdata->dyn_callback_list, list)
+ if (callback->usage_id == usage_id) {
+ list_del(&callback->list);
+ kfree(callback);
+ break;
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_remove_callback);
+
+int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 value)
+{
+ struct hid_report *report;
+ struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
+ int ret = 0;
+
+ if (report_id < 0)
+ return -EINVAL;
+
+ mutex_lock(&data->mutex);
+ report = sensor_hub_feature_report(report_id, hsdev->hdev);
+ if (!report) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ if (field_index >= report->maxfield) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ hid_set_field(report->field[field_index], 0, value);
+ usbhid_submit_report(hsdev->hdev, report, USB_DIR_OUT);
+ usbhid_wait_io(hsdev->hdev);
+done_proc:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_set_feature);
+
+int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 *value)
+{
+ struct hid_report *report;
+ struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
+ int ret = 0;
+
+ if (report_id < 0)
+ return -EINVAL;
+
+ mutex_lock(&data->mutex);
+ report = sensor_hub_feature_report(report_id, hsdev->hdev);
+ if (!report) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ if (field_index >= report->maxfield) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN);
+ usbhid_wait_io(hsdev->hdev);
+ *value = report->field[field_index]->value[0];
+done_proc:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_get_feature);
+
+
+int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ u32 attr_usage_id, u32 report_id)
+{
+ struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
+ struct sensor_hub_pending *work;
+ unsigned long flags;
+ struct hid_report *report;
+ int ret_val = 0;
+
+ if (report_id < 0)
+ return -EINVAL;
+
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
+ if (!work)
+ return ret_val;
+
+ init_completion(&work->ready);
+ work->usage_id = usage_id;
+ work->attr_usage_id = attr_usage_id;
+ work->raw_size = 0;
+
+ mutex_lock(&data->mutex);
+ spin_lock_irqsave(&data->lock, flags);
+ data->pending = work;
+ report = sensor_hub_in_report(report_id, hsdev->hdev);
+ if (!report)
+ goto err_free;
+ usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN);
+ spin_unlock_irqrestore(&data->lock, flags);
+ wait_for_completion_interruptible_timeout(&work->ready, HZ*5);
+ if (work->raw_size)
+ ret_val = *(u32 *)work->raw_data;
+
+err_free:
+ data->pending = NULL;
+ mutex_unlock(&data->mutex);
+
+ kfree(work);
+ return ret_val;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_input_attr_get_raw_value);
+
+int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
+ u8 type,
+ u32 usage_id,
+ u32 attr_usage_id,
+ struct hid_sensor_hub_attribute_info *info)
+{
+ int ret = -1;
+ int i, j;
+ int collection_index = -1;
+ struct hid_report *report;
+ struct hid_field *field;
+ struct hid_report_enum *report_enum;
+ struct hid_device *hdev = hsdev->hdev;
+
+ /* Initialize with defaults */
+ info->usage_id = usage_id;
+ info->attrib_id = attr_usage_id;
+ info->report_id = -1;
+ info->index = -1;
+ info->units = -1;
+ info->unit_expo = -1;
+
+ for (i = 0; i < hdev->maxcollection; ++i) {
+ struct hid_collection *collection = &hdev->collection[i];
+ if (usage_id == collection->usage) {
+ collection_index = i;
+ break;
+ }
+ }
+ if (collection_index == -1)
+ goto err_ret;
+
+ report_enum = &hdev->report_enum[type];
+ list_for_each_entry(report, &report_enum->report_list, list) {
+ for (i = 0; i < report->maxfield; ++i) {
+ field = report->field[i];
+ for (j = 0; j < field->maxusage; ++j) {
+ if (field->usage[j].hid == attr_usage_id &&
+ field->usage[j].collection_index ==
+ collection_index) {
+ info->index = i;
+ info->report_id = report->id;
+ info->units = field->unit;
+ info->unit_expo = field->unit_exponent;
+ info->size = field->report_size/8;
+ break;
+ }
+ }
+ }
+ }
+err_ret:
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_input_get_attribute_info);
+
+struct hid_sensor_common_attributes *sensor_hub_allocate_common_attributes(
+ struct hid_sensor_hub_device *hsdev, unsigned usage_id)
+{
+ int ret;
+ struct hid_sensor_common_attributes *st;
+
+ st = kzalloc(sizeof(struct hid_sensor_common_attributes), GFP_KERNEL);
+ if (st == NULL) {
+ hid_err(hsdev->hdev, "Mem Allocation Failure\n");
+ goto error_ret;
+ }
+ st->hsdev = hsdev;
+ st->usage_id = usage_id;
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_POLLING, &st->poll);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_REPORT_STATE,
+ &st->report_state);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_POWER_STATE,
+ &st->power_state);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS,
+ &st->sensitivity);
+
+ hid_dbg(hsdev->hdev, "common attributes: %x:%x, %x:%x, %x:%x %x:%x\n",
+ st->poll.index, st->poll.report_id,
+ st->report_state.index, st->report_state.report_id,
+ st->power_state.index, st->power_state.report_id,
+ st->sensitivity.index, st->sensitivity.report_id);
+
+ return st;
+
+error_ret:
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_allocate_common_attributes);
+
+void sensor_hub_free_common_attributes(
+ struct hid_sensor_common_attributes *attrb)
+{
+ kfree(attrb);
+}
+EXPORT_SYMBOL_GPL(sensor_hub_free_common_attributes);
+
+ssize_t hid_sensor_read_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf)
+{
+ __s32 value;
+ int len;
+ int ret;
+ int conv_value;
+
+ ret = sensor_hub_get_feature(attrb->hsdev,
+ attrb->poll.report_id,
+ attrb->poll.index, &value);
+ if (ret < 0 || value <= 0)
+ len = sprintf(buf, "0\n");
+ else {
+ if (attrb->poll.units == HID_USAGE_SENSOR_UNITS_MILLISECOND)
+ conv_value = 1000/value;
+ else if (attrb->poll.units == HID_USAGE_SENSOR_UNITS_SECOND)
+ conv_value = 1/value;
+ else
+ conv_value = value; /*Assume HZ*/
+ len = sprintf(buf, "%d\n", conv_value);
+ }
+ return len;
+}
+EXPORT_SYMBOL_GPL(hid_sensor_read_samp_freq);
+
+ssize_t hid_sensor_write_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int conv_value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value > MAXIMUM_SAMP_FREQUENCY)
+ value = MAXIMUM_SAMP_FREQUENCY;
+
+ if (value && attrb->poll.units == HID_USAGE_SENSOR_UNITS_MILLISECOND)
+ conv_value = 1000/value;
+ else if (value && attrb->poll.units == HID_USAGE_SENSOR_UNITS_SECOND)
+ conv_value = 1/value;
+ else
+ conv_value = value; /*Assume HZ*/
+
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->poll.report_id,
+ attrb->poll.index,
+ conv_value);
+
+ if (ret < 0)
+ return ret;
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_samp_freq);
+
+ssize_t hid_sensor_read_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf)
+{
+ __s32 value;
+ int len;
+ int ret;
+
+ ret = sensor_hub_get_feature(attrb->hsdev,
+ attrb->sensitivity.report_id,
+ attrb->sensitivity.index, &value);
+ if (ret < 0 || value < 0) {
+ len = sprintf(buf, "0\n");
+ hid_err(attrb->hsdev->hdev, "Failed\n");
+ } else
+ len = sprintf(buf, "units:%d,exp:%d,value:%d\n",
+ attrb->sensitivity.units,
+ attrb->sensitivity.unit_expo, value);
+ return len;
+}
+EXPORT_SYMBOL_GPL(hid_sensor_read_hyst_raw);
+
+ssize_t hid_sensor_write_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->sensitivity.report_id,
+ attrb->sensitivity.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_hyst_raw);
+
+ssize_t hid_sensor_write_report_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->report_state.report_id,
+ attrb->report_state.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_report_state);
+
+ssize_t hid_sensor_write_power_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf)
+{
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(attrb->hsdev,
+ attrb->power_state.report_id,
+ attrb->power_state.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+
+ return strlen(buf);
+}
+EXPORT_SYMBOL_GPL(hid_sensor_write_power_state);
+
+
+#ifdef CONFIG_PM
+static int sensor_hub_suspend(struct hid_device *hdev, pm_message_t message)
+{
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+ struct hid_sensor_hub_callbacks_list *callback;
+
+ hid_dbg(hdev, " sensor_hub_suspend\n");
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list) {
+ if (callback->initialized && callback->usage_callback->suspend)
+ callback->usage_callback->suspend(
+ pdata->hsdev, callback->priv);
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+
+static int sensor_hub_resume(struct hid_device *hdev)
+{
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+ struct hid_sensor_hub_callbacks_list *callback;
+
+ hid_dbg(hdev, " sensor_hub_resume\n");
+ spin_lock(&pdata->dyn_lock);
+ list_for_each_entry(callback, &pdata->dyn_callback_list, list) {
+ if (callback->initialized && callback->usage_callback->resume)
+ callback->usage_callback->resume(
+ pdata->hsdev, callback->priv);
+ }
+ spin_unlock(&pdata->dyn_lock);
+ return 0;
+}
+
+static int sensor_hub_reset_resume(struct hid_device *hdev)
+{
+ return 0;
+}
+#endif
+/*
+ * Handle raw report as sent by device
+ */
+static int sensor_hub_raw_event(struct hid_device *hdev,
+ struct hid_report *report, u8 *raw_data, int size)
+{
+ int i;
+ u8 *ptr;
+ int sz;
+ struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+ unsigned long flags;
+ struct hid_sensor_hub_callbacks *callback = NULL;
+ struct hid_collection *collection = NULL;
+ void *priv = NULL;
+
+ hid_dbg(hdev, "sensor_hub_raw_event report id:0x%x size:%d type:%d\n",
+ report->id, size, report->type);
+ hid_dbg(hdev, "maxfield:%d\n", report->maxfield);
+#if (defined CONFIG_HID_SENSOR_HUB_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_HUB_DEBUG_MODULE)
+ dump_raw_data(hdev, size, raw_data);
+#endif
+ if (report->type != HID_INPUT_REPORT)
+ return 1;
+
+ ptr = raw_data;
+ ptr++; /*Skip report id*/
+
+ if (!report)
+ goto err_report;
+
+ spin_lock_irqsave(&pdata->lock, flags);
+
+ for (i = 0; i < report->maxfield; ++i) {
+
+ hid_dbg(hdev, "%d collection_index:%x hid:%x sz:%x\n",
+ i, report->field[i]->usage->collection_index,
+ report->field[i]->usage->hid,
+ report->field[i]->report_size/8);
+
+ sz = report->field[i]->report_size/8;
+ if (pdata->pending && pdata->pending->attr_usage_id ==
+ report->field[i]->usage->hid) {
+ hid_dbg(hdev, "data was pending ...\n");
+ sz = (sz > RAW_BUFFER_SIZE) ? RAW_BUFFER_SIZE : sz;
+ memcpy(pdata->pending->raw_data, ptr, sz);
+ pdata->pending->raw_size = sz;
+ complete(&pdata->pending->ready);
+ }
+ collection = &hdev->collection[
+ report->field[i]->usage->collection_index];
+ hid_dbg(hdev, "collection->usage %x\n",
+ collection->usage);
+ callback = sensor_hub_get_callback(pdata->hsdev->hdev,
+ collection->usage,
+ &priv);
+ if (callback && callback->capture_sample) {
+ callback->capture_sample(pdata->hsdev,
+ report->field[i]->usage->hid, sz, ptr, callback->pdev);
+ }
+ ptr += sz;
+ }
+ if (callback && collection && callback->send_event)
+ callback->send_event(pdata->hsdev, collection->usage,
+ callback->pdev);
+
+ spin_unlock_irqrestore(&pdata->lock, flags);
+
+err_report:
+ return 1;
+}
+
+static int sensor_hub_probe(struct hid_device *hdev,
+ const struct hid_device_id *id)
+{
+ int ret;
+ struct sensor_hub_data *sd;
+ int i;
+ char *name;
+
+ sd = kzalloc(sizeof(struct sensor_hub_data), GFP_KERNEL);
+ if (!sd) {
+ hid_err(hdev, "cannot allocate Sensor data\n");
+ return -ENOMEM;
+ }
+ sd->hsdev = kzalloc(sizeof(struct hid_sensor_hub_device), GFP_KERNEL);
+ if (!sd->hsdev) {
+ hid_err(hdev, "cannot allocate hid_sensor_hub_device\n");
+ ret = -ENOMEM;
+ goto err_free_hub;
+ }
+ hid_set_drvdata(hdev, sd);
+ sd->hsdev->hdev = hdev;
+ spin_lock_init(&sd->lock);
+ spin_lock_init(&sd->dyn_lock);
+ mutex_init(&sd->mutex);
+ ret = hid_parse(hdev);
+ if (ret) {
+ hid_err(hdev, "parse failed\n");
+ goto err_free;
+ }
+#if (defined CONFIG_HID_SENSOR_HUB_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_HUB_DEBUG_MODULE)
+ dump_report(hdev);
+#endif
+ if (sensor_hub_check_for_sensor_page(hdev) < 0) {
+ hid_err(hdev, "sensor page not found\n");
+ goto err_free;
+ }
+ INIT_LIST_HEAD(&hdev->inputs);
+
+ hdev->claimed = HID_CLAIMED_INPUT;
+ ret = hid_hw_start(hdev, 0);
+ if (ret) {
+ hid_err(hdev, "hw start failed\n");
+ goto err_free;
+ }
+ ret = hid_hw_open(hdev);
+ if (ret) {
+ hid_err(hdev, "failed to open input interrupt pipe\n");
+ goto err_stop_hw;
+ }
+
+ INIT_LIST_HEAD(&sd->dyn_callback_list);
+ hid_sensor_client_cnt = 0;
+ for (i = 0; i < hdev->maxcollection && i < MAX_HUB_SENSORS ; ++i) {
+ struct hid_collection *collection = &hdev->collection[i];
+ name = kmalloc(MAX_DRIVER_NAME_SIZE+1, GFP_KERNEL);
+ if (name == NULL) {
+ hid_err(hdev,
+ "memory alloc failed for MFD device name\n");
+ ret = -ENOMEM;
+ goto err_close;
+ }
+ snprintf(name, MAX_DRIVER_NAME_SIZE, "HID-SENSOR-%x",
+ collection->usage);
+ hid_sensor_hub_client_devs[i].name = name;
+ hid_sensor_hub_client_devs[i].platform_data = &sd->hsdev;
+ hid_sensor_hub_client_devs[i].pdata_size = sizeof(sd->hsdev);
+ hid_dbg(hdev, "Adding %s:%x\n", name, (unsigned int)sd);
+ hid_sensor_client_cnt++;
+ }
+ ret = mfd_add_devices(&hdev->dev, 0, hid_sensor_hub_client_devs,
+ hid_sensor_client_cnt, NULL, 0);
+ if (ret < 0) {
+ for (i = 0; i < hid_sensor_client_cnt ; ++i)
+ kfree(hid_sensor_hub_client_devs[i].name);
+ goto err_close;
+ }
+ return ret;
+
+err_close:
+ hid_hw_stop(hdev);
+ hid_hw_close(hdev);
+err_stop_hw:
+ hid_hw_stop(hdev);
+err_free:
+ kfree(sd->hsdev);
+err_free_hub:
+ kfree(sd);
+
+ return ret;
+}
+
+static void sensor_hub_remove(struct hid_device *hdev)
+{
+ struct sensor_hub_data *data = hid_get_drvdata(hdev);
+ unsigned long flags;
+ int i;
+
+ hid_dbg(hdev, " hardware removed\n");
+ hdev->claimed &= ~HID_CLAIMED_INPUT;
+ hid_hw_stop(hdev);
+ hid_hw_close(hdev);
+ spin_lock_irqsave(&data->lock, flags);
+ if (data->pending)
+ complete(&data->pending->ready);
+ spin_unlock_irqrestore(&data->lock, flags);
+ mfd_remove_devices(&hdev->dev);
+ for (i = 0; i < hid_sensor_client_cnt ; ++i)
+ kfree(hid_sensor_hub_client_devs[i].name);
+ hid_set_drvdata(hdev, NULL);
+ mutex_destroy(&data->mutex);
+ kfree(data->hsdev);
+ kfree(data);
+}
+
+static const struct hid_device_id sensor_hub_devices[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_1020) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+ USB_DEVICE_ID_SENSOR_HUB_09FA) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
+ USB_DEVICE_ID_SENSOR_HUB_7014) },
+ { }
+};
+
+static const struct hid_usage_id sensor_hub_grabbed_usages[] = {
+ { HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
+ { HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1 }
+};
+
+static struct hid_driver sensor_hub_driver = {
+ .name = "hid-sensor-hub",
+ .id_table = sensor_hub_devices,
+ .probe = sensor_hub_probe,
+ .remove = sensor_hub_remove,
+ .raw_event = sensor_hub_raw_event,
+#ifdef CONFIG_PM
+ .suspend = sensor_hub_suspend,
+ .resume = sensor_hub_resume,
+ .reset_resume = sensor_hub_reset_resume,
+#endif
+};
+
+static int __init sensor_hub_init(void)
+{
+ return hid_register_driver(&sensor_hub_driver);
+}
+
+static void __exit sensor_hub_exit(void)
+{
+ hid_unregister_driver(&sensor_hub_driver);
+}
+
+module_init(sensor_hub_init);
+module_exit(sensor_hub_exit);
+
+MODULE_DESCRIPTION("HID Sensor Hub driver");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
new file mode 100644
index 0000000..f7ce790
--- /dev/null
+++ b/include/linux/hid-sensor-hub.h
@@ -0,0 +1,99 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef _HID_SENSORS_HUB_H
+#define _HID_SENSORS_HUB_H
+
+#include <linux/hid.h>
+#include <linux/hid-sensor-ids.h>
+
+struct hid_sensor_hub_attribute_info {
+ u32 usage_id;
+ u32 attrib_id;
+ s32 report_id;
+ s32 index;
+ s32 units;
+ s32 unit_expo;
+ s32 size;
+};
+
+struct hid_sensor_common_attributes {
+ struct hid_sensor_hub_device *hsdev;
+ unsigned usage_id;
+ struct hid_sensor_hub_attribute_info poll;
+ struct hid_sensor_hub_attribute_info report_state;
+ struct hid_sensor_hub_attribute_info power_state;
+ struct hid_sensor_hub_attribute_info sensitivity;
+};
+
+struct hid_sensor_hub_device {
+ struct hid_device *hdev;
+};
+
+
+struct hid_sensor_hub_callbacks {
+ struct platform_device *pdev;
+ int (*suspend)(struct hid_sensor_hub_device *hsdev, void *priv);
+ int (*resume)(struct hid_sensor_hub_device *hsdev, void *priv);
+ int (*capture_sample)(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id, size_t raw_len, char *raw_data,
+ void *priv);
+ int (*send_event)(struct hid_sensor_hub_device *hsdev, u32 usage_id,
+ void *priv);
+};
+
+/* Registeration functions */
+int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ struct hid_sensor_hub_callbacks *usage_callback);
+int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id);
+
+/* Hid sensor hub core interfaces */
+int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
+ u8 type,
+ u32 usage_id, u32 attr_usage_id,
+ struct hid_sensor_hub_attribute_info *info);
+int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
+ u32 usage_id,
+ u32 attr_usage_id, u32 report_id);
+int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 value);
+int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+ u32 field_index, s32 *value);
+
+struct hid_sensor_common_attributes *sensor_hub_allocate_common_attributes(
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id);
+void sensor_hub_free_common_attributes(
+ struct hid_sensor_common_attributes *attrb);
+ssize_t hid_sensor_read_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf);
+ssize_t hid_sensor_write_samp_freq(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+ssize_t hid_sensor_read_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, char *buf);
+ssize_t hid_sensor_write_hyst_raw(struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+ssize_t hid_sensor_write_report_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+ssize_t hid_sensor_write_power_state(
+ struct hid_sensor_common_attributes *attrb,
+ int buf_len, const char *buf);
+#endif
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h
new file mode 100644
index 0000000..34cc779
--- /dev/null
+++ b/include/linux/hid-sensor-ids.h
@@ -0,0 +1,116 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef _HID_SENSORS_IDS_H
+#define _HID_SENSORS_IDS_H
+
+#define HID_UP_SENSOR 0x00200000
+#define HID_SENSOR_POLLING 0x0020030E
+#define HID_SENSOR_REPORT_STATE 0x00200316
+#define HID_SENSOR_POWER_STATE 0x00200319
+
+
+/* Accel 3D (200073) */
+#define HID_USAGE_SENSOR_ACCEL_3D 0x200073
+#define HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS 0x200453
+#define HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS 0x200454
+#define HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS 0x200455
+
+/* ALS (200041) */
+#define HID_USAGE_SENSOR_ALS 0x200041
+#define HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE 0x2004d1
+
+/* Compass 3D: (200083) */
+
+/* Gyro 3D: (200076) */
+#define HID_USAGE_SENSOR_GYRO_3D 0x200076
+#define HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS 0x200457
+#define HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS 0x200458
+#define HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS 0x200459
+
+/*ORIENTATION: Compass 3D: (200083) */
+#define HID_USAGE_SENSOR_COMPASS_3D 0x200083
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING 0x200471
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING_X 0x200472
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING_Y 0x200473
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_HEADING_Z 0x200474
+
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_COMPENSATED_MAGNETIC_NORTH 0x200475
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_COMPENSATED_TRUE_NORTH 0x200476
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_NORTH 0x200477
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TRUE_NORTH 0x200478
+
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE 0x200479
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_X 0x20047A
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_Y 0x20047B
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_Z 0x20047C
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_DISTANCE_OUT_OF_RANGE 0x20047D
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT 0x20047E
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT_X 0x20047F
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT_Y 0x200480
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_TILT_Z 0x200481
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_ROTATION_MATRIX 0x200482
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_QUATERNION 0x200483
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX 0x200484
+
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_X_AXIS 0x200485
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Y_AXIS 0x200486
+#define HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Z_AXIS 0x200487
+
+/* Units */
+#define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED 0x00
+#define HID_USAGE_SENSOR_UNITS_LUX 0x01
+#define HID_USAGE_SENSOR_UNITS_KELVIN 0x01000100
+#define HID_USAGE_SENSOR_UNITS_FAHRENHEIT 0x03000100
+#define HID_USAGE_SENSOR_UNITS_PASCAL 0xF1E1
+#define HID_USAGE_SENSOR_UNITS_NEWTON 0x11E1
+#define HID_USAGE_SENSOR_UNITS_METERS_PER_SECOND 0x11F0
+#define HID_USAGE_SENSOR_UNITS_METERS_PER_SEC_SQRD 0x11E0
+#define HID_USAGE_SENSOR_UNITS_FARAD 0xE14F2000
+#define HID_USAGE_SENSOR_UNITS_AMPERE 0x01001000
+#define HID_USAGE_SENSOR_UNITS_WATT 0x21d1
+#define HID_USAGE_SENSOR_UNITS_HENRY 0x21E1E000
+#define HID_USAGE_SENSOR_UNITS_OHM 0x21D1E000
+#define HID_USAGE_SENSOR_UNITS_VOLT 0x21D1F000
+#define HID_USAGE_SENSOR_UNITS_HERTZ 0x01F0
+#define HID_USAGE_SENSOR_UNITS_DEGREES_PER_SEC_SQRD 0x14E0
+#define HID_USAGE_SENSOR_UNITS_RADIANS 0x12
+#define HID_USAGE_SENSOR_UNITS_RADIANS_PER_SECOND 0x12F0
+#define HID_USAGE_SENSOR_UNITS_RADIANS_PER_SEC_SQRD 0x12E0
+#define HID_USAGE_SENSOR_UNITS_SECOND 0x0110
+#define HID_USAGE_SENSOR_UNITS_GAUSS 0x01E1F000
+#define HID_USAGE_SENSOR_UNITS_GRAM 0x0101
+#define HID_USAGE_SENSOR_UNITS_CENTIMETER 0x11
+#define HID_USAGE_SENSOR_UNITS_G 0x1A
+#define HID_USAGE_SENSOR_UNITS_MILLISECOND 0x19
+#define HID_USAGE_SENSOR_UNITS_PERCENT 0x17
+#define HID_USAGE_SENSOR_UNITS_DEGREES 0x14
+#define HID_USAGE_SENSOR_UNITS_DEGREES_PER_SECOND 0x15
+
+/* Common selectors */
+#define HID_USAGE_SENSOR_PROPERTY_REPORT_INTERVAL 0x20030E
+#define HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS 0x20030F
+#define HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_RANGE_PCT 0x200310
+#define HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_REL_PCT 0x200311
+#define HID_USAGE_SENSOR_PROPERTY_ACCURACY 0x200312
+#define HID_USAGE_SENSOR_PROPERTY_RESOLUTION 0x200313
+#define HID_USAGE_SENSOR_PROPERTY_RANGE_MAXIMUM 0x200314
+#define HID_USAGE_SENSOR_PROPERTY_RANGE_MINIMUM 0x200315
+#define HID_USAGE_SENSOR_PROPERTY_REPORTING_STATE 0x200316
+
+#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread[parent not found: <1340672054-16591-3-git-send-email-srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH, 2/6] HID-Sensors: Sensor framework
2012-06-26 0:54 ` srinivas pandruvada
@ 2012-06-26 12:02 ` Jiri Kosina
-1 siblings, 0 replies; 21+ messages in thread
From: Jiri Kosina @ 2012-06-26 12:02 UTC (permalink / raw)
To: srinivas pandruvada
Cc: linux-iio-u79uwXL29TY76Z2rM5mHXA, jic23.cam.ac.uk-l3A5Bk7waGM,
linux-input-u79uwXL29TY76Z2rM5mHXA
On Mon, 25 Jun 2012, srinivas pandruvada wrote:
> Adding processing for HID Sensor usage table as defined by
> HID 1.12, Request #: HUTRR39, dated 05 May, 2011.
> This driver uses HID driver framework to register, send and
> receive events.
> This uses MFD framework, so that actual processing for a
> specific usage id can be done in a different driver. For
> example an accelerometer driver can be a separate driver and
> use the interface provided by this driver to register for
> events.
>
> Signed-off-by: srinivas pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
> drivers/hid/Kconfig | 18 +
> drivers/hid/Makefile | 1 +
> drivers/hid/hid-sensor-hub.c | 883 ++++++++++++++++++++++++++++++++++++++++
> include/linux/hid-sensor-hub.h | 99 +++++
> include/linux/hid-sensor-ids.h | 116 ++++++
> 5 files changed, 1117 insertions(+), 0 deletions(-)
> create mode 100644 drivers/hid/hid-sensor-hub.c
> create mode 100644 include/linux/hid-sensor-hub.h
> create mode 100644 include/linux/hid-sensor-ids.h
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index ffddcba..0c86ab0 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -644,6 +644,24 @@ config HID_ZYDACRON
> ---help---
> Support for Zydacron remote control.
>
> +config HID_SENSOR_HUB
> + tristate "HID Sensors framework support"
> + depends on USB_HID
> + select MFD_CORE
> + default n
> + -- help---
> + Support for HID Sensor framework. This will provide MFD framework for
> + adding different sensors, using HID sensor usage table. This defines
> + a set of interface functions to register callbacks for events so
> + that the events are transferred to user space using either input
> + or IIO ineterfaces.
> +
> +config HID_SENSOR_HUB_DEBUG
> + tristate "HID Sensor debug support"
> + default n
> + -- help---
> + Debug support for Hid sensors. Enable this flag to debug only.
> +
Why not use debugfs (which is what the rest of the HID code and drivers do
for debugging)?
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH, 2/6] HID-Sensors: Sensor framework
@ 2012-06-26 12:02 ` Jiri Kosina
0 siblings, 0 replies; 21+ messages in thread
From: Jiri Kosina @ 2012-06-26 12:02 UTC (permalink / raw)
To: srinivas pandruvada; +Cc: linux-iio, jic23.cam.ac.uk, linux-input
On Mon, 25 Jun 2012, srinivas pandruvada wrote:
> Adding processing for HID Sensor usage table as defined by
> HID 1.12, Request #: HUTRR39, dated 05 May, 2011.
> This driver uses HID driver framework to register, send and
> receive events.
> This uses MFD framework, so that actual processing for a
> specific usage id can be done in a different driver. For
> example an accelerometer driver can be a separate driver and
> use the interface provided by this driver to register for
> events.
>
> Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
> ---
> drivers/hid/Kconfig | 18 +
> drivers/hid/Makefile | 1 +
> drivers/hid/hid-sensor-hub.c | 883 ++++++++++++++++++++++++++++++++++++++++
> include/linux/hid-sensor-hub.h | 99 +++++
> include/linux/hid-sensor-ids.h | 116 ++++++
> 5 files changed, 1117 insertions(+), 0 deletions(-)
> create mode 100644 drivers/hid/hid-sensor-hub.c
> create mode 100644 include/linux/hid-sensor-hub.h
> create mode 100644 include/linux/hid-sensor-ids.h
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index ffddcba..0c86ab0 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -644,6 +644,24 @@ config HID_ZYDACRON
> ---help---
> Support for Zydacron remote control.
>
> +config HID_SENSOR_HUB
> + tristate "HID Sensors framework support"
> + depends on USB_HID
> + select MFD_CORE
> + default n
> + -- help---
> + Support for HID Sensor framework. This will provide MFD framework for
> + adding different sensors, using HID sensor usage table. This defines
> + a set of interface functions to register callbacks for events so
> + that the events are transferred to user space using either input
> + or IIO ineterfaces.
> +
> +config HID_SENSOR_HUB_DEBUG
> + tristate "HID Sensor debug support"
> + default n
> + -- help---
> + Debug support for Hid sensors. Enable this flag to debug only.
> +
Why not use debugfs (which is what the rest of the HID code and drivers do
for debugging)?
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [PATCH, 2/6] HID-Sensors: Sensor framework
2012-06-26 12:02 ` Jiri Kosina
(?)
@ 2012-06-26 16:00 ` Pandruvada, Srinivas
-1 siblings, 0 replies; 21+ messages in thread
From: Pandruvada, Srinivas @ 2012-06-26 16:00 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-iio@vger.kernel.org, jic23.cam.ac.uk@suse.de,
linux-input@vger.kernel.org
OK. I can use debugfs. If you have some other comments, I can bundle all of them together in the next set.
Thanks,
Srinivas
-----Original Message-----
From: linux-iio-owner@vger.kernel.org [mailto:linux-iio-owner@vger.kernel.org] On Behalf Of Jiri Kosina
Sent: Tuesday, June 26, 2012 5:02 AM
To: Pandruvada, Srinivas
Cc: linux-iio@vger.kernel.org; jic23.cam.ac.uk@suse.de; linux-input@vger.kernel.org
Subject: Re: [PATCH, 2/6] HID-Sensors: Sensor framework
On Mon, 25 Jun 2012, srinivas pandruvada wrote:
> Adding processing for HID Sensor usage table as defined by HID 1.12,
> Request #: HUTRR39, dated 05 May, 2011.
> This driver uses HID driver framework to register, send and receive
> events.
> This uses MFD framework, so that actual processing for a specific
> usage id can be done in a different driver. For example an
> accelerometer driver can be a separate driver and use the interface
> provided by this driver to register for events.
>
> Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
> ---
> drivers/hid/Kconfig | 18 +
> drivers/hid/Makefile | 1 +
> drivers/hid/hid-sensor-hub.c | 883 ++++++++++++++++++++++++++++++++++++++++
> include/linux/hid-sensor-hub.h | 99 +++++
> include/linux/hid-sensor-ids.h | 116 ++++++
> 5 files changed, 1117 insertions(+), 0 deletions(-) create mode
> 100644 drivers/hid/hid-sensor-hub.c create mode 100644
> include/linux/hid-sensor-hub.h create mode 100644
> include/linux/hid-sensor-ids.h
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index
> ffddcba..0c86ab0 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -644,6 +644,24 @@ config HID_ZYDACRON
> ---help---
> Support for Zydacron remote control.
>
> +config HID_SENSOR_HUB
> + tristate "HID Sensors framework support"
> + depends on USB_HID
> + select MFD_CORE
> + default n
> + -- help---
> + Support for HID Sensor framework. This will provide MFD framework for
> + adding different sensors, using HID sensor usage table. This defines
> + a set of interface functions to register callbacks for events so
> + that the events are transferred to user space using either input
> + or IIO ineterfaces.
> +
> +config HID_SENSOR_HUB_DEBUG
> + tristate "HID Sensor debug support"
> + default n
> + -- help---
> + Debug support for Hid sensors. Enable this flag to debug only.
> +
Why not use debugfs (which is what the rest of the HID code and drivers do for debugging)?
Thanks,
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH, 3/6] HID-Sensors: Added accelerometer 3D
2012-06-26 0:54 [PATCH, 0/6] HID-Sensors v3 srinivas pandruvada
@ 2012-06-26 0:54 ` srinivas pandruvada
2012-06-26 0:54 ` [PATCH, 5/6] HID-Sensors: Added Compass 3D srinivas pandruvada
2012-06-26 12:03 ` [PATCH, 0/6] HID-Sensors v3 Jiri Kosina
2 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio-u79uwXL29TY76Z2rM5mHXA
Cc: jic23.cam.ac.uk-u79uwXL29TY76Z2rM5mHXA, jkosina-AlSwsSmVLrQ,
linux-input-u79uwXL29TY76Z2rM5mHXA, srinivas pandruvada
Added usage id processing for Accelrometer 3D. This uses IIO
interfaces for triggerred buffer to present data to user
mode.This uses HID sensor framework for registering callback
events from the sensor hub.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/staging/iio/accel/Kconfig | 10 +
drivers/staging/iio/accel/Makefile | 3 +
drivers/staging/iio/accel/hid-sensor-accel-3d.c | 537 +++++++++++++++++++++++
3 files changed, 550 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/iio/accel/hid-sensor-accel-3d.c
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index 5ab7167..bf93c6d 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -102,4 +102,14 @@ config SCA3000
Say yes here to build support for the VTI SCA3000 series of SPI
accelerometers. These devices use a hardware ring buffer.
+config HID_SENSOR_ACCEL_3D
+ depends on HID_SENSOR_HUB
+ select IIO_BUFFER
+ select IIO_TRIGGER
+ select IIO_TRIGGERED_BUFFER
+ tristate "HID Acelerometers 3D"
+ help
+ Say yes here to build support for the HID SENSOR
+ accelerometers.
+
endmenu
diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index 95c6666..d454c7d 100644
--- a/drivers/staging/iio/accel/Makefile
+++ b/drivers/staging/iio/accel/Makefile
@@ -33,3 +33,6 @@ obj-$(CONFIG_LIS3L02DQ) += lis3l02dq.o
sca3000-y := sca3000_core.o sca3000_ring.o
obj-$(CONFIG_SCA3000) += sca3000.o
+
+hid-sensor-accel-3d-drv-y := hid-sensor-accel-3d.o
+obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d-drv.o
diff --git a/drivers/staging/iio/accel/hid-sensor-accel-3d.c b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
new file mode 100644
index 0000000..77d4663
--- /dev/null
+++ b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
@@ -0,0 +1,537 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/hid-sensor-hub.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "../kfifo_buf.h"
+#include "../trigger_consumer.h"
+#include "../triggered_buffer.h"
+
+/*Format: HID-SENSOR-usage_id_in_hex*/
+#define DRIVER_NAME "HID-SENSOR-200073"
+
+#define CHANNEL_SCAN_INDEX_X 0
+#define CHANNEL_SCAN_INDEX_Y 1
+#define CHANNEL_SCAN_INDEX_Z 2
+
+struct accel_3d_sample {
+ u32 accel_x;
+ u32 accel_y;
+ u32 accel_z;
+} __packed;
+
+struct accel_3d_state {
+ struct hid_sensor_hub_device *hsdev;
+ struct platform_device *pdev;
+ struct hid_sensor_common_attributes *common_attrb;
+ struct hid_sensor_hub_attribute_info accel_x;
+ struct hid_sensor_hub_attribute_info accel_y;
+ struct hid_sensor_hub_attribute_info accel_z;
+ struct accel_3d_sample accel_sample_data;
+ bool data_ready;
+};
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct accel_3d_state *st = iio_priv(indio_dev);
+ int state_val;
+ char buffer[16];
+
+ dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
+ state);
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ sprintf(buffer, "%d", state_val);
+ hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
+ hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
+
+ return 0;
+}
+
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
+{
+ iio_trigger_unregister(indio_dev->trig);
+ iio_free_trigger(indio_dev->trig);
+}
+
+static const struct iio_trigger_ops hid_sensor_trigger_ops = {
+ .owner = THIS_MODULE,
+ .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
+};
+
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
+{
+ int ret;
+ struct iio_trigger *trig;
+
+ trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
+ if (trig == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ trig->dev.parent = indio_dev->dev.parent;
+ trig->private_data = (void *)indio_dev;
+ trig->ops = &hid_sensor_trigger_ops;
+ ret = iio_trigger_register(trig);
+
+ /* select default trigger */
+ indio_dev->trig = trig;
+ if (ret)
+ goto error_free_trig;
+
+ return ret;
+
+error_free_trig:
+ iio_free_trigger(trig);
+error_ret:
+ return ret;
+}
+
+static struct iio_chan_spec accel_3d_channels[] = {
+ {
+ .type = IIO_ACCEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_X,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_X,
+ }, {
+ .type = IIO_ACCEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Y,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Y,
+ }, {
+ .type = IIO_ACCEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Z,
+ }
+};
+
+static void accel_3d_adjust_channel_bit_mask(int channel, int size)
+{
+ accel_3d_channels[channel].scan_type.sign = 's';
+ accel_3d_channels[channel].scan_type.realbits = size * 8;
+ accel_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int accel_3d_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+ int report_id = -1;
+ u32 address;
+
+ *val = 0;
+ *val2 = 0;
+ switch (mask) {
+ case 0:
+ switch (chan->scan_index) {
+ case CHANNEL_SCAN_INDEX_X:
+ report_id = accel_state->accel_x.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Y:
+ report_id = accel_state->accel_y.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Z:
+ report_id = accel_state->accel_z.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(
+ accel_state->hsdev,
+ HID_USAGE_SENSOR_ACCEL_3D, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = accel_state->accel_x.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = accel_state->accel_x.unit_expo;
+ break;
+ default:
+ break;
+ }
+ return IIO_VAL_INT;
+}
+
+static int accel_3d_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ dev_err(&indio_dev->dev, "%s\n", __func__);
+ return 0;
+}
+
+static ssize_t hid_sensor_accel_3d_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int len;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+ len = hid_sensor_read_hyst_raw(accel_state->common_attrb, strlen(buf),
+ buf);
+ return len;
+}
+
+static ssize_t hid_sensor_accel_3d_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+ return hid_sensor_write_hyst_raw(accel_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_read_accel_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ return hid_sensor_read_samp_freq(accel_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_write_accel_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ return hid_sensor_write_samp_freq(accel_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_accel_3d_samp_freq,
+ hid_sensor_write_accel_3d_samp_freq);
+
+#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
+ hid_sensor_accel_3d_read_hyst_raw,
+ hid_sensor_accel_3d_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+static struct attribute *accel_3d_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_dev_attr_hyst_raw.dev_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group accel_3d_attribute_group = {
+ .attrs = accel_3d_attributes,
+};
+
+static const struct iio_info accel_3d_info = {
+ .attrs = &accel_3d_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &accel_3d_read_raw,
+ .write_raw = &accel_3d_write_raw,
+};
+
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
+{
+ struct iio_buffer *buffer = indio_dev->buffer;
+ s64 timestamp = iio_get_time_ns();
+ int datum_sz;
+
+ if (!buffer)
+ return;
+ datum_sz = buffer->access->get_bytes_per_datum(buffer);
+ if (len > datum_sz) {
+ dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
+ datum_sz);
+ return;
+ }
+ buffer->access->store_to(buffer, (u8 *)data, timestamp);
+}
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+int accel_3d_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ dev_dbg(&indio_dev->dev, "accel_3d_proc_event\n");
+ if (accel_state->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&accel_state->accel_sample_data,
+ sizeof(struct accel_3d_sample));
+ return 0;
+}
+
+/* Capture samples in local storage */
+int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ size_t raw_len, char *raw_data,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS:
+ accel_state->accel_sample_data.accel_x =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS:
+ accel_state->accel_sample_data.accel_y =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS:
+ accel_state->accel_sample_data.accel_z =
+ *(u32 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int accel_3d_parse_report(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ struct accel_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS,
+ &st->accel_x);
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->accel_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS,
+ &st->accel_y);
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->accel_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS,
+ &st->accel_z);
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->accel_z.size);
+
+ dev_dbg(&st->pdev->dev, "accel_3d %x:%x, %x:%x, %x:%x\n",
+ st->accel_x.index,
+ st->accel_x.report_id,
+ st->accel_y.index, st->accel_y.report_id,
+ st->accel_z.index, st->accel_z.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int accel_3d_init(struct platform_device *pdev,
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id)
+{
+ int ret = 0;
+ static char *name = "accel_3d";
+ struct iio_dev *indio_dev;
+ struct accel_3d_state *accel_state;
+
+ indio_dev = iio_allocate_device(sizeof(struct accel_3d_state));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+ platform_set_drvdata(pdev, indio_dev);
+ accel_state = iio_priv(indio_dev);
+ accel_state->hsdev = hsdev;
+ accel_state->pdev = pdev;
+ accel_state->common_attrb = sensor_hub_allocate_common_attributes(
+ hsdev, HID_USAGE_SENSOR_ACCEL_3D);
+ if (accel_state->common_attrb == NULL) {
+ ret = -ENOMEM;
+ goto error_free_dev;
+ }
+
+ ret = accel_3d_parse_report(hsdev, usage_id, accel_state);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = accel_3d_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(accel_3d_channels);
+ indio_dev->dev.parent = &pdev->dev;
+ indio_dev->info = &accel_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler, NULL);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
+ goto error_free_dev;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_X);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Y);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Z);
+ accel_state->data_ready = false;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "trigger setup failed\n");
+ goto error_unreg_buffer_funcs;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ dev_err(&pdev->dev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_unreg_buffer_funcs:
+ iio_triggered_buffer_cleanup(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_ret:
+ return ret;
+}
+
+static int accel_3d_exit(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+ struct accel_3d_state *st = iio_priv(indio_dev);
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ sensor_hub_free_common_attributes(st->common_attrb);
+ iio_free_device(indio_dev);
+ return ret;
+}
+
+static struct hid_sensor_hub_callbacks accel_3d_callbacks = {
+ .send_event = accel_3d_proc_event,
+ .capture_sample = accel_3d_capture_sample,
+};
+
+static int __devinit hid_accel_3d_probe(struct platform_device *pdev)
+{
+ int ret;
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ ret = accel_3d_init(pdev, hsdev, HID_USAGE_SENSOR_ACCEL_3D);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "accel_3d_init failed\n");
+ return ret;
+ }
+ accel_3d_callbacks.pdev = pdev;
+ ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D,
+ &accel_3d_callbacks);
+ return 0;
+}
+
+static int __devinit hid_accel_3d_remove(struct platform_device *pdev)
+{
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ accel_3d_exit(pdev);
+ return sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D);
+}
+
+static struct platform_driver hid_accel_3d_platform_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = hid_accel_3d_probe,
+ .remove = hid_accel_3d_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init hid_accel_3d_init(void)
+{
+ return platform_driver_register(&hid_accel_3d_platform_driver);
+}
+
+static void __exit hid_accel_3d_exit(void)
+{
+ platform_driver_unregister(&hid_accel_3d_platform_driver);
+}
+
+module_init(hid_accel_3d_init);
+module_exit(hid_accel_3d_exit);
+
+MODULE_DESCRIPTION("HID Sensor Accel 3D");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>");
+MODULE_LICENSE("GPL");
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH, 3/6] HID-Sensors: Added accelerometer 3D
@ 2012-06-26 0:54 ` srinivas pandruvada
0 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio; +Cc: jic23.cam.ac.uk, jkosina, linux-input, srinivas pandruvada
Added usage id processing for Accelrometer 3D. This uses IIO
interfaces for triggerred buffer to present data to user
mode.This uses HID sensor framework for registering callback
events from the sensor hub.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/iio/accel/Kconfig | 10 +
drivers/staging/iio/accel/Makefile | 3 +
drivers/staging/iio/accel/hid-sensor-accel-3d.c | 537 +++++++++++++++++++++++
3 files changed, 550 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/iio/accel/hid-sensor-accel-3d.c
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index 5ab7167..bf93c6d 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -102,4 +102,14 @@ config SCA3000
Say yes here to build support for the VTI SCA3000 series of SPI
accelerometers. These devices use a hardware ring buffer.
+config HID_SENSOR_ACCEL_3D
+ depends on HID_SENSOR_HUB
+ select IIO_BUFFER
+ select IIO_TRIGGER
+ select IIO_TRIGGERED_BUFFER
+ tristate "HID Acelerometers 3D"
+ help
+ Say yes here to build support for the HID SENSOR
+ accelerometers.
+
endmenu
diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index 95c6666..d454c7d 100644
--- a/drivers/staging/iio/accel/Makefile
+++ b/drivers/staging/iio/accel/Makefile
@@ -33,3 +33,6 @@ obj-$(CONFIG_LIS3L02DQ) += lis3l02dq.o
sca3000-y := sca3000_core.o sca3000_ring.o
obj-$(CONFIG_SCA3000) += sca3000.o
+
+hid-sensor-accel-3d-drv-y := hid-sensor-accel-3d.o
+obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d-drv.o
diff --git a/drivers/staging/iio/accel/hid-sensor-accel-3d.c b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
new file mode 100644
index 0000000..77d4663
--- /dev/null
+++ b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
@@ -0,0 +1,537 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/hid-sensor-hub.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "../kfifo_buf.h"
+#include "../trigger_consumer.h"
+#include "../triggered_buffer.h"
+
+/*Format: HID-SENSOR-usage_id_in_hex*/
+#define DRIVER_NAME "HID-SENSOR-200073"
+
+#define CHANNEL_SCAN_INDEX_X 0
+#define CHANNEL_SCAN_INDEX_Y 1
+#define CHANNEL_SCAN_INDEX_Z 2
+
+struct accel_3d_sample {
+ u32 accel_x;
+ u32 accel_y;
+ u32 accel_z;
+} __packed;
+
+struct accel_3d_state {
+ struct hid_sensor_hub_device *hsdev;
+ struct platform_device *pdev;
+ struct hid_sensor_common_attributes *common_attrb;
+ struct hid_sensor_hub_attribute_info accel_x;
+ struct hid_sensor_hub_attribute_info accel_y;
+ struct hid_sensor_hub_attribute_info accel_z;
+ struct accel_3d_sample accel_sample_data;
+ bool data_ready;
+};
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct accel_3d_state *st = iio_priv(indio_dev);
+ int state_val;
+ char buffer[16];
+
+ dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
+ state);
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ sprintf(buffer, "%d", state_val);
+ hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
+ hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
+
+ return 0;
+}
+
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
+{
+ iio_trigger_unregister(indio_dev->trig);
+ iio_free_trigger(indio_dev->trig);
+}
+
+static const struct iio_trigger_ops hid_sensor_trigger_ops = {
+ .owner = THIS_MODULE,
+ .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
+};
+
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
+{
+ int ret;
+ struct iio_trigger *trig;
+
+ trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
+ if (trig == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ trig->dev.parent = indio_dev->dev.parent;
+ trig->private_data = (void *)indio_dev;
+ trig->ops = &hid_sensor_trigger_ops;
+ ret = iio_trigger_register(trig);
+
+ /* select default trigger */
+ indio_dev->trig = trig;
+ if (ret)
+ goto error_free_trig;
+
+ return ret;
+
+error_free_trig:
+ iio_free_trigger(trig);
+error_ret:
+ return ret;
+}
+
+static struct iio_chan_spec accel_3d_channels[] = {
+ {
+ .type = IIO_ACCEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_X,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_X,
+ }, {
+ .type = IIO_ACCEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Y,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Y,
+ }, {
+ .type = IIO_ACCEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Z,
+ }
+};
+
+static void accel_3d_adjust_channel_bit_mask(int channel, int size)
+{
+ accel_3d_channels[channel].scan_type.sign = 's';
+ accel_3d_channels[channel].scan_type.realbits = size * 8;
+ accel_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int accel_3d_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+ int report_id = -1;
+ u32 address;
+
+ *val = 0;
+ *val2 = 0;
+ switch (mask) {
+ case 0:
+ switch (chan->scan_index) {
+ case CHANNEL_SCAN_INDEX_X:
+ report_id = accel_state->accel_x.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Y:
+ report_id = accel_state->accel_y.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Z:
+ report_id = accel_state->accel_z.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(
+ accel_state->hsdev,
+ HID_USAGE_SENSOR_ACCEL_3D, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = accel_state->accel_x.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = accel_state->accel_x.unit_expo;
+ break;
+ default:
+ break;
+ }
+ return IIO_VAL_INT;
+}
+
+static int accel_3d_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ dev_err(&indio_dev->dev, "%s\n", __func__);
+ return 0;
+}
+
+static ssize_t hid_sensor_accel_3d_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int len;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+ len = hid_sensor_read_hyst_raw(accel_state->common_attrb, strlen(buf),
+ buf);
+ return len;
+}
+
+static ssize_t hid_sensor_accel_3d_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+ return hid_sensor_write_hyst_raw(accel_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_read_accel_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ return hid_sensor_read_samp_freq(accel_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_write_accel_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ return hid_sensor_write_samp_freq(accel_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_accel_3d_samp_freq,
+ hid_sensor_write_accel_3d_samp_freq);
+
+#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
+ hid_sensor_accel_3d_read_hyst_raw,
+ hid_sensor_accel_3d_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+static struct attribute *accel_3d_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_dev_attr_hyst_raw.dev_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group accel_3d_attribute_group = {
+ .attrs = accel_3d_attributes,
+};
+
+static const struct iio_info accel_3d_info = {
+ .attrs = &accel_3d_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &accel_3d_read_raw,
+ .write_raw = &accel_3d_write_raw,
+};
+
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
+{
+ struct iio_buffer *buffer = indio_dev->buffer;
+ s64 timestamp = iio_get_time_ns();
+ int datum_sz;
+
+ if (!buffer)
+ return;
+ datum_sz = buffer->access->get_bytes_per_datum(buffer);
+ if (len > datum_sz) {
+ dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
+ datum_sz);
+ return;
+ }
+ buffer->access->store_to(buffer, (u8 *)data, timestamp);
+}
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+int accel_3d_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ dev_dbg(&indio_dev->dev, "accel_3d_proc_event\n");
+ if (accel_state->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&accel_state->accel_sample_data,
+ sizeof(struct accel_3d_sample));
+ return 0;
+}
+
+/* Capture samples in local storage */
+int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ size_t raw_len, char *raw_data,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct accel_3d_state *accel_state = iio_priv(indio_dev);
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS:
+ accel_state->accel_sample_data.accel_x =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS:
+ accel_state->accel_sample_data.accel_y =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS:
+ accel_state->accel_sample_data.accel_z =
+ *(u32 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int accel_3d_parse_report(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ struct accel_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS,
+ &st->accel_x);
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->accel_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS,
+ &st->accel_y);
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->accel_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS,
+ &st->accel_z);
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->accel_z.size);
+
+ dev_dbg(&st->pdev->dev, "accel_3d %x:%x, %x:%x, %x:%x\n",
+ st->accel_x.index,
+ st->accel_x.report_id,
+ st->accel_y.index, st->accel_y.report_id,
+ st->accel_z.index, st->accel_z.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int accel_3d_init(struct platform_device *pdev,
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id)
+{
+ int ret = 0;
+ static char *name = "accel_3d";
+ struct iio_dev *indio_dev;
+ struct accel_3d_state *accel_state;
+
+ indio_dev = iio_allocate_device(sizeof(struct accel_3d_state));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+ platform_set_drvdata(pdev, indio_dev);
+ accel_state = iio_priv(indio_dev);
+ accel_state->hsdev = hsdev;
+ accel_state->pdev = pdev;
+ accel_state->common_attrb = sensor_hub_allocate_common_attributes(
+ hsdev, HID_USAGE_SENSOR_ACCEL_3D);
+ if (accel_state->common_attrb == NULL) {
+ ret = -ENOMEM;
+ goto error_free_dev;
+ }
+
+ ret = accel_3d_parse_report(hsdev, usage_id, accel_state);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = accel_3d_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(accel_3d_channels);
+ indio_dev->dev.parent = &pdev->dev;
+ indio_dev->info = &accel_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler, NULL);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
+ goto error_free_dev;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_X);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Y);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Z);
+ accel_state->data_ready = false;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "trigger setup failed\n");
+ goto error_unreg_buffer_funcs;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ dev_err(&pdev->dev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_unreg_buffer_funcs:
+ iio_triggered_buffer_cleanup(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_ret:
+ return ret;
+}
+
+static int accel_3d_exit(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+ struct accel_3d_state *st = iio_priv(indio_dev);
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ sensor_hub_free_common_attributes(st->common_attrb);
+ iio_free_device(indio_dev);
+ return ret;
+}
+
+static struct hid_sensor_hub_callbacks accel_3d_callbacks = {
+ .send_event = accel_3d_proc_event,
+ .capture_sample = accel_3d_capture_sample,
+};
+
+static int __devinit hid_accel_3d_probe(struct platform_device *pdev)
+{
+ int ret;
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ ret = accel_3d_init(pdev, hsdev, HID_USAGE_SENSOR_ACCEL_3D);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "accel_3d_init failed\n");
+ return ret;
+ }
+ accel_3d_callbacks.pdev = pdev;
+ ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D,
+ &accel_3d_callbacks);
+ return 0;
+}
+
+static int __devinit hid_accel_3d_remove(struct platform_device *pdev)
+{
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ accel_3d_exit(pdev);
+ return sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D);
+}
+
+static struct platform_driver hid_accel_3d_platform_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = hid_accel_3d_probe,
+ .remove = hid_accel_3d_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init hid_accel_3d_init(void)
+{
+ return platform_driver_register(&hid_accel_3d_platform_driver);
+}
+
+static void __exit hid_accel_3d_exit(void)
+{
+ platform_driver_unregister(&hid_accel_3d_platform_driver);
+}
+
+module_init(hid_accel_3d_init);
+module_exit(hid_accel_3d_exit);
+
+MODULE_DESCRIPTION("HID Sensor Accel 3D");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>");
+MODULE_LICENSE("GPL");
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH, 3/6] HID-Sensors: Added accelerometer 3D
2012-06-26 0:54 ` srinivas pandruvada
(?)
@ 2012-06-27 9:11 ` Lars-Peter Clausen
2012-06-27 15:28 ` Pandruvada, Srinivas
-1 siblings, 1 reply; 21+ messages in thread
From: Lars-Peter Clausen @ 2012-06-27 9:11 UTC (permalink / raw)
To: srinivas pandruvada; +Cc: linux-iio, jic23.cam.ac.uk, jkosina, linux-input
On 06/26/2012 02:54 AM, srinivas pandruvada wrote:
> Added usage id processing for Accelrometer 3D. This uses IIO
> interfaces for triggerred buffer to present data to user
> mode.This uses HID sensor framework for registering callback
> events from the sensor hub.
Hi,
Some comments inline, similar comments also apply for the other IIO drivers
in this series.
> [...]
> diff --git a/drivers/staging/iio/accel/hid-sensor-accel-3d.c b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
> new file mode 100644
> index 0000000..77d4663
> --- /dev/null
> +++ b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
> @@ -0,0 +1,537 @@
> [...]
> +#include <linux/device.h>
> +#include <linux/platform_device.h>
> +#include <linux/module.h>
> +#include <linux/interrupt.h>
> +#include <linux/irq.h>
> +#include <linux/slab.h>
> +#include <linux/hid-sensor-hub.h>
> +#include "../iio.h"
> +#include "../sysfs.h"
> +#include "../trigger.h"
> +#include "../kfifo_buf.h"
> +#include "../trigger_consumer.h"
> +#include "../triggered_buffer.h"
IIO has moved out of staging in 3.5, so this wont build with the latest
upstream.
> +
> +/*Format: HID-SENSOR-usage_id_in_hex*/
> +#define DRIVER_NAME "HID-SENSOR-200073"
> +
> +#define CHANNEL_SCAN_INDEX_X 0
> +#define CHANNEL_SCAN_INDEX_Y 1
> +#define CHANNEL_SCAN_INDEX_Z 2
> +
> +struct accel_3d_sample {
> + u32 accel_x;
> + u32 accel_y;
> + u32 accel_z;
> +} __packed;
> +
> +struct accel_3d_state {
> + struct hid_sensor_hub_device *hsdev;
> + struct platform_device *pdev;
> + struct hid_sensor_common_attributes *common_attrb;
> + struct hid_sensor_hub_attribute_info accel_x;
> + struct hid_sensor_hub_attribute_info accel_y;
> + struct hid_sensor_hub_attribute_info accel_z;
> + struct accel_3d_sample accel_sample_data;
> + bool data_ready;
> +};
> +
> +static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
> + bool state)
> +{
> + struct iio_dev *indio_dev = trig->private_data;
> + struct accel_3d_state *st = iio_priv(indio_dev);
> + int state_val;
> + char buffer[16];
> +
> + dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
> + state);
> + st->data_ready = state;
> + state_val = state ? 1 : 0;
> + sprintf(buffer, "%d", state_val);
> + hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
> + hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
This looks kind of odd, passing a integer by using a string.
> +
> + return 0;
> +}
> +
> +void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
> +{
> + iio_trigger_unregister(indio_dev->trig);
> + iio_free_trigger(indio_dev->trig);
> +}
> +
> +static const struct iio_trigger_ops hid_sensor_trigger_ops = {
> + .owner = THIS_MODULE,
> + .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
> +};
> +
> +int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
> +{
> + int ret;
> + struct iio_trigger *trig;
> +
> + trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
> + if (trig == NULL) {
> + ret = -ENOMEM;
> + goto error_ret;
> + }
> +
> + trig->dev.parent = indio_dev->dev.parent;
> + trig->private_data = (void *)indio_dev;
> + trig->ops = &hid_sensor_trigger_ops;
> + ret = iio_trigger_register(trig);
> +
> + /* select default trigger */
> + indio_dev->trig = trig;
> + if (ret)
> + goto error_free_trig;
> +
> + return ret;
> +
> +error_free_trig:
> + iio_free_trigger(trig);
> +error_ret:
> + return ret;
> +}
> +
The trigger code looks pretty similar in all your IIO drivers, maybe it
makes sense to put this into a common module.
> +static struct iio_chan_spec accel_3d_channels[] = {
> + {
> + .type = IIO_ACCEL,
> + .modified = 1,
> + .channel2 = IIO_MOD_X,
> + .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
> + IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .scan_index = CHANNEL_SCAN_INDEX_X,
> + }, {
> + .type = IIO_ACCEL,
> + .modified = 1,
> + .channel2 = IIO_MOD_Y,
> + .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
> + IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .scan_index = CHANNEL_SCAN_INDEX_Y,
> + }, {
> + .type = IIO_ACCEL,
> + .modified = 1,
> + .channel2 = IIO_MOD_Z,
> + .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
> + IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .scan_index = CHANNEL_SCAN_INDEX_Z,
> + }
> +};
> +
> +static void accel_3d_adjust_channel_bit_mask(int channel, int size)
> +{
> + accel_3d_channels[channel].scan_type.sign = 's';
> + accel_3d_channels[channel].scan_type.realbits = size * 8;
> + accel_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
I would this expect to fail badly if there were two devices with different
specs registered at the same time.
> +}
> +
> +static int accel_3d_read_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int *val, int *val2,
> + long mask)
> +{
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> + int report_id = -1;
> + u32 address;
> +
> + *val = 0;
> + *val2 = 0;
> + switch (mask) {
> + case 0:
> + switch (chan->scan_index) {
> + case CHANNEL_SCAN_INDEX_X:
> + report_id = accel_state->accel_x.report_id;
> + address =
> + HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS;
> + break;
> + case CHANNEL_SCAN_INDEX_Y:
> + report_id = accel_state->accel_y.report_id;
> + address =
> + HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS;
> + break;
> + case CHANNEL_SCAN_INDEX_Z:
> + report_id = accel_state->accel_z.report_id;
> + address =
> + HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS;
> + break;
> + default:
> + report_id = -1;
> + break;
> + }
> + if (report_id >= 0)
> + *val = sensor_hub_input_attr_get_raw_value(
> + accel_state->hsdev,
> + HID_USAGE_SENSOR_ACCEL_3D, address,
> + report_id);
> + else
> + *val = 0;
> + break;
> + case IIO_CHAN_INFO_SCALE:
> + *val = accel_state->accel_x.units;
> + break;
> + case IIO_CHAN_INFO_OFFSET:
> + *val = accel_state->accel_x.unit_expo;
> + break;
> + default:
> + break;
> + }
> + return IIO_VAL_INT;
> +}
> +
> +static int accel_3d_write_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int val,
> + int val2,
> + long mask)
> +{
> + dev_err(&indio_dev->dev, "%s\n", __func__);
> + return 0;
> +}
If you don't want to do anything here just don't set the callback in the
iio_info struct.
> +
> +static ssize_t hid_sensor_accel_3d_read_hyst_raw(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + int len;
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> + len = hid_sensor_read_hyst_raw(accel_state->common_attrb, strlen(buf),
> + buf);
> + return len;
> +}
> +
> +static ssize_t hid_sensor_accel_3d_write_hyst_raw(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> + return hid_sensor_write_hyst_raw(accel_state->common_attrb,
> + strlen(buf), buf);
> +}
> +
> +static ssize_t hid_sensor_read_accel_3d_samp_freq(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> +
> + return hid_sensor_read_samp_freq(accel_state->common_attrb,
> + strlen(buf), buf);
This doesn't make sense, buf is empty at this point, so a strlen will return 0.
> +}
> +
> +static ssize_t hid_sensor_write_accel_3d_samp_freq(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> +
> + return hid_sensor_write_samp_freq(accel_state->common_attrb,
> + strlen(buf), buf);
> +}
> +
> +static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
> + hid_sensor_read_accel_3d_samp_freq,
> + hid_sensor_write_accel_3d_samp_freq);
> +
> +#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
> + IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
> +
> +static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
> + hid_sensor_accel_3d_read_hyst_raw,
> + hid_sensor_accel_3d_write_hyst_raw,
> + HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
> +
> +static struct attribute *accel_3d_attributes[] = {
> + /* common attributes */
> + &iio_dev_attr_sampling_frequency.dev_attr.attr,
> + &iio_dev_attr_hyst_raw.dev_attr.attr,
> + NULL,
> +};
> +
> +static const struct attribute_group accel_3d_attribute_group = {
> + .attrs = accel_3d_attributes,
> +};
> +
> +static const struct iio_info accel_3d_info = {
> + .attrs = &accel_3d_attribute_group,
> + .driver_module = THIS_MODULE,
> + .read_raw = &accel_3d_read_raw,
> + .write_raw = &accel_3d_write_raw,
> +};
> +
> +void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
> +{
> + struct iio_buffer *buffer = indio_dev->buffer;
> + s64 timestamp = iio_get_time_ns();
> + int datum_sz;
> +
> + if (!buffer)
> + return;
> + datum_sz = buffer->access->get_bytes_per_datum(buffer);
> + if (len > datum_sz) {
> + dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
> + datum_sz);
> + return;
> + }
> + buffer->access->store_to(buffer, (u8 *)data, timestamp);
> +}
> +
> +static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
> +{
> + return IRQ_HANDLED;
> +}
If you don't want to do anything here just pass NULL to
iio_triggered_buffer_setup.
> [...]
> +static int __init hid_accel_3d_init(void)
> +{
> + return platform_driver_register(&hid_accel_3d_platform_driver);
> +}
> +
> +static void __exit hid_accel_3d_exit(void)
> +{
> + platform_driver_unregister(&hid_accel_3d_platform_driver);
> +}
> +
> +module_init(hid_accel_3d_init);
> +module_exit(hid_accel_3d_exit);
module_platform_driver(hid_accel_3d_platform_driver);
> +
> +MODULE_DESCRIPTION("HID Sensor Accel 3D");
> +MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>");
> +MODULE_LICENSE("GPL");
^ permalink raw reply [flat|nested] 21+ messages in thread* RE: [PATCH, 3/6] HID-Sensors: Added accelerometer 3D
2012-06-27 9:11 ` Lars-Peter Clausen
@ 2012-06-27 15:28 ` Pandruvada, Srinivas
[not found] ` <4FA419E87744DF4DAECD5BCE1214B7A91933F4DA-P5GAC/sN6hk64kNsxIetb7fspsVTdybXVpNB7YpNyf8@public.gmane.org>
0 siblings, 1 reply; 21+ messages in thread
From: Pandruvada, Srinivas @ 2012-06-27 15:28 UTC (permalink / raw)
To: Lars-Peter Clausen
Cc: linux-iio@vger.kernel.org, jic23.cam.ac.uk@vger.kernel.org,
jkosina@suse.cz, linux-input@vger.kernel.org
Hi,
Thanks for the comments.
<IIO has moved out of staging in 3.5, so this won't build with the latest upstream>
Can you please let me know which tree it is merged? I don't see in Linus's tree. I can see in gregkh/staging.git. But don't see your latest changes.
<The trigger code looks pretty similar in all your IIO drivers, maybe it makes sense to put this into a common module.>
I had this separate before, but once I had to move each driver to its sensor type directory, I merged it. I like to have common module for this. Where are the common modules go in iio directory?
Thanks,
Srinivas
-----Original Message-----
From: Lars-Peter Clausen [mailto:lars@metafoo.de]
Sent: Wednesday, June 27, 2012 2:12 AM
To: Pandruvada, Srinivas
Cc: linux-iio@vger.kernel.org; jic23.cam.ac.uk@vger.kernel.org; jkosina@suse.cz; linux-input@vger.kernel.org
Subject: Re: [PATCH, 3/6] HID-Sensors: Added accelerometer 3D
On 06/26/2012 02:54 AM, srinivas pandruvada wrote:
> Added usage id processing for Accelrometer 3D. This uses IIO
> interfaces for triggerred buffer to present data to user mode.This
> uses HID sensor framework for registering callback events from the
> sensor hub.
Hi,
Some comments inline, similar comments also apply for the other IIO drivers in this series.
> [...]
> diff --git a/drivers/staging/iio/accel/hid-sensor-accel-3d.c
> b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
> new file mode 100644
> index 0000000..77d4663
> --- /dev/null
> +++ b/drivers/staging/iio/accel/hid-sensor-accel-3d.c
> @@ -0,0 +1,537 @@
> [...]
> +#include <linux/device.h>
> +#include <linux/platform_device.h>
> +#include <linux/module.h>
> +#include <linux/interrupt.h>
> +#include <linux/irq.h>
> +#include <linux/slab.h>
> +#include <linux/hid-sensor-hub.h>
> +#include "../iio.h"
> +#include "../sysfs.h"
> +#include "../trigger.h"
> +#include "../kfifo_buf.h"
> +#include "../trigger_consumer.h"
> +#include "../triggered_buffer.h"
IIO has moved out of staging in 3.5, so this wont build with the latest upstream.
> +
> +/*Format: HID-SENSOR-usage_id_in_hex*/ #define DRIVER_NAME
> +"HID-SENSOR-200073"
> +
> +#define CHANNEL_SCAN_INDEX_X 0
> +#define CHANNEL_SCAN_INDEX_Y 1
> +#define CHANNEL_SCAN_INDEX_Z 2
> +
> +struct accel_3d_sample {
> + u32 accel_x;
> + u32 accel_y;
> + u32 accel_z;
> +} __packed;
> +
> +struct accel_3d_state {
> + struct hid_sensor_hub_device *hsdev;
> + struct platform_device *pdev;
> + struct hid_sensor_common_attributes *common_attrb;
> + struct hid_sensor_hub_attribute_info accel_x;
> + struct hid_sensor_hub_attribute_info accel_y;
> + struct hid_sensor_hub_attribute_info accel_z;
> + struct accel_3d_sample accel_sample_data;
> + bool data_ready;
> +};
> +
> +static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
> + bool state)
> +{
> + struct iio_dev *indio_dev = trig->private_data;
> + struct accel_3d_state *st = iio_priv(indio_dev);
> + int state_val;
> + char buffer[16];
> +
> + dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
> + state);
> + st->data_ready = state;
> + state_val = state ? 1 : 0;
> + sprintf(buffer, "%d", state_val);
> + hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
> + hid_sensor_write_power_state(st->common_attrb, strlen(buffer),
> +buffer);
This looks kind of odd, passing a integer by using a string.
> +
> + return 0;
> +}
> +
> +void hid_sensor_remove_trigger(struct iio_dev *indio_dev) {
> + iio_trigger_unregister(indio_dev->trig);
> + iio_free_trigger(indio_dev->trig);
> +}
> +
> +static const struct iio_trigger_ops hid_sensor_trigger_ops = {
> + .owner = THIS_MODULE,
> + .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
> +};
> +
> +int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name) {
> + int ret;
> + struct iio_trigger *trig;
> +
> + trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
> + if (trig == NULL) {
> + ret = -ENOMEM;
> + goto error_ret;
> + }
> +
> + trig->dev.parent = indio_dev->dev.parent;
> + trig->private_data = (void *)indio_dev;
> + trig->ops = &hid_sensor_trigger_ops;
> + ret = iio_trigger_register(trig);
> +
> + /* select default trigger */
> + indio_dev->trig = trig;
> + if (ret)
> + goto error_free_trig;
> +
> + return ret;
> +
> +error_free_trig:
> + iio_free_trigger(trig);
> +error_ret:
> + return ret;
> +}
> +
The trigger code looks pretty similar in all your IIO drivers, maybe it makes sense to put this into a common module.
> +static struct iio_chan_spec accel_3d_channels[] = {
> + {
> + .type = IIO_ACCEL,
> + .modified = 1,
> + .channel2 = IIO_MOD_X,
> + .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
> + IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .scan_index = CHANNEL_SCAN_INDEX_X,
> + }, {
> + .type = IIO_ACCEL,
> + .modified = 1,
> + .channel2 = IIO_MOD_Y,
> + .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
> + IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .scan_index = CHANNEL_SCAN_INDEX_Y,
> + }, {
> + .type = IIO_ACCEL,
> + .modified = 1,
> + .channel2 = IIO_MOD_Z,
> + .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
> + IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .scan_index = CHANNEL_SCAN_INDEX_Z,
> + }
> +};
> +
> +static void accel_3d_adjust_channel_bit_mask(int channel, int size) {
> + accel_3d_channels[channel].scan_type.sign = 's';
> + accel_3d_channels[channel].scan_type.realbits = size * 8;
> + accel_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
I would this expect to fail badly if there were two devices with different specs registered at the same time.
> +}
> +
> +static int accel_3d_read_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int *val, int *val2,
> + long mask)
> +{
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> + int report_id = -1;
> + u32 address;
> +
> + *val = 0;
> + *val2 = 0;
> + switch (mask) {
> + case 0:
> + switch (chan->scan_index) {
> + case CHANNEL_SCAN_INDEX_X:
> + report_id = accel_state->accel_x.report_id;
> + address =
> + HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS;
> + break;
> + case CHANNEL_SCAN_INDEX_Y:
> + report_id = accel_state->accel_y.report_id;
> + address =
> + HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS;
> + break;
> + case CHANNEL_SCAN_INDEX_Z:
> + report_id = accel_state->accel_z.report_id;
> + address =
> + HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS;
> + break;
> + default:
> + report_id = -1;
> + break;
> + }
> + if (report_id >= 0)
> + *val = sensor_hub_input_attr_get_raw_value(
> + accel_state->hsdev,
> + HID_USAGE_SENSOR_ACCEL_3D, address,
> + report_id);
> + else
> + *val = 0;
> + break;
> + case IIO_CHAN_INFO_SCALE:
> + *val = accel_state->accel_x.units;
> + break;
> + case IIO_CHAN_INFO_OFFSET:
> + *val = accel_state->accel_x.unit_expo;
> + break;
> + default:
> + break;
> + }
> + return IIO_VAL_INT;
> +}
> +
> +static int accel_3d_write_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int val,
> + int val2,
> + long mask)
> +{
> + dev_err(&indio_dev->dev, "%s\n", __func__);
> + return 0;
> +}
If you don't want to do anything here just don't set the callback in the iio_info struct.
> +
> +static ssize_t hid_sensor_accel_3d_read_hyst_raw(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + int len;
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> + len = hid_sensor_read_hyst_raw(accel_state->common_attrb, strlen(buf),
> + buf);
> + return len;
> +}
> +
> +static ssize_t hid_sensor_accel_3d_write_hyst_raw(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> + return hid_sensor_write_hyst_raw(accel_state->common_attrb,
> + strlen(buf), buf);
> +}
> +
> +static ssize_t hid_sensor_read_accel_3d_samp_freq(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> +
> + return hid_sensor_read_samp_freq(accel_state->common_attrb,
> + strlen(buf), buf);
This doesn't make sense, buf is empty at this point, so a strlen will return 0.
> +}
> +
> +static ssize_t hid_sensor_write_accel_3d_samp_freq(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct accel_3d_state *accel_state = iio_priv(indio_dev);
> +
> + return hid_sensor_write_samp_freq(accel_state->common_attrb,
> + strlen(buf), buf);
> +}
> +
> +static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
> + hid_sensor_read_accel_3d_samp_freq,
> + hid_sensor_write_accel_3d_samp_freq);
> +
> +#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
> + IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
> +
> +static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
> + hid_sensor_accel_3d_read_hyst_raw,
> + hid_sensor_accel_3d_write_hyst_raw,
> + HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
> +
> +static struct attribute *accel_3d_attributes[] = {
> + /* common attributes */
> + &iio_dev_attr_sampling_frequency.dev_attr.attr,
> + &iio_dev_attr_hyst_raw.dev_attr.attr,
> + NULL,
> +};
> +
> +static const struct attribute_group accel_3d_attribute_group = {
> + .attrs = accel_3d_attributes,
> +};
> +
> +static const struct iio_info accel_3d_info = {
> + .attrs = &accel_3d_attribute_group,
> + .driver_module = THIS_MODULE,
> + .read_raw = &accel_3d_read_raw,
> + .write_raw = &accel_3d_write_raw,
> +};
> +
> +void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int
> +len) {
> + struct iio_buffer *buffer = indio_dev->buffer;
> + s64 timestamp = iio_get_time_ns();
> + int datum_sz;
> +
> + if (!buffer)
> + return;
> + datum_sz = buffer->access->get_bytes_per_datum(buffer);
> + if (len > datum_sz) {
> + dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
> + datum_sz);
> + return;
> + }
> + buffer->access->store_to(buffer, (u8 *)data, timestamp); }
> +
> +static irqreturn_t hid_sensor_trigger_handler(int irq, void *p) {
> + return IRQ_HANDLED;
> +}
If you don't want to do anything here just pass NULL to iio_triggered_buffer_setup.
> [...]
> +static int __init hid_accel_3d_init(void) {
> + return platform_driver_register(&hid_accel_3d_platform_driver);
> +}
> +
> +static void __exit hid_accel_3d_exit(void) {
> + platform_driver_unregister(&hid_accel_3d_platform_driver);
> +}
> +
> +module_init(hid_accel_3d_init);
> +module_exit(hid_accel_3d_exit);
module_platform_driver(hid_accel_3d_platform_driver);
> +
> +MODULE_DESCRIPTION("HID Sensor Accel 3D"); MODULE_AUTHOR("Srinivas
> +Pandruvada <srinivas.pandruvada@intel.com>");
> +MODULE_LICENSE("GPL");
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH, 4/6] HID-Sensors: Added Gyroscope 3D
2012-06-26 0:54 [PATCH, 0/6] HID-Sensors v3 srinivas pandruvada
@ 2012-06-26 0:54 ` srinivas pandruvada
2012-06-26 0:54 ` [PATCH, 5/6] HID-Sensors: Added Compass 3D srinivas pandruvada
2012-06-26 12:03 ` [PATCH, 0/6] HID-Sensors v3 Jiri Kosina
2 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio-u79uwXL29TY76Z2rM5mHXA
Cc: jic23.cam.ac.uk-u79uwXL29TY76Z2rM5mHXA, jkosina-AlSwsSmVLrQ,
linux-input-u79uwXL29TY76Z2rM5mHXA, srinivas pandruvada
Added usage id processing for Gyroscope 3D. This uses IIO
interfaces for triggerred buffer to present data to user
mode.This uses HID sensor framework for registering callback
events from the sensor hub.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/staging/iio/gyro/Kconfig | 10 +
drivers/staging/iio/gyro/Makefile | 3 +
drivers/staging/iio/gyro/hid-sensor-gyro-3d.c | 537 +++++++++++++++++++++++++
3 files changed, 550 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/iio/gyro/hid-sensor-gyro-3d.c
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index ea295b2..7744b1d 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -46,4 +46,14 @@ config ADXRS450
This driver can also be built as a module. If so, the module
will be called adxrs450.
+config HID_SENSOR_GYRO_3D
+ depends on HID_SENSOR_HUB
+ select IIO_BUFFER
+ select IIO_TRIGGER
+ select IIO_TRIGGERED_BUFFER
+ tristate "HID Gyroscope 3D"
+ help
+ Say yes here to build support for the HID SENSOR
+ Gyroscope-3D.
+
endmenu
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
index 9ba5ec1..fa24d34 100644
--- a/drivers/staging/iio/gyro/Makefile
+++ b/drivers/staging/iio/gyro/Makefile
@@ -20,3 +20,6 @@ obj-$(CONFIG_ADIS16251) += adis16251.o
adxrs450-y := adxrs450_core.o
obj-$(CONFIG_ADXRS450) += adxrs450.o
+
+hid-sensor-gyro-3d-drv-y := hid-sensor-gyro-3d.o
+obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d-drv.o
diff --git a/drivers/staging/iio/gyro/hid-sensor-gyro-3d.c b/drivers/staging/iio/gyro/hid-sensor-gyro-3d.c
new file mode 100644
index 0000000..5dddf6f
--- /dev/null
+++ b/drivers/staging/iio/gyro/hid-sensor-gyro-3d.c
@@ -0,0 +1,537 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/hid-sensor-hub.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "../kfifo_buf.h"
+#include "../trigger_consumer.h"
+#include "../triggered_buffer.h"
+
+/*Format: HID-SENSOR-usage_id_in_hex*/
+#define DRIVER_NAME "HID-SENSOR-200076"
+
+#define CHANNEL_SCAN_INDEX_X 0
+#define CHANNEL_SCAN_INDEX_Y 1
+#define CHANNEL_SCAN_INDEX_Z 2
+
+struct gyro_3d_sample {
+ u32 gyro_x;
+ u32 gyro_y;
+ u32 gyro_z;
+} __packed;
+
+struct gyro_3d_state {
+ struct hid_sensor_hub_device *hsdev;
+ struct platform_device *pdev;
+ struct hid_sensor_common_attributes *common_attrb;
+ struct hid_sensor_hub_attribute_info gyro_x;
+ struct hid_sensor_hub_attribute_info gyro_y;
+ struct hid_sensor_hub_attribute_info gyro_z;
+ struct gyro_3d_sample gyro_sample_data;
+ bool data_ready;
+};
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct gyro_3d_state *st = iio_priv(indio_dev);
+ int state_val;
+ char buffer[16];
+
+ dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
+ state);
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ sprintf(buffer, "%d", state_val);
+ hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
+ hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
+
+ return 0;
+}
+
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
+{
+ iio_trigger_unregister(indio_dev->trig);
+ iio_free_trigger(indio_dev->trig);
+}
+
+static const struct iio_trigger_ops hid_sensor_trigger_ops = {
+ .owner = THIS_MODULE,
+ .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
+};
+
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
+{
+ int ret;
+ struct iio_trigger *trig;
+
+ trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
+ if (trig == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ trig->dev.parent = indio_dev->dev.parent;
+ trig->private_data = (void *)indio_dev;
+ trig->ops = &hid_sensor_trigger_ops;
+ ret = iio_trigger_register(trig);
+
+ /* select default trigger */
+ indio_dev->trig = trig;
+ if (ret)
+ goto error_free_trig;
+
+ return ret;
+
+error_free_trig:
+ iio_free_trigger(trig);
+error_ret:
+ return ret;
+}
+
+static struct iio_chan_spec gyro_3d_channels[] = {
+ {
+ .type = IIO_ANGL_VEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_X,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_X,
+ }, {
+ .type = IIO_ANGL_VEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Y,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Y,
+ }, {
+ .type = IIO_ANGL_VEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Z,
+ }
+};
+
+static void gyro_3d_adjust_channel_bit_mask(int channel, int size)
+{
+ gyro_3d_channels[channel].scan_type.sign = 's';
+ gyro_3d_channels[channel].scan_type.realbits = size * 8;
+ gyro_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int gyro_3d_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+ int report_id = -1;
+ u32 address;
+
+ *val = 0;
+ *val2 = 0;
+ switch (mask) {
+ case 0:
+ switch (chan->scan_index) {
+ case CHANNEL_SCAN_INDEX_X:
+ report_id = gyro_state->gyro_x.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Y:
+ report_id = gyro_state->gyro_y.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Z:
+ report_id = gyro_state->gyro_z.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(
+ gyro_state->hsdev,
+ HID_USAGE_SENSOR_GYRO_3D, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = gyro_state->gyro_x.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = gyro_state->gyro_x.unit_expo;
+ break;
+ default:
+ break;
+ }
+ return IIO_VAL_INT;
+}
+
+static int gyro_3d_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ dev_err(&indio_dev->dev, "%s\n", __func__);
+ return 0;
+}
+
+static ssize_t hid_sensor_gyro_3d_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int len;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+ len = hid_sensor_read_hyst_raw(gyro_state->common_attrb, strlen(buf),
+ buf);
+ return len;
+}
+
+static ssize_t hid_sensor_gyro_3d_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+ return hid_sensor_write_hyst_raw(gyro_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_read_gyro_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ return hid_sensor_read_samp_freq(gyro_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_write_gyro_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ return hid_sensor_write_samp_freq(gyro_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_gyro_3d_samp_freq,
+ hid_sensor_write_gyro_3d_samp_freq);
+
+#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
+ hid_sensor_gyro_3d_read_hyst_raw,
+ hid_sensor_gyro_3d_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+static struct attribute *gyro_3d_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_dev_attr_hyst_raw.dev_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group gyro_3d_attribute_group = {
+ .attrs = gyro_3d_attributes,
+};
+
+static const struct iio_info gyro_3d_info = {
+ .attrs = &gyro_3d_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &gyro_3d_read_raw,
+ .write_raw = &gyro_3d_write_raw,
+};
+
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
+{
+ struct iio_buffer *buffer = indio_dev->buffer;
+ s64 timestamp = iio_get_time_ns();
+ int datum_sz;
+
+ if (!buffer)
+ return;
+ datum_sz = buffer->access->get_bytes_per_datum(buffer);
+ if (len > datum_sz) {
+ dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
+ datum_sz);
+ return;
+ }
+ buffer->access->store_to(buffer, (u8 *)data, timestamp);
+}
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+int gyro_3d_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ dev_dbg(&indio_dev->dev, "gyro_3d_proc_event\n");
+ if (gyro_state->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&gyro_state->gyro_sample_data,
+ sizeof(struct gyro_3d_sample));
+ return 0;
+}
+
+/* Capture samples in local storage */
+int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ size_t raw_len, char *raw_data,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS:
+ gyro_state->gyro_sample_data.gyro_x =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS:
+ gyro_state->gyro_sample_data.gyro_y =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS:
+ gyro_state->gyro_sample_data.gyro_z =
+ *(u32 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int gyro_3d_parse_report(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ struct gyro_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS,
+ &st->gyro_x);
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->gyro_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS,
+ &st->gyro_y);
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->gyro_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS,
+ &st->gyro_z);
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->gyro_z.size);
+
+ dev_dbg(&st->pdev->dev, "gyro_3d %x:%x, %x:%x, %x:%x\n",
+ st->gyro_x.index,
+ st->gyro_x.report_id,
+ st->gyro_y.index, st->gyro_y.report_id,
+ st->gyro_z.index, st->gyro_z.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int gyro_3d_init(struct platform_device *pdev,
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id)
+{
+ int ret = 0;
+ static char *name = "gyro_3d";
+ struct iio_dev *indio_dev;
+ struct gyro_3d_state *gyro_state;
+
+ indio_dev = iio_allocate_device(sizeof(struct gyro_3d_state));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+ platform_set_drvdata(pdev, indio_dev);
+ gyro_state = iio_priv(indio_dev);
+ gyro_state->hsdev = hsdev;
+ gyro_state->pdev = pdev;
+ gyro_state->common_attrb = sensor_hub_allocate_common_attributes(
+ hsdev, HID_USAGE_SENSOR_GYRO_3D);
+ if (gyro_state->common_attrb == NULL) {
+ ret = -ENOMEM;
+ goto error_free_dev;
+ }
+
+ ret = gyro_3d_parse_report(hsdev, usage_id, gyro_state);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = gyro_3d_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(gyro_3d_channels);
+ indio_dev->dev.parent = &pdev->dev;
+ indio_dev->info = &gyro_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler, NULL);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
+ goto error_free_dev;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_X);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Y);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Z);
+ gyro_state->data_ready = false;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "trigger setup failed\n");
+ goto error_unreg_buffer_funcs;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ dev_err(&pdev->dev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_unreg_buffer_funcs:
+ iio_triggered_buffer_cleanup(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_ret:
+ return ret;
+}
+
+static int gyro_3d_exit(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+ struct gyro_3d_state *st = iio_priv(indio_dev);
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ sensor_hub_free_common_attributes(st->common_attrb);
+ iio_free_device(indio_dev);
+ return ret;
+}
+
+static struct hid_sensor_hub_callbacks gyro_3d_callbacks = {
+ .send_event = gyro_3d_proc_event,
+ .capture_sample = gyro_3d_capture_sample,
+};
+
+static int __devinit hid_gyro_3d_probe(struct platform_device *pdev)
+{
+ int ret;
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ ret = gyro_3d_init(pdev, hsdev, HID_USAGE_SENSOR_GYRO_3D);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "gyro_3d_init failed\n");
+ return ret;
+ }
+ gyro_3d_callbacks.pdev = pdev;
+ ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D,
+ &gyro_3d_callbacks);
+ return 0;
+}
+
+static int __devinit hid_gyro_3d_remove(struct platform_device *pdev)
+{
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ gyro_3d_exit(pdev);
+ return sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D);
+}
+
+static struct platform_driver hid_gyro_3d_platform_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = hid_gyro_3d_probe,
+ .remove = hid_gyro_3d_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init hid_gyro_3d_init(void)
+{
+ return platform_driver_register(&hid_gyro_3d_platform_driver);
+}
+
+static void __exit hid_gyro_3d_exit(void)
+{
+ platform_driver_unregister(&hid_gyro_3d_platform_driver);
+}
+
+module_init(hid_gyro_3d_init);
+module_exit(hid_gyro_3d_exit);
+
+MODULE_DESCRIPTION("HID Sensor Gyroscope 3D");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>");
+MODULE_LICENSE("GPL");
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH, 4/6] HID-Sensors: Added Gyroscope 3D
@ 2012-06-26 0:54 ` srinivas pandruvada
0 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio; +Cc: jic23.cam.ac.uk, jkosina, linux-input, srinivas pandruvada
Added usage id processing for Gyroscope 3D. This uses IIO
interfaces for triggerred buffer to present data to user
mode.This uses HID sensor framework for registering callback
events from the sensor hub.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/iio/gyro/Kconfig | 10 +
drivers/staging/iio/gyro/Makefile | 3 +
drivers/staging/iio/gyro/hid-sensor-gyro-3d.c | 537 +++++++++++++++++++++++++
3 files changed, 550 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/iio/gyro/hid-sensor-gyro-3d.c
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index ea295b2..7744b1d 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -46,4 +46,14 @@ config ADXRS450
This driver can also be built as a module. If so, the module
will be called adxrs450.
+config HID_SENSOR_GYRO_3D
+ depends on HID_SENSOR_HUB
+ select IIO_BUFFER
+ select IIO_TRIGGER
+ select IIO_TRIGGERED_BUFFER
+ tristate "HID Gyroscope 3D"
+ help
+ Say yes here to build support for the HID SENSOR
+ Gyroscope-3D.
+
endmenu
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
index 9ba5ec1..fa24d34 100644
--- a/drivers/staging/iio/gyro/Makefile
+++ b/drivers/staging/iio/gyro/Makefile
@@ -20,3 +20,6 @@ obj-$(CONFIG_ADIS16251) += adis16251.o
adxrs450-y := adxrs450_core.o
obj-$(CONFIG_ADXRS450) += adxrs450.o
+
+hid-sensor-gyro-3d-drv-y := hid-sensor-gyro-3d.o
+obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d-drv.o
diff --git a/drivers/staging/iio/gyro/hid-sensor-gyro-3d.c b/drivers/staging/iio/gyro/hid-sensor-gyro-3d.c
new file mode 100644
index 0000000..5dddf6f
--- /dev/null
+++ b/drivers/staging/iio/gyro/hid-sensor-gyro-3d.c
@@ -0,0 +1,537 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/hid-sensor-hub.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "../kfifo_buf.h"
+#include "../trigger_consumer.h"
+#include "../triggered_buffer.h"
+
+/*Format: HID-SENSOR-usage_id_in_hex*/
+#define DRIVER_NAME "HID-SENSOR-200076"
+
+#define CHANNEL_SCAN_INDEX_X 0
+#define CHANNEL_SCAN_INDEX_Y 1
+#define CHANNEL_SCAN_INDEX_Z 2
+
+struct gyro_3d_sample {
+ u32 gyro_x;
+ u32 gyro_y;
+ u32 gyro_z;
+} __packed;
+
+struct gyro_3d_state {
+ struct hid_sensor_hub_device *hsdev;
+ struct platform_device *pdev;
+ struct hid_sensor_common_attributes *common_attrb;
+ struct hid_sensor_hub_attribute_info gyro_x;
+ struct hid_sensor_hub_attribute_info gyro_y;
+ struct hid_sensor_hub_attribute_info gyro_z;
+ struct gyro_3d_sample gyro_sample_data;
+ bool data_ready;
+};
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct gyro_3d_state *st = iio_priv(indio_dev);
+ int state_val;
+ char buffer[16];
+
+ dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
+ state);
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ sprintf(buffer, "%d", state_val);
+ hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
+ hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
+
+ return 0;
+}
+
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
+{
+ iio_trigger_unregister(indio_dev->trig);
+ iio_free_trigger(indio_dev->trig);
+}
+
+static const struct iio_trigger_ops hid_sensor_trigger_ops = {
+ .owner = THIS_MODULE,
+ .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
+};
+
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
+{
+ int ret;
+ struct iio_trigger *trig;
+
+ trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
+ if (trig == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ trig->dev.parent = indio_dev->dev.parent;
+ trig->private_data = (void *)indio_dev;
+ trig->ops = &hid_sensor_trigger_ops;
+ ret = iio_trigger_register(trig);
+
+ /* select default trigger */
+ indio_dev->trig = trig;
+ if (ret)
+ goto error_free_trig;
+
+ return ret;
+
+error_free_trig:
+ iio_free_trigger(trig);
+error_ret:
+ return ret;
+}
+
+static struct iio_chan_spec gyro_3d_channels[] = {
+ {
+ .type = IIO_ANGL_VEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_X,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_X,
+ }, {
+ .type = IIO_ANGL_VEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Y,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Y,
+ }, {
+ .type = IIO_ANGL_VEL,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_Z,
+ }
+};
+
+static void gyro_3d_adjust_channel_bit_mask(int channel, int size)
+{
+ gyro_3d_channels[channel].scan_type.sign = 's';
+ gyro_3d_channels[channel].scan_type.realbits = size * 8;
+ gyro_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int gyro_3d_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+ int report_id = -1;
+ u32 address;
+
+ *val = 0;
+ *val2 = 0;
+ switch (mask) {
+ case 0:
+ switch (chan->scan_index) {
+ case CHANNEL_SCAN_INDEX_X:
+ report_id = gyro_state->gyro_x.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Y:
+ report_id = gyro_state->gyro_y.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Z:
+ report_id = gyro_state->gyro_z.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(
+ gyro_state->hsdev,
+ HID_USAGE_SENSOR_GYRO_3D, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = gyro_state->gyro_x.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = gyro_state->gyro_x.unit_expo;
+ break;
+ default:
+ break;
+ }
+ return IIO_VAL_INT;
+}
+
+static int gyro_3d_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ dev_err(&indio_dev->dev, "%s\n", __func__);
+ return 0;
+}
+
+static ssize_t hid_sensor_gyro_3d_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int len;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+ len = hid_sensor_read_hyst_raw(gyro_state->common_attrb, strlen(buf),
+ buf);
+ return len;
+}
+
+static ssize_t hid_sensor_gyro_3d_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+ return hid_sensor_write_hyst_raw(gyro_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_read_gyro_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ return hid_sensor_read_samp_freq(gyro_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_write_gyro_3d_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ return hid_sensor_write_samp_freq(gyro_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_gyro_3d_samp_freq,
+ hid_sensor_write_gyro_3d_samp_freq);
+
+#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
+ hid_sensor_gyro_3d_read_hyst_raw,
+ hid_sensor_gyro_3d_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+static struct attribute *gyro_3d_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_dev_attr_hyst_raw.dev_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group gyro_3d_attribute_group = {
+ .attrs = gyro_3d_attributes,
+};
+
+static const struct iio_info gyro_3d_info = {
+ .attrs = &gyro_3d_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &gyro_3d_read_raw,
+ .write_raw = &gyro_3d_write_raw,
+};
+
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
+{
+ struct iio_buffer *buffer = indio_dev->buffer;
+ s64 timestamp = iio_get_time_ns();
+ int datum_sz;
+
+ if (!buffer)
+ return;
+ datum_sz = buffer->access->get_bytes_per_datum(buffer);
+ if (len > datum_sz) {
+ dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
+ datum_sz);
+ return;
+ }
+ buffer->access->store_to(buffer, (u8 *)data, timestamp);
+}
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+int gyro_3d_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ dev_dbg(&indio_dev->dev, "gyro_3d_proc_event\n");
+ if (gyro_state->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&gyro_state->gyro_sample_data,
+ sizeof(struct gyro_3d_sample));
+ return 0;
+}
+
+/* Capture samples in local storage */
+int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ size_t raw_len, char *raw_data,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS:
+ gyro_state->gyro_sample_data.gyro_x =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS:
+ gyro_state->gyro_sample_data.gyro_y =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS:
+ gyro_state->gyro_sample_data.gyro_z =
+ *(u32 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int gyro_3d_parse_report(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ struct gyro_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS,
+ &st->gyro_x);
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->gyro_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS,
+ &st->gyro_y);
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->gyro_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS,
+ &st->gyro_z);
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->gyro_z.size);
+
+ dev_dbg(&st->pdev->dev, "gyro_3d %x:%x, %x:%x, %x:%x\n",
+ st->gyro_x.index,
+ st->gyro_x.report_id,
+ st->gyro_y.index, st->gyro_y.report_id,
+ st->gyro_z.index, st->gyro_z.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int gyro_3d_init(struct platform_device *pdev,
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id)
+{
+ int ret = 0;
+ static char *name = "gyro_3d";
+ struct iio_dev *indio_dev;
+ struct gyro_3d_state *gyro_state;
+
+ indio_dev = iio_allocate_device(sizeof(struct gyro_3d_state));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+ platform_set_drvdata(pdev, indio_dev);
+ gyro_state = iio_priv(indio_dev);
+ gyro_state->hsdev = hsdev;
+ gyro_state->pdev = pdev;
+ gyro_state->common_attrb = sensor_hub_allocate_common_attributes(
+ hsdev, HID_USAGE_SENSOR_GYRO_3D);
+ if (gyro_state->common_attrb == NULL) {
+ ret = -ENOMEM;
+ goto error_free_dev;
+ }
+
+ ret = gyro_3d_parse_report(hsdev, usage_id, gyro_state);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = gyro_3d_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(gyro_3d_channels);
+ indio_dev->dev.parent = &pdev->dev;
+ indio_dev->info = &gyro_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler, NULL);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
+ goto error_free_dev;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_X);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Y);
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_Z);
+ gyro_state->data_ready = false;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "trigger setup failed\n");
+ goto error_unreg_buffer_funcs;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ dev_err(&pdev->dev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_unreg_buffer_funcs:
+ iio_triggered_buffer_cleanup(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_ret:
+ return ret;
+}
+
+static int gyro_3d_exit(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+ struct gyro_3d_state *st = iio_priv(indio_dev);
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ sensor_hub_free_common_attributes(st->common_attrb);
+ iio_free_device(indio_dev);
+ return ret;
+}
+
+static struct hid_sensor_hub_callbacks gyro_3d_callbacks = {
+ .send_event = gyro_3d_proc_event,
+ .capture_sample = gyro_3d_capture_sample,
+};
+
+static int __devinit hid_gyro_3d_probe(struct platform_device *pdev)
+{
+ int ret;
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ ret = gyro_3d_init(pdev, hsdev, HID_USAGE_SENSOR_GYRO_3D);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "gyro_3d_init failed\n");
+ return ret;
+ }
+ gyro_3d_callbacks.pdev = pdev;
+ ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D,
+ &gyro_3d_callbacks);
+ return 0;
+}
+
+static int __devinit hid_gyro_3d_remove(struct platform_device *pdev)
+{
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ gyro_3d_exit(pdev);
+ return sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D);
+}
+
+static struct platform_driver hid_gyro_3d_platform_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = hid_gyro_3d_probe,
+ .remove = hid_gyro_3d_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init hid_gyro_3d_init(void)
+{
+ return platform_driver_register(&hid_gyro_3d_platform_driver);
+}
+
+static void __exit hid_gyro_3d_exit(void)
+{
+ platform_driver_unregister(&hid_gyro_3d_platform_driver);
+}
+
+module_init(hid_gyro_3d_init);
+module_exit(hid_gyro_3d_exit);
+
+MODULE_DESCRIPTION("HID Sensor Gyroscope 3D");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>");
+MODULE_LICENSE("GPL");
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH, 6/6] HID-Sensors: Added ALS
2012-06-26 0:54 [PATCH, 0/6] HID-Sensors v3 srinivas pandruvada
@ 2012-06-26 0:54 ` srinivas pandruvada
2012-06-26 0:54 ` [PATCH, 5/6] HID-Sensors: Added Compass 3D srinivas pandruvada
2012-06-26 12:03 ` [PATCH, 0/6] HID-Sensors v3 Jiri Kosina
2 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio-u79uwXL29TY76Z2rM5mHXA
Cc: jic23.cam.ac.uk-u79uwXL29TY76Z2rM5mHXA, jkosina-AlSwsSmVLrQ,
linux-input-u79uwXL29TY76Z2rM5mHXA, srinivas pandruvada
Added usage id processing for ALS. This uses IIO
interfaces for triggerred buffer to present data to user
mode.This uses HID sensor framework for registering callback
events from the sensor hub.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/staging/iio/light/Kconfig | 10 +
drivers/staging/iio/light/Makefile | 2 +
drivers/staging/iio/light/hid-sensor-als.c | 478 ++++++++++++++++++++++++++++
3 files changed, 490 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/iio/light/hid-sensor-als.c
diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index e7e9159..59e4745 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -31,4 +31,14 @@ config TSL2583
Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.
Access ALS data via iio, sysfs.
+config HID_SENSOR_ALS
+ depends on HID_SENSOR_HUB
+ select IIO_BUFFER
+ select IIO_TRIGGER
+ select IIO_TRIGGERED_BUFFER
+ tristate "HID Ambient Light Sensor"
+ help
+ Say yes here to build support for the HID SENSOR
+ ALS.
+
endmenu
diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 3011fbf..9b90d84 100644
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -5,3 +5,5 @@
obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o
obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
obj-$(CONFIG_TSL2583) += tsl2583.o
+hid-sensor-als-drv-y := hid-sensor-als.o
+obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als-drv.o
diff --git a/drivers/staging/iio/light/hid-sensor-als.c b/drivers/staging/iio/light/hid-sensor-als.c
new file mode 100644
index 0000000..cfcda5d
--- /dev/null
+++ b/drivers/staging/iio/light/hid-sensor-als.c
@@ -0,0 +1,478 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/hid-sensor-hub.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "../kfifo_buf.h"
+#include "../trigger_consumer.h"
+#include "../triggered_buffer.h"
+
+/*Format: HID-SENSOR-usage_id_in_hex*/
+#define DRIVER_NAME "HID-SENSOR-200041"
+
+#define CHANNEL_SCAN_INDEX_ILLUM 0
+
+struct als_sample {
+ u16 illum;
+};
+
+struct als_state {
+ struct hid_sensor_hub_device *hsdev;
+ struct platform_device *pdev;
+ struct hid_sensor_common_attributes *common_attrb;
+ struct hid_sensor_hub_attribute_info als_illum;
+ struct als_sample als_sample_data;
+ bool data_ready;
+};
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct als_state *st = iio_priv(indio_dev);
+ int state_val;
+ char buffer[16];
+
+ dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
+ state);
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ sprintf(buffer, "%d", state_val);
+ hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
+ hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
+
+ return 0;
+}
+
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
+{
+ iio_trigger_unregister(indio_dev->trig);
+ iio_free_trigger(indio_dev->trig);
+}
+
+static const struct iio_trigger_ops hid_sensor_trigger_ops = {
+ .owner = THIS_MODULE,
+ .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
+};
+
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
+{
+ int ret;
+ struct iio_trigger *trig;
+
+ trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
+ if (trig == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ trig->dev.parent = indio_dev->dev.parent;
+ trig->private_data = (void *)indio_dev;
+ trig->ops = &hid_sensor_trigger_ops;
+ ret = iio_trigger_register(trig);
+
+ /* select default trigger */
+ indio_dev->trig = trig;
+ if (ret)
+ goto error_free_trig;
+
+ return ret;
+
+error_free_trig:
+ iio_free_trigger(trig);
+error_ret:
+ return ret;
+}
+
+static struct iio_chan_spec als_channels[] = {
+ {
+ .type = IIO_INTENSITY,
+ .modified = 1,
+ .channel2 = IIO_MOD_LIGHT_BOTH,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_ILLUM,
+ }
+};
+
+static void als_adjust_channel_bit_mask(int channel, int size)
+{
+ als_channels[channel].scan_type.sign = 's';
+ als_channels[channel].scan_type.realbits = size * 8;
+ als_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int als_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct als_state *als_state = iio_priv(indio_dev);
+ int report_id = -1;
+ u32 address;
+
+ *val = 0;
+ *val2 = 0;
+ switch (mask) {
+ case 0:
+ switch (chan->scan_index) {
+ case CHANNEL_SCAN_INDEX_ILLUM:
+ report_id = als_state->als_illum.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(
+ als_state->hsdev,
+ HID_USAGE_SENSOR_ALS, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = als_state->als_illum.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = als_state->als_illum.unit_expo;
+ break;
+ default:
+ break;
+ }
+ return IIO_VAL_INT;
+}
+
+static int als_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ dev_err(&indio_dev->dev, "%s\n", __func__);
+ return 0;
+}
+
+static ssize_t hid_sensor_als_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int len;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+ len = hid_sensor_read_hyst_raw(als_state->common_attrb, strlen(buf),
+ buf);
+ return len;
+}
+
+static ssize_t hid_sensor_als_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+ return hid_sensor_write_hyst_raw(als_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_read_als_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ return hid_sensor_read_samp_freq(als_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_write_als_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ return hid_sensor_write_samp_freq(als_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_als_samp_freq,
+ hid_sensor_write_als_samp_freq);
+
+#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
+ hid_sensor_als_read_hyst_raw,
+ hid_sensor_als_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+static struct attribute *als_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_dev_attr_hyst_raw.dev_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group als_attribute_group = {
+ .attrs = als_attributes,
+};
+
+static const struct iio_info als_info = {
+ .attrs = &als_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &als_read_raw,
+ .write_raw = &als_write_raw,
+};
+
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
+{
+ struct iio_buffer *buffer = indio_dev->buffer;
+ s64 timestamp = iio_get_time_ns();
+ int datum_sz;
+
+ if (!buffer)
+ return;
+ datum_sz = buffer->access->get_bytes_per_datum(buffer);
+ if (len > datum_sz) {
+ dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
+ datum_sz);
+ return;
+ }
+ buffer->access->store_to(buffer, (u8 *)data, timestamp);
+}
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+int als_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ dev_dbg(&indio_dev->dev, "als_proc_event\n");
+ if (als_state->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&als_state->als_sample_data,
+ sizeof(struct als_sample));
+ return 0;
+}
+
+/* Capture samples in local storage */
+int als_capture_sample(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ size_t raw_len, char *raw_data,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE:
+ als_state->als_sample_data.illum =
+ *(u16 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int als_parse_report(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ struct als_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE,
+ &st->als_illum);
+ als_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_ILLUM,
+ st->als_illum.size);
+
+ dev_dbg(&st->pdev->dev, "als %x:%x\n", st->als_illum.index,
+ st->als_illum.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int als_init(struct platform_device *pdev,
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id)
+{
+ int ret = 0;
+ static char *name = "als";
+ struct iio_dev *indio_dev;
+ struct als_state *als_state;
+
+ indio_dev = iio_allocate_device(sizeof(struct als_state));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+ platform_set_drvdata(pdev, indio_dev);
+ als_state = iio_priv(indio_dev);
+ als_state->hsdev = hsdev;
+ als_state->pdev = pdev;
+ als_state->common_attrb = sensor_hub_allocate_common_attributes(
+ hsdev, HID_USAGE_SENSOR_ALS);
+ if (als_state->common_attrb == NULL) {
+ ret = -ENOMEM;
+ goto error_free_dev;
+ }
+
+ ret = als_parse_report(hsdev, usage_id, als_state);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = als_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(als_channels);
+ indio_dev->dev.parent = &pdev->dev;
+ indio_dev->info = &als_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler, NULL);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
+ goto error_free_dev;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_ILLUM);
+ als_state->data_ready = false;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "trigger setup failed\n");
+ goto error_unreg_buffer_funcs;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ dev_err(&pdev->dev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_unreg_buffer_funcs:
+ iio_triggered_buffer_cleanup(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_ret:
+ return ret;
+}
+
+static int als_exit(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+ struct als_state *st = iio_priv(indio_dev);
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ sensor_hub_free_common_attributes(st->common_attrb);
+ iio_free_device(indio_dev);
+ return ret;
+}
+
+static struct hid_sensor_hub_callbacks als_callbacks = {
+ .send_event = als_proc_event,
+ .capture_sample = als_capture_sample,
+};
+
+static int __devinit hid_als_probe(struct platform_device *pdev)
+{
+ int ret;
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ ret = als_init(pdev, hsdev, HID_USAGE_SENSOR_ALS);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "als_init failed\n");
+ return ret;
+ }
+ als_callbacks.pdev = pdev;
+ ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_ALS,
+ &als_callbacks);
+ return 0;
+}
+
+static int __devinit hid_als_remove(struct platform_device *pdev)
+{
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ als_exit(pdev);
+ return sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ALS);
+}
+
+static struct platform_driver hid_als_platform_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = hid_als_probe,
+ .remove = hid_als_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init hid_als_init(void)
+{
+ return platform_driver_register(&hid_als_platform_driver);
+}
+
+static void __exit hid_als_exit(void)
+{
+ platform_driver_unregister(&hid_als_platform_driver);
+}
+
+module_init(hid_als_init);
+module_exit(hid_als_exit);
+
+MODULE_DESCRIPTION("HID Sensor ALS");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>");
+MODULE_LICENSE("GPL");
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH, 6/6] HID-Sensors: Added ALS
@ 2012-06-26 0:54 ` srinivas pandruvada
0 siblings, 0 replies; 21+ messages in thread
From: srinivas pandruvada @ 2012-06-26 0:54 UTC (permalink / raw)
To: linux-iio; +Cc: jic23.cam.ac.uk, jkosina, linux-input, srinivas pandruvada
Added usage id processing for ALS. This uses IIO
interfaces for triggerred buffer to present data to user
mode.This uses HID sensor framework for registering callback
events from the sensor hub.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/iio/light/Kconfig | 10 +
drivers/staging/iio/light/Makefile | 2 +
drivers/staging/iio/light/hid-sensor-als.c | 478 ++++++++++++++++++++++++++++
3 files changed, 490 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/iio/light/hid-sensor-als.c
diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index e7e9159..59e4745 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -31,4 +31,14 @@ config TSL2583
Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.
Access ALS data via iio, sysfs.
+config HID_SENSOR_ALS
+ depends on HID_SENSOR_HUB
+ select IIO_BUFFER
+ select IIO_TRIGGER
+ select IIO_TRIGGERED_BUFFER
+ tristate "HID Ambient Light Sensor"
+ help
+ Say yes here to build support for the HID SENSOR
+ ALS.
+
endmenu
diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 3011fbf..9b90d84 100644
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -5,3 +5,5 @@
obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o
obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
obj-$(CONFIG_TSL2583) += tsl2583.o
+hid-sensor-als-drv-y := hid-sensor-als.o
+obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als-drv.o
diff --git a/drivers/staging/iio/light/hid-sensor-als.c b/drivers/staging/iio/light/hid-sensor-als.c
new file mode 100644
index 0000000..cfcda5d
--- /dev/null
+++ b/drivers/staging/iio/light/hid-sensor-als.c
@@ -0,0 +1,478 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/hid-sensor-hub.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "../kfifo_buf.h"
+#include "../trigger_consumer.h"
+#include "../triggered_buffer.h"
+
+/*Format: HID-SENSOR-usage_id_in_hex*/
+#define DRIVER_NAME "HID-SENSOR-200041"
+
+#define CHANNEL_SCAN_INDEX_ILLUM 0
+
+struct als_sample {
+ u16 illum;
+};
+
+struct als_state {
+ struct hid_sensor_hub_device *hsdev;
+ struct platform_device *pdev;
+ struct hid_sensor_common_attributes *common_attrb;
+ struct hid_sensor_hub_attribute_info als_illum;
+ struct als_sample als_sample_data;
+ bool data_ready;
+};
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct als_state *st = iio_priv(indio_dev);
+ int state_val;
+ char buffer[16];
+
+ dev_dbg(&indio_dev->dev, "hid_sensor_data_rdy_trigger_set_state %d\n",
+ state);
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ sprintf(buffer, "%d", state_val);
+ hid_sensor_write_report_state(st->common_attrb, strlen(buffer), buffer);
+ hid_sensor_write_power_state(st->common_attrb, strlen(buffer), buffer);
+
+ return 0;
+}
+
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
+{
+ iio_trigger_unregister(indio_dev->trig);
+ iio_free_trigger(indio_dev->trig);
+}
+
+static const struct iio_trigger_ops hid_sensor_trigger_ops = {
+ .owner = THIS_MODULE,
+ .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
+};
+
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name)
+{
+ int ret;
+ struct iio_trigger *trig;
+
+ trig = iio_allocate_trigger("%s-dev%d", name, indio_dev->id);
+ if (trig == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ trig->dev.parent = indio_dev->dev.parent;
+ trig->private_data = (void *)indio_dev;
+ trig->ops = &hid_sensor_trigger_ops;
+ ret = iio_trigger_register(trig);
+
+ /* select default trigger */
+ indio_dev->trig = trig;
+ if (ret)
+ goto error_free_trig;
+
+ return ret;
+
+error_free_trig:
+ iio_free_trigger(trig);
+error_ret:
+ return ret;
+}
+
+static struct iio_chan_spec als_channels[] = {
+ {
+ .type = IIO_INTENSITY,
+ .modified = 1,
+ .channel2 = IIO_MOD_LIGHT_BOTH,
+ .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+ IIO_CHAN_INFO_SCALE_SHARED_BIT,
+ .scan_index = CHANNEL_SCAN_INDEX_ILLUM,
+ }
+};
+
+static void als_adjust_channel_bit_mask(int channel, int size)
+{
+ als_channels[channel].scan_type.sign = 's';
+ als_channels[channel].scan_type.realbits = size * 8;
+ als_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int als_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct als_state *als_state = iio_priv(indio_dev);
+ int report_id = -1;
+ u32 address;
+
+ *val = 0;
+ *val2 = 0;
+ switch (mask) {
+ case 0:
+ switch (chan->scan_index) {
+ case CHANNEL_SCAN_INDEX_ILLUM:
+ report_id = als_state->als_illum.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(
+ als_state->hsdev,
+ HID_USAGE_SENSOR_ALS, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = als_state->als_illum.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = als_state->als_illum.unit_expo;
+ break;
+ default:
+ break;
+ }
+ return IIO_VAL_INT;
+}
+
+static int als_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ dev_err(&indio_dev->dev, "%s\n", __func__);
+ return 0;
+}
+
+static ssize_t hid_sensor_als_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int len;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+ len = hid_sensor_read_hyst_raw(als_state->common_attrb, strlen(buf),
+ buf);
+ return len;
+}
+
+static ssize_t hid_sensor_als_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+ return hid_sensor_write_hyst_raw(als_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_read_als_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ return hid_sensor_read_samp_freq(als_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static ssize_t hid_sensor_write_als_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ return hid_sensor_write_samp_freq(als_state->common_attrb,
+ strlen(buf), buf);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_als_samp_freq,
+ hid_sensor_write_als_samp_freq);
+
+#define IIO_DEV_ATTR_HYSTERESIS(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(hyst_raw, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_HYSTERESIS(S_IWUSR | S_IRUSR,
+ hid_sensor_als_read_hyst_raw,
+ hid_sensor_als_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+static struct attribute *als_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_dev_attr_hyst_raw.dev_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group als_attribute_group = {
+ .attrs = als_attributes,
+};
+
+static const struct iio_info als_info = {
+ .attrs = &als_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &als_read_raw,
+ .write_raw = &als_write_raw,
+};
+
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
+{
+ struct iio_buffer *buffer = indio_dev->buffer;
+ s64 timestamp = iio_get_time_ns();
+ int datum_sz;
+
+ if (!buffer)
+ return;
+ datum_sz = buffer->access->get_bytes_per_datum(buffer);
+ if (len > datum_sz) {
+ dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
+ datum_sz);
+ return;
+ }
+ buffer->access->store_to(buffer, (u8 *)data, timestamp);
+}
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+int als_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ dev_dbg(&indio_dev->dev, "als_proc_event\n");
+ if (als_state->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&als_state->als_sample_data,
+ sizeof(struct als_sample));
+ return 0;
+}
+
+/* Capture samples in local storage */
+int als_capture_sample(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ size_t raw_len, char *raw_data,
+ void *priv)
+{
+ struct iio_dev *indio_dev =
+ (struct iio_dev *)platform_get_drvdata(priv);
+ struct als_state *als_state = iio_priv(indio_dev);
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE:
+ als_state->als_sample_data.illum =
+ *(u16 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int als_parse_report(struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id,
+ struct als_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE,
+ &st->als_illum);
+ als_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_ILLUM,
+ st->als_illum.size);
+
+ dev_dbg(&st->pdev->dev, "als %x:%x\n", st->als_illum.index,
+ st->als_illum.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int als_init(struct platform_device *pdev,
+ struct hid_sensor_hub_device *hsdev,
+ unsigned usage_id)
+{
+ int ret = 0;
+ static char *name = "als";
+ struct iio_dev *indio_dev;
+ struct als_state *als_state;
+
+ indio_dev = iio_allocate_device(sizeof(struct als_state));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+ platform_set_drvdata(pdev, indio_dev);
+ als_state = iio_priv(indio_dev);
+ als_state->hsdev = hsdev;
+ als_state->pdev = pdev;
+ als_state->common_attrb = sensor_hub_allocate_common_attributes(
+ hsdev, HID_USAGE_SENSOR_ALS);
+ if (als_state->common_attrb == NULL) {
+ ret = -ENOMEM;
+ goto error_free_dev;
+ }
+
+ ret = als_parse_report(hsdev, usage_id, als_state);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = als_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(als_channels);
+ indio_dev->dev.parent = &pdev->dev;
+ indio_dev->info = &als_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler, NULL);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
+ goto error_free_dev;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_ILLUM);
+ als_state->data_ready = false;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "trigger setup failed\n");
+ goto error_unreg_buffer_funcs;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ dev_err(&pdev->dev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_unreg_buffer_funcs:
+ iio_triggered_buffer_cleanup(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_ret:
+ return ret;
+}
+
+static int als_exit(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+ struct als_state *st = iio_priv(indio_dev);
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ sensor_hub_free_common_attributes(st->common_attrb);
+ iio_free_device(indio_dev);
+ return ret;
+}
+
+static struct hid_sensor_hub_callbacks als_callbacks = {
+ .send_event = als_proc_event,
+ .capture_sample = als_capture_sample,
+};
+
+static int __devinit hid_als_probe(struct platform_device *pdev)
+{
+ int ret;
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ ret = als_init(pdev, hsdev, HID_USAGE_SENSOR_ALS);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "als_init failed\n");
+ return ret;
+ }
+ als_callbacks.pdev = pdev;
+ ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_ALS,
+ &als_callbacks);
+ return 0;
+}
+
+static int __devinit hid_als_remove(struct platform_device *pdev)
+{
+ u32 *pdata = (u32 *)pdev->dev.platform_data;
+ struct hid_sensor_hub_device *hsdev;
+
+ hsdev = (struct hid_sensor_hub_device *)*pdata;
+ als_exit(pdev);
+ return sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ALS);
+}
+
+static struct platform_driver hid_als_platform_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = hid_als_probe,
+ .remove = hid_als_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init hid_als_init(void)
+{
+ return platform_driver_register(&hid_als_platform_driver);
+}
+
+static void __exit hid_als_exit(void)
+{
+ platform_driver_unregister(&hid_als_platform_driver);
+}
+
+module_init(hid_als_init);
+module_exit(hid_als_exit);
+
+MODULE_DESCRIPTION("HID Sensor ALS");
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>");
+MODULE_LICENSE("GPL");
--
1.7.7.6
^ permalink raw reply related [flat|nested] 21+ messages in thread