* [PATCH 1/8] HID-Sensors: Add ST Micro Sensor hub
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 2/8] HID-Sensors: Add Intel HID sensor srinivas pandruvada
` (8 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, srinivas pandruvada
Added senor hub present in Samsung XE700T Win8 demo slate PC.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/hid/hid-core.c | 2 ++
drivers/hid/hid-ids.h | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b7d758c..f160aab 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1548,6 +1548,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..7409750 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -664,6 +664,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] 28+ messages in thread* [PATCH 2/8] HID-Sensors: Add Intel HID sensor
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
2012-06-10 1:53 ` [PATCH 1/8] HID-Sensors: Add ST Micro Sensor hub srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 3/8] HID-Sensors: Sensor framework srinivas pandruvada
` (7 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, srinivas pandruvada
Added Intel vendor id/product id and added in the list
for ignoring Intel vendor id/product id for HID.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/hid/hid-core.c | 6 ++++++
drivers/hid/hid-ids.h | 5 +++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index f160aab..fad31c5 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1444,6 +1444,12 @@ 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_8087,
+ 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_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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7409750..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
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 3/8] HID-Sensors: Sensor framework
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
2012-06-10 1:53 ` [PATCH 1/8] HID-Sensors: Add ST Micro Sensor hub srinivas pandruvada
2012-06-10 1:53 ` [PATCH 2/8] HID-Sensors: Add Intel HID sensor srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 4/8] HID-Sensors: Common attributes and interfaces srinivas pandruvada
` (6 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, 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 delegated the actual usage id processing to different
modules, which are registered statically.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/Kconfig | 2 +
drivers/staging/Makefile | 1 +
drivers/staging/hid-sensors/Kconfig | 16 +
drivers/staging/hid-sensors/Makefile | 9 +
drivers/staging/hid-sensors/hid-sensor-hub.c | 743 ++++++++++++++++++++
drivers/staging/hid-sensors/hid-sensor-ids.h | 117 +++
drivers/staging/hid-sensors/hid-sensor-interface.h | 78 ++
7 files changed, 966 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/hid-sensors/Kconfig
create mode 100644 drivers/staging/hid-sensors/Makefile
create mode 100644 drivers/staging/hid-sensors/hid-sensor-hub.c
create mode 100644 drivers/staging/hid-sensors/hid-sensor-ids.h
create mode 100644 drivers/staging/hid-sensors/hid-sensor-interface.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 97d412d..562700a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -80,6 +80,8 @@ source "drivers/staging/sep/Kconfig"
source "drivers/staging/iio/Kconfig"
+source "drivers/staging/hid-sensors/Kconfig"
+
source "drivers/staging/zram/Kconfig"
source "drivers/staging/zcache/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ffe7d44..f53f0d4 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_VT6656) += vt6656/
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_DX_SEP) += sep/
obj-$(CONFIG_IIO) += iio/
+obj-$(CONFIG_HID_SENSORS) += hid-sensors/
obj-$(CONFIG_ZRAM) += zram/
obj-$(CONFIG_ZCACHE) += zcache/
obj-$(CONFIG_ZSMALLOC) += zsmalloc/
diff --git a/drivers/staging/hid-sensors/Kconfig b/drivers/staging/hid-sensors/Kconfig
new file mode 100644
index 0000000..787aa74
--- /dev/null
+++ b/drivers/staging/hid-sensors/Kconfig
@@ -0,0 +1,16 @@
+#
+# Sensor HUB subsytem configuration
+#
+
+menuconfig HID_SENSORS
+ tristate "HID Sensor Core"
+ select USB_HID
+ help
+ Support for HID Sensor hub based on HID 1.12 sensor usage table
+
+menuconfig HID_SENSOR_DEBUG
+ tristate "HID Sensor debug support"
+ depends on HID_SENSORS
+ default n
+ help
+ Debug support for Hid sensors
diff --git a/drivers/staging/hid-sensors/Makefile b/drivers/staging/hid-sensors/Makefile
new file mode 100644
index 0000000..13591b2
--- /dev/null
+++ b/drivers/staging/hid-sensors/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the HID Sensors.
+#
+ccflags-y += -Idrivers/hid
+ccflags-y += -Idrivers/staging
+ccflags-$(CONFIG_HID_SENSOR_DEBUG) += -DDEBUG
+
+hid-sensors-y := hid-sensor-hub.o
+obj-$(CONFIG_HID_SENSORS) += hid-sensors.o
diff --git a/drivers/staging/hid-sensors/hid-sensor-hub.c b/drivers/staging/hid-sensors/hid-sensor-hub.c
new file mode 100644
index 0000000..95de914
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-hub.c
@@ -0,0 +1,743 @@
+/*
+ * 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 "hid-ids.h"
+#include "hid-sensor-ids.h"
+#include "hid-sensor-interface.h"
+
+#define RAW_BUFFER_SIZE 128
+#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_device *hdev;
+ struct mutex mutex;
+ spinlock_t lock;
+ struct sensor_hub_pending *pending;
+};
+
+struct sensor_hub_callbacks_list {
+ u32 usage_id;
+ struct sensor_hub_callbacks* (*reg_callback)(void);
+ int initialized;
+ void *priv;
+};
+
+static struct sensor_hub_callbacks_list usage_callbacks[] = {
+ {0}
+};
+
+/* Utility functions */
+
+static int sensor_hub_check_for_sensor_page(struct hid_device *hdev)
+{
+ int i;
+ int ret = -1;
+
+ 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;
+}
+
+static struct sensor_hub_callbacks *sensor_hub_get_callback(u32 usage_id,
+ void **priv)
+{
+ int j;
+ struct sensor_hub_callbacks *callback = NULL;
+
+ j = 0;
+ while (usage_callbacks[j].usage_id != 0) {
+ if (usage_callbacks[j].initialized &&
+ usage_callbacks[j].usage_id == usage_id) {
+ callback = usage_callbacks[j].reg_callback();
+ *priv = usage_callbacks[j].priv;
+ break;
+ }
+ ++j;
+ }
+ return callback;
+}
+
+static int sensor_hub_init_callbacks(struct hid_device *hdev)
+{
+ int i, j;
+ int ret = 0;
+ struct sensor_hub_callbacks *callback;
+
+ 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);
+ j = 0;
+ while (usage_callbacks[j].usage_id != 0) {
+ if (collection->usage == usage_callbacks[j].usage_id) {
+ callback = usage_callbacks[j].reg_callback();
+ ret = callback->enter(hdev, collection->usage,
+ &usage_callbacks[j].priv);
+ if (ret) {
+ hid_err(hdev, "Failed:usage id:0x%x\n",
+ collection->usage);
+ break;
+ }
+ usage_callbacks[j].initialized = 1;
+ }
+ ++j;
+ }
+ }
+ return ret;
+}
+
+#if (defined CONFIG_HID_SENSOR_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_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
+
+int sensor_hub_set_feature(struct hid_device *hdev, u32 report_id,
+ u32 field_index, s32 value)
+{
+ struct hid_report *report;
+ struct sensor_hub_data *data = hid_get_drvdata(hdev);
+ int ret = 0;
+
+ mutex_lock(&data->mutex);
+ report = sensor_hub_feature_report(report_id, 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(hdev, report, USB_DIR_OUT);
+ usbhid_wait_io(hdev);
+done_proc:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+
+int sensor_hub_get_feature(struct hid_device *hdev, u32 report_id,
+ u32 field_index, s32 *value)
+{
+ struct hid_report *report;
+ struct sensor_hub_data *data = hid_get_drvdata(hdev);
+ int ret = 0;
+
+ mutex_lock(&data->mutex);
+ report = sensor_hub_feature_report(report_id, hdev);
+ if (!report) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ if (field_index >= report->maxfield) {
+ ret = -EINVAL;
+ goto done_proc;
+ }
+ usbhid_submit_report(hdev, report, USB_DIR_IN);
+ usbhid_wait_io(hdev);
+ *value = report->field[field_index]->value[0];
+done_proc:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+
+static int sensor_hub_get_report_id(struct hid_device *hdev, u8 type,
+ u32 usage_id, u32 field_usage_id,
+ int *index)
+{
+ int ret = -1;
+ int i, j;
+ int collection_index = -1;
+ struct hid_report *report;
+ struct hid_field *field;
+ struct hid_report_enum *report_enum;
+
+ *index = 0;
+ 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 == field_usage_id &&
+ field->usage[j].collection_index ==
+ collection_index) {
+ *index = i;
+ ret = report->id;
+ hid_dbg(hdev, "Found usage hid\n");
+ hid_dbg(hdev, "r:%x id:%x c:%x f:%x\n",
+ ret, field->usage[j].hid,
+ field->usage[j].collection_index,
+ *index);
+ break;
+ }
+ }
+ }
+ }
+
+err_ret:
+ return ret;
+}
+
+/* Interface functions for sensor usage id clients */
+int sensor_hub_get_field_usage_index(struct hid_device *hdev, u32 *report_id,
+ u32 usage_id, u32 field_usage_id)
+{
+ int id;
+ int index = -1;
+
+ id = sensor_hub_get_report_id(hdev, HID_INPUT_REPORT, usage_id,
+ field_usage_id, &index);
+ if (id >= 0) {
+ *report_id = id;
+ goto done_proc;
+ }
+
+ id = sensor_hub_get_report_id(hdev, HID_OUTPUT_REPORT, usage_id,
+ field_usage_id, &index);
+ if (id >= 0) {
+ *report_id = id;
+ goto done_proc;
+ }
+
+ id = sensor_hub_get_report_id(hdev, HID_FEATURE_REPORT, usage_id,
+ field_usage_id, &index);
+ if (id >= 0) {
+ *report_id = id;
+ goto done_proc;
+ }
+
+done_proc:
+ return index;
+}
+
+ssize_t sensor_hub_input_attr_get_value(struct hid_device *hdev, u32 usage_id,
+ u32 attr_usage_id, u32 report_id,
+ u32 buf_len, u8 *buf)
+{
+ int len = -1;
+ struct sensor_hub_data *data = hid_get_drvdata(hdev);
+ struct sensor_hub_pending *work;
+ unsigned long flags;
+ struct hid_report *report;
+
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
+ if (!work)
+ return len;
+
+ 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, data->hdev);
+ if (!report)
+ goto err_free;
+ usbhid_submit_report(data->hdev, report, USB_DIR_IN);
+ spin_unlock_irqrestore(&data->lock, flags);
+ wait_for_completion_interruptible_timeout(&work->ready, HZ*5);
+ if (work->raw_size)
+ len = snprintf(buf, buf_len, "%x\n", *(u32 *)work->raw_data);
+
+err_free:
+ data->pending = NULL;
+ mutex_unlock(&data->mutex);
+
+ kfree(work);
+ return len;
+}
+
+int sensor_hub_input_attr_get_raw_value(struct hid_device *hdev, u32 usage_id,
+ u32 attr_usage_id, u32 report_id)
+{
+ struct sensor_hub_data *data = hid_get_drvdata(hdev);
+ struct sensor_hub_pending *work;
+ unsigned long flags;
+ struct hid_report *report;
+ int ret_val = 0;
+
+ 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, data->hdev);
+ if (!report)
+ goto err_free;
+ usbhid_submit_report(data->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;
+}
+
+int sensor_hub_input_get_attribute_info(struct hid_device *hdev , 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;
+
+ /* 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;
+
+}
+
+#ifdef CONFIG_PM
+static int sensor_hub_suspend(struct hid_device *hdev, pm_message_t message)
+{
+ int j;
+ struct sensor_hub_callbacks *callback;
+
+ hid_dbg(hdev, " sensor_hub_suspend\n");
+ j = 0;
+ while (usage_callbacks[j].usage_id != 0) {
+ if (usage_callbacks[j].initialized) {
+ callback = usage_callbacks[j].reg_callback();
+ if (callback->suspend)
+ callback->suspend(hdev,
+ usage_callbacks[j].priv);
+ }
+ ++j;
+ }
+ return 0;
+}
+
+static int sensor_hub_resume(struct hid_device *hdev)
+{
+ int j;
+ struct sensor_hub_callbacks *callback;
+
+ hid_dbg(hdev, " sensor_hub_resume\n");
+ j = 0;
+ while (usage_callbacks[j].usage_id != 0) {
+ if (usage_callbacks[j].initialized) {
+ callback = usage_callbacks[j].reg_callback();
+ if (callback->resume)
+ callback->resume(hdev,
+ usage_callbacks[j].priv);
+ }
+ ++j;
+ }
+ 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 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_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_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(collection->usage,
+ &priv);
+ if (callback && callback->capture_sample) {
+ callback->capture_sample(hdev,
+ report->field[i]->usage->hid, sz, ptr, priv);
+ }
+ ptr += sz;
+ }
+ if (callback && collection && callback->send_event)
+ callback->send_event(hdev, collection->usage, priv);
+
+ 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;
+
+ sd = kzalloc(sizeof(struct sensor_hub_data), GFP_KERNEL);
+ if (!sd) {
+ hid_err(hdev, "cannot allocate Sensor data\n");
+ return -ENOMEM;
+ }
+ hid_set_drvdata(hdev, sd);
+ sd->hdev = hdev;
+ spin_lock_init(&sd->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_DEBUG) || \
+ (defined CONFIG_HID_SENSOR_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_hw_stop(hdev);
+ hid_err(hdev, "failed to open input interrupt pipe\n");
+ goto err_close;
+ }
+
+ ret = sensor_hub_init_callbacks(hdev);
+ if (ret < 0)
+ goto err_stop_hw;
+ return ret;
+
+err_close:
+ hid_hw_stop(hdev);
+err_stop_hw:
+ hid_hw_close(hdev);
+err_free:
+ 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 j, ret;
+ struct sensor_hub_callbacks *callback;
+
+ hid_dbg(hdev, " hardware removed\n");
+
+ hdev->claimed &= ~HID_CLAIMED_INPUT;
+
+ hid_hw_stop(hdev);
+ hid_hw_close(hdev);
+
+ j = 0;
+ while (usage_callbacks[j].usage_id != 0) {
+ if (usage_callbacks[j].initialized) {
+ callback = usage_callbacks[j].reg_callback();
+ ret = callback->exit(hdev, usage_callbacks[j].priv);
+ if (ret) {
+ hid_err(hdev, "callback exit failed\n");
+ break;
+ }
+ }
+ ++j;
+ }
+
+ hid_set_drvdata(hdev, NULL);
+
+ spin_lock_irqsave(&data->lock, flags);
+ if (data->pending)
+ complete(&data->pending->ready);
+ spin_unlock_irqrestore(&data->lock, flags);
+
+ mutex_destroy(&data->mutex);
+ 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_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_LICENSE("GPL");
diff --git a/drivers/staging/hid-sensors/hid-sensor-ids.h b/drivers/staging/hid-sensors/hid-sensor-ids.h
new file mode 100644
index 0000000..5888aaf
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-ids.h
@@ -0,0 +1,117 @@
+/*
+ * 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
+
+#include "hid-ids.h"
+
+#define HID_UP_SENSOR 0x00200000
+#define HID_SENSOR_POLLING 0x0020030E
+#define HID_SENSOR_REPORT_STATE 0x00200316
+
+
+/* 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
diff --git a/drivers/staging/hid-sensors/hid-sensor-interface.h b/drivers/staging/hid-sensors/hid-sensor-interface.h
new file mode 100644
index 0000000..c388b6b
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-interface.h
@@ -0,0 +1,78 @@
+/*
+ * 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_INTERFACE_H
+#define _HID_SENSORS_INTERFACE_H
+
+#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 "iio/iio.h"
+#include "iio/sysfs.h"
+#include "iio/ring_sw.h"
+#include "iio/trigger.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_attributes {
+ struct hid_device *hdev;
+ unsigned usage_id;
+ bool data_ready;
+ struct hid_sensor_hub_attribute_info poll;
+ struct hid_sensor_hub_attribute_info activate;
+ struct hid_sensor_hub_attribute_info sensitivity;
+ void *private;
+};
+
+struct sensor_hub_callbacks {
+ int (*enter)(struct hid_device *hdev, u32 usage_id, void **priv);
+ int (*exit)(struct hid_device *hdev, void *priv);
+ int (*suspend)(struct hid_device *hdev, void *priv);
+ int (*resume)(struct hid_device *hdev, void *priv);
+ int (*capture_sample)(struct hid_device *hdev, u32 usage_id,
+ size_t raw_len, char *raw_data, void *priv);
+ int (*send_event)(struct hid_device *hdev, u32 usage_id, void *priv);
+};
+
+/* Hid sensor hub core interfaces */
+int sensor_hub_input_get_attribute_info(struct hid_device *hdev, u8 type,
+ u32 usage_id, u32 attr_usage_id,
+ struct hid_sensor_hub_attribute_info *info);
+int sensor_hub_set_feature(struct hid_device *dev, u32 report_id,
+ u32 field_index, s32 value);
+int sensor_hub_get_feature(struct hid_device *hdev, u32 report_id,
+ u32 field_index, s32 *value);
+ssize_t sensor_hub_input_attr_get_value(struct hid_device *hdev, u32 usage_id,
+ u32 attr_usage_id, u32 report_id,
+ u32 buf_len, u8 *buf);
+int sensor_hub_input_attr_get_raw_value(struct hid_device *hdev, u32 usage_id,
+ u32 attr_usage_id, u32 report_id);
+int sensor_hub_input_get_unit_expo(struct hid_device *hdev, u32 field_usage_id,
+ s32 *unit, s32 *unit_expo);
+#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 4/8] HID-Sensors: Common attributes and interfaces
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (2 preceding siblings ...)
2012-06-10 1:53 ` [PATCH 3/8] HID-Sensors: Sensor framework srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 5/8] HID-Sensors: Added accelerometer 3D srinivas pandruvada
` (5 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, Srinivas pandruvada
From: Srinivas pandruvada <srinivas.pandruvada@intel.com>
Added IIO buffer interface and trigger functions, which can be
used by all sensors. In addition a set of interface functions
for setting common attributes for all sensors like polling
interval, sensitivity and activate etc.
Signed-off-by: Srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/hid-sensors/Kconfig | 3 +
drivers/staging/hid-sensors/Makefile | 3 +
.../staging/hid-sensors/hid-sensor-attributes.c | 169 ++++++++++++++++++++
.../staging/hid-sensors/hid-sensor-attributes.h | 51 ++++++
drivers/staging/hid-sensors/hid-sensor-buffer.c | 98 +++++++++++
drivers/staging/hid-sensors/hid-sensor-interface.h | 11 ++
drivers/staging/hid-sensors/hid-sensor-trigger.c | 83 ++++++++++
7 files changed, 418 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.c
create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.h
create mode 100644 drivers/staging/hid-sensors/hid-sensor-buffer.c
create mode 100644 drivers/staging/hid-sensors/hid-sensor-trigger.c
diff --git a/drivers/staging/hid-sensors/Kconfig b/drivers/staging/hid-sensors/Kconfig
index 787aa74..537fd92 100644
--- a/drivers/staging/hid-sensors/Kconfig
+++ b/drivers/staging/hid-sensors/Kconfig
@@ -5,6 +5,9 @@
menuconfig HID_SENSORS
tristate "HID Sensor Core"
select USB_HID
+ select IIO
+ select IIO_BUFFER
+ select IIO_KFIFO_BUF
help
Support for HID Sensor hub based on HID 1.12 sensor usage table
diff --git a/drivers/staging/hid-sensors/Makefile b/drivers/staging/hid-sensors/Makefile
index 13591b2..123e7fa 100644
--- a/drivers/staging/hid-sensors/Makefile
+++ b/drivers/staging/hid-sensors/Makefile
@@ -6,4 +6,7 @@ ccflags-y += -Idrivers/staging
ccflags-$(CONFIG_HID_SENSOR_DEBUG) += -DDEBUG
hid-sensors-y := hid-sensor-hub.o
+hid-sensors-y += hid-sensor-attributes.o
+hid-sensors-y += hid-sensor-buffer.o
+hid-sensors-y += hid-sensor-trigger.o
obj-$(CONFIG_HID_SENSORS) += hid-sensors.o
diff --git a/drivers/staging/hid-sensors/hid-sensor-attributes.c b/drivers/staging/hid-sensors/hid-sensor-attributes.c
new file mode 100644
index 0000000..71eda1f
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-attributes.c
@@ -0,0 +1,169 @@
+/*
+ * 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/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "iio/iio.h"
+#include "iio/sysfs.h"
+#include "hid-sensor-ids.h"
+#include "hid-sensor-interface.h"
+
+#define MAXIMUM_SAMP_FREQUENCY 1000
+
+ssize_t hid_sensor_read_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ __s32 value;
+ int len;
+ int ret;
+ int conv_value;
+
+ ret = sensor_hub_get_feature(st->hdev,
+ st->poll.report_id,
+ st->poll.index, &value);
+ if (ret < 0 || value <= 0)
+ len = sprintf(buf, "0\n");
+ else {
+ if (st->poll.units == HID_USAGE_SENSOR_UNITS_MILLISECOND)
+ conv_value = 1000/value;
+ else if (st->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;
+}
+
+ssize_t hid_sensor_write_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 hid_sensor_attributes *st = iio_priv(indio_dev);
+ 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 && st->poll.units == HID_USAGE_SENSOR_UNITS_MILLISECOND)
+ conv_value = 1000/value;
+ else if (value && st->poll.units == HID_USAGE_SENSOR_UNITS_SECOND)
+ conv_value = 1/value;
+ else
+ conv_value = value; /*Assume HZ*/
+
+ ret = sensor_hub_set_feature(st->hdev,
+ st->poll.report_id,
+ st->poll.index,
+ conv_value);
+
+ if (ret < 0)
+ return ret;
+ return strlen(buf);
+}
+
+ssize_t hid_sensor_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ __s32 value;
+ int len;
+ int ret;
+
+ ret = sensor_hub_get_feature(st->hdev,
+ st->sensitivity.report_id,
+ st->sensitivity.index, &value);
+ if (ret < 0 || value < 0)
+ len = sprintf(buf, "0\n");
+ else
+ len = sprintf(buf, "units:%d,exp:%d,value:%d\n",
+ st->sensitivity.units,
+ st->sensitivity.unit_expo, value);
+ return len;
+}
+
+ssize_t hid_sensor_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 hid_sensor_attributes *st = iio_priv(indio_dev);
+ int value;
+ int ret;
+
+ if (kstrtoint(buf, 10, &value) < 0)
+ return -EINVAL;
+
+ if (value <= 0)
+ value = 0;
+ ret = sensor_hub_set_feature(st->hdev,
+ st->sensitivity.report_id,
+ st->sensitivity.index,
+ value);
+
+ if (ret < 0)
+ return ret;
+
+ return strlen(buf);
+}
+
+int hid_sensor_parse_common_attributes(struct hid_device *hdev, u32 usage_id,
+ struct hid_sensor_attributes *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_POLLING, &st->poll);
+
+ ret = sensor_hub_input_get_attribute_info(hdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_SENSOR_REPORT_STATE,
+ &st->activate);
+
+ ret = sensor_hub_input_get_attribute_info(hdev,
+ HID_FEATURE_REPORT, usage_id,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS,
+ &st->sensitivity);
+
+ hid_dbg(hdev, "common attributes: %x:%x, %x:%x, %x:%x\n",
+ st->poll.index, st->poll.report_id,
+ st->activate.index, st->activate.report_id,
+ st->sensitivity.index, st->sensitivity.report_id);
+
+ return 0;
+}
diff --git a/drivers/staging/hid-sensors/hid-sensor-attributes.h b/drivers/staging/hid-sensors/hid-sensor-attributes.h
new file mode 100644
index 0000000..41f2db1
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-attributes.h
@@ -0,0 +1,51 @@
+/*
+ * 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_ATTRIBUTES_H
+#define _HID_SENSORS_ATTRIBUTES_H
+
+/* Common sysfs attributes for HID sensors */
+
+int hid_sensor_parse_common_attributes(struct hid_device *hdev, u32 usage_id,
+ struct hid_sensor_attributes *st);
+ssize_t hid_sensor_read_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ char *buf);
+ssize_t hid_sensor_write_hyst_raw(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len);
+ssize_t hid_sensor_read_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ char *buf);
+ssize_t hid_sensor_write_samp_freq(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len);
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+ hid_sensor_read_samp_freq,
+ hid_sensor_write_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_read_hyst_raw,
+ hid_sensor_write_hyst_raw,
+ HID_USAGE_SENSOR_PROPERTY_CHANGE_SENSITIVITY_ABS);
+
+#endif
diff --git a/drivers/staging/hid-sensors/hid-sensor-buffer.c b/drivers/staging/hid-sensors/hid-sensor-buffer.c
new file mode 100644
index 0000000..8d5da0e
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-buffer.c
@@ -0,0 +1,98 @@
+/*
+ * 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/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "iio/iio.h"
+#include "iio/sysfs.h"
+#include "iio/trigger_consumer.h"
+#include "iio/trigger.h"
+#include "iio/kfifo_buf.h"
+
+static const struct iio_buffer_setup_ops hid_sensors_buffer_setup_ops = {
+ .preenable = &iio_sw_buffer_preenable,
+ .postenable = &iio_triggered_buffer_postenable,
+ .predisable = &iio_triggered_buffer_predisable,
+};
+
+static irqreturn_t hid_sensor_trigger_handler(int irq, void *p)
+{
+ return IRQ_HANDLED;
+}
+
+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);
+}
+
+int hid_sensor_configure_buffer(struct iio_dev *indio_dev)
+{
+ struct iio_buffer *buffer;
+ int ret = 0;
+
+ buffer = iio_kfifo_allocate(indio_dev);
+ if (!buffer)
+ return -ENOMEM;
+
+ buffer->scan_timestamp = true;
+ indio_dev->buffer = buffer;
+ indio_dev->setup_ops = &hid_sensors_buffer_setup_ops;
+
+ indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
+ &hid_sensor_trigger_handler,
+ IRQF_ONESHOT,
+ indio_dev,
+ "hid_sensor%d",
+ indio_dev->id);
+ if (indio_dev->pollfunc == NULL) {
+ ret = -ENOMEM;
+ goto error_iio_free;
+ }
+
+ indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
+ return ret;
+
+error_iio_free:
+ iio_kfifo_free(indio_dev->buffer);
+ return ret;
+}
+
+void hid_sensor_cleanup_buffer(struct iio_dev *indio_dev)
+{
+ iio_dealloc_pollfunc(indio_dev->pollfunc);
+ iio_kfifo_free(indio_dev->buffer);
+}
diff --git a/drivers/staging/hid-sensors/hid-sensor-interface.h b/drivers/staging/hid-sensors/hid-sensor-interface.h
index c388b6b..ec1bd43 100644
--- a/drivers/staging/hid-sensors/hid-sensor-interface.h
+++ b/drivers/staging/hid-sensors/hid-sensor-interface.h
@@ -75,4 +75,15 @@ int sensor_hub_input_attr_get_raw_value(struct hid_device *hdev, u32 usage_id,
u32 attr_usage_id, u32 report_id);
int sensor_hub_input_get_unit_expo(struct hid_device *hdev, u32 field_usage_id,
s32 *unit, s32 *unit_expo);
+
+/* Common IIO Ring Processing Functions */
+int hid_sensor_configure_buffer(struct iio_dev *indio_dev);
+void hid_sensor_cleanup_buffer(struct iio_dev *indio_dev);
+void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data,
+ int len);
+
+/* Trigger functions */
+int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name);
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
+
#endif
diff --git a/drivers/staging/hid-sensors/hid-sensor-trigger.c b/drivers/staging/hid-sensors/hid-sensor-trigger.c
new file mode 100644
index 0000000..1a4f6cd
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-trigger.c
@@ -0,0 +1,83 @@
+/*
+ * 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 "iio/iio.h"
+#include "iio/trigger.h"
+#include "hid-sensor-interface.h"
+
+static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct iio_dev *indio_dev = trig->private_data;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ int ret;
+ int state_val;
+
+ st->data_ready = state;
+ state_val = state ? 1 : 0;
+ ret = sensor_hub_set_feature(st->hdev, st->activate.report_id,
+ st->activate.index,
+ (s32)state_val);
+ return ret;
+}
+
+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;
+}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 5/8] HID-Sensors: Added accelerometer 3D
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (3 preceding siblings ...)
2012-06-10 1:53 ` [PATCH 4/8] HID-Sensors: Common attributes and interfaces srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 6/8] HID-Sensors: Added Gyro 3D srinivas pandruvada
` (4 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, Srinivas pandruvada
From: Srinivas pandruvada <srinivas.pandruvada@intel.com>
Added usage id processing for Accelrometer 3D. This uses IIO
interfaces "buffer and trigger interface" to present
data to user mode.
Signed-off-by: Srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/hid-sensors/Makefile | 1 +
drivers/staging/hid-sensors/hid-sensor-accel-3d.c | 375 ++++++++++++++++++++
drivers/staging/hid-sensors/hid-sensor-hub.c | 1 +
drivers/staging/hid-sensors/hid-sensor-interface.h | 3 +
4 files changed, 380 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/hid-sensors/hid-sensor-accel-3d.c
diff --git a/drivers/staging/hid-sensors/Makefile b/drivers/staging/hid-sensors/Makefile
index 123e7fa..1b86473 100644
--- a/drivers/staging/hid-sensors/Makefile
+++ b/drivers/staging/hid-sensors/Makefile
@@ -9,4 +9,5 @@ hid-sensors-y := hid-sensor-hub.o
hid-sensors-y += hid-sensor-attributes.o
hid-sensors-y += hid-sensor-buffer.o
hid-sensors-y += hid-sensor-trigger.o
+hid-sensors-y += hid-sensor-accel-3d.o
obj-$(CONFIG_HID_SENSORS) += hid-sensors.o
diff --git a/drivers/staging/hid-sensors/hid-sensor-accel-3d.c b/drivers/staging/hid-sensors/hid-sensor-accel-3d.c
new file mode 100644
index 0000000..eb917ff
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-accel-3d.c
@@ -0,0 +1,375 @@
+/*
+ * 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 "iio/iio.h"
+#include "iio/sysfs.h"
+#include "iio/ring_sw.h"
+#include "iio/trigger.h"
+#include "hid-sensor-ids.h"
+#include "hid-sensor-interface.h"
+#include "hid-sensor-attributes.h"
+
+#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_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;
+};
+
+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 hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct accel_3d_state *accel_state =
+ (struct accel_3d_state *)st->private;
+ 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(st->hdev,
+ 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)
+{
+ printk(KERN_ERR "%s\n", __func__);
+
+ return 0;
+}
+
+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,
+};
+
+/* Function to push data to IIO ring */
+int accel_3d_proc_event(struct hid_device *hdev, unsigned usage_id, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct accel_3d_state *accel_state =
+ (struct accel_3d_state *)st->private;
+
+ hid_dbg(hdev, "accel_3d_proc_event\n");
+ if (st->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&accel_state->accel_sample_data,
+ sizeof(struct accel_3d_sample));
+ else
+ hid_dbg(hdev, "accel_3d_proc_event data not ready\n");
+ return 0;
+}
+
+/* Capture samples in local storage */
+int accel_3d_capture_sample(struct hid_device *hdev, unsigned usage_id,
+ size_t raw_len, char *raw_data, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct accel_3d_state *accel_state =
+ (struct accel_3d_state *)st->private;
+
+ 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_device *hdev, unsigned usage_id,
+ struct accel_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_X_AXIS,
+ &st->accel_x);
+ if (!ret)
+ hid_dbg(hdev, "No Accel X attribute\n");
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->accel_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Y_AXIS,
+ &st->accel_y);
+ if (!ret)
+ hid_dbg(hdev, "No Accel Y attribute\n");
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->accel_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ACCELERATION_Z_AXIS,
+ &st->accel_z);
+ if (!ret)
+ hid_dbg(hdev, "No Accel Z attribute\n");
+ accel_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->accel_z.size);
+
+ hid_dbg(hdev, "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_enter(struct hid_device *hdev, unsigned usage_id,
+ void **priv)
+{
+ int ret = 0;
+ static char *name = "accel_3d";
+ struct iio_dev *indio_dev;
+ struct accel_3d_state *accel_state;
+ struct hid_sensor_attributes *st;
+
+ accel_state = kzalloc(sizeof(struct accel_3d_state), GFP_KERNEL);
+ if (accel_state == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ indio_dev = iio_allocate_device(sizeof(struct hid_sensor_attributes));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_free_state;
+ }
+ st = iio_priv(indio_dev);
+ st->usage_id = usage_id;
+ st->hdev = hdev;
+ st->private = (void *)accel_state;
+
+ ret = hid_sensor_parse_common_attributes(hdev, usage_id, st);
+ if (ret) {
+ hid_err(hdev, "failed to setup common attributes\n");
+ goto error_free_dev;
+ }
+ ret = accel_3d_parse_report(hdev, usage_id, accel_state);
+ if (ret) {
+ hid_err(hdev, "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 = &hdev->dev;
+ indio_dev->info = &accel_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = hid_sensor_configure_buffer(indio_dev);
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_free_dev;
+ }
+
+ ret = iio_buffer_register(indio_dev,
+ accel_3d_channels,
+ ARRAY_SIZE(accel_3d_channels));
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_unreg_ring_funcs;
+ }
+ 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);
+ st->data_ready = true;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ hid_err(hdev, "trigger setup failed\n");
+ goto error_uninit_ring;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ hid_err(hdev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ *priv = (void *)indio_dev;
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_uninit_ring:
+ iio_buffer_unregister(indio_dev);
+error_unreg_ring_funcs:
+ hid_sensor_cleanup_buffer(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_free_state:
+ kfree(accel_state);
+error_ret:
+ return ret;
+}
+
+static int accel_3d_exit(struct hid_device *hdev, void *priv)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct accel_3d_state *accel_state =
+ (struct accel_3d_state *)st->private;
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_buffer_unregister(indio_dev);
+ hid_sensor_cleanup_buffer(indio_dev);
+ iio_free_device(indio_dev);
+
+ kfree(accel_state);
+ return ret;
+}
+
+static struct sensor_hub_callbacks accel_3d_callbacks = {
+ .enter = accel_3d_enter,
+ .exit = accel_3d_exit,
+ .send_event = accel_3d_proc_event,
+ .capture_sample = accel_3d_capture_sample,
+};
+
+struct sensor_hub_callbacks *accel_3d_register_callbacks(void)
+{
+ return &accel_3d_callbacks;
+}
diff --git a/drivers/staging/hid-sensors/hid-sensor-hub.c b/drivers/staging/hid-sensors/hid-sensor-hub.c
index 95de914..a5b90bb 100644
--- a/drivers/staging/hid-sensors/hid-sensor-hub.c
+++ b/drivers/staging/hid-sensors/hid-sensor-hub.c
@@ -60,6 +60,7 @@ struct sensor_hub_callbacks_list {
};
static struct sensor_hub_callbacks_list usage_callbacks[] = {
+ {HID_USAGE_SENSOR_ACCEL_3D, accel_3d_register_callbacks},
{0}
};
diff --git a/drivers/staging/hid-sensors/hid-sensor-interface.h b/drivers/staging/hid-sensors/hid-sensor-interface.h
index ec1bd43..2c7ef9f 100644
--- a/drivers/staging/hid-sensors/hid-sensor-interface.h
+++ b/drivers/staging/hid-sensors/hid-sensor-interface.h
@@ -86,4 +86,7 @@ void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data,
int hid_sensor_setup_trigger(struct iio_dev *indio_dev, char *name);
void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
+/* Sensor usage id processing callbacks */
+struct sensor_hub_callbacks *accel_3d_register_callbacks(void);
+
#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 6/8] HID-Sensors: Added Gyro 3D
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (4 preceding siblings ...)
2012-06-10 1:53 ` [PATCH 5/8] HID-Sensors: Added accelerometer 3D srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 7/8] HID-Sensors: Added Compass 3D srinivas pandruvada
` (3 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, Srinivas pandruvada
From: Srinivas pandruvada <srinivas.pandruvada@intel.com>
Added usage id processing for Gyro 3D. This uses IIO
interfaces "buffer and trigger interface" to present
data to user mode.
Signed-off-by: Srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/hid-sensors/Makefile | 1 +
drivers/staging/hid-sensors/hid-sensor-gyro-3d.c | 375 ++++++++++++++++++++
drivers/staging/hid-sensors/hid-sensor-hub.c | 1 +
drivers/staging/hid-sensors/hid-sensor-interface.h | 1 +
4 files changed, 378 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/hid-sensors/hid-sensor-gyro-3d.c
diff --git a/drivers/staging/hid-sensors/Makefile b/drivers/staging/hid-sensors/Makefile
index 1b86473..9056015 100644
--- a/drivers/staging/hid-sensors/Makefile
+++ b/drivers/staging/hid-sensors/Makefile
@@ -10,4 +10,5 @@ hid-sensors-y += hid-sensor-attributes.o
hid-sensors-y += hid-sensor-buffer.o
hid-sensors-y += hid-sensor-trigger.o
hid-sensors-y += hid-sensor-accel-3d.o
+hid-sensors-y += hid-sensor-gyro-3d.o
obj-$(CONFIG_HID_SENSORS) += hid-sensors.o
diff --git a/drivers/staging/hid-sensors/hid-sensor-gyro-3d.c b/drivers/staging/hid-sensors/hid-sensor-gyro-3d.c
new file mode 100644
index 0000000..f906940
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-gyro-3d.c
@@ -0,0 +1,375 @@
+/*
+ * 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 "iio/iio.h"
+#include "iio/sysfs.h"
+#include "iio/ring_sw.h"
+#include "iio/trigger.h"
+#include "hid-sensor-ids.h"
+#include "hid-sensor-interface.h"
+#include "hid-sensor-attributes.h"
+
+#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_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;
+};
+
+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 hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct gyro_3d_state *gyro_state =
+ (struct gyro_3d_state *)st->private;
+ 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(st->hdev,
+ 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)
+{
+ printk(KERN_ERR "%s\n", __func__);
+
+ return 0;
+}
+
+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,
+};
+
+/* Function to push data to IIO ring */
+int gyro_3d_proc_event(struct hid_device *hdev, unsigned usage_id, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct gyro_3d_state *gyro_state =
+ (struct gyro_3d_state *)st->private;
+
+ hid_dbg(hdev, "gyro_3d_proc_event\n");
+ if (st->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&gyro_state->gyro_sample_data,
+ sizeof(struct gyro_3d_sample));
+ else
+ hid_dbg(hdev, "gyro_3d_proc_event data not ready\n");
+ return 0;
+}
+
+/* Capture samples in local storage */
+int gyro_3d_capture_sample(struct hid_device *hdev, unsigned usage_id,
+ size_t raw_len, char *raw_data, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct gyro_3d_state *gyro_state =
+ (struct gyro_3d_state *)st->private;
+
+ 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_device *hdev, unsigned usage_id,
+ struct gyro_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_X_AXIS,
+ &st->gyro_x);
+ if (!ret)
+ hid_dbg(hdev, "No Gyro X attribute\n");
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->gyro_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Y_AXIS,
+ &st->gyro_y);
+ if (!ret)
+ hid_dbg(hdev, "No Gyro Y attribute\n");
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->gyro_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_MOTION_ANGULAR_VELOCITY_Z_AXIS,
+ &st->gyro_z);
+ if (!ret)
+ hid_dbg(hdev, "No Gyro Z attribute\n");
+ gyro_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->gyro_z.size);
+
+ hid_dbg(hdev, "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_enter(struct hid_device *hdev, unsigned usage_id,
+ void **priv)
+{
+ int ret = 0;
+ static char *name = "gyro_3d";
+ struct iio_dev *indio_dev;
+ struct gyro_3d_state *gyro_state;
+ struct hid_sensor_attributes *st;
+
+ gyro_state = kzalloc(sizeof(struct gyro_3d_state), GFP_KERNEL);
+ if (gyro_state == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ indio_dev = iio_allocate_device(sizeof(struct hid_sensor_attributes));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_free_state;
+ }
+ st = iio_priv(indio_dev);
+ st->usage_id = usage_id;
+ st->hdev = hdev;
+ st->private = (void *)gyro_state;
+
+ ret = hid_sensor_parse_common_attributes(hdev, usage_id, st);
+ if (ret) {
+ hid_err(hdev, "failed to setup common attributes\n");
+ goto error_free_dev;
+ }
+ ret = gyro_3d_parse_report(hdev, usage_id, gyro_state);
+ if (ret) {
+ hid_err(hdev, "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 = &hdev->dev;
+ indio_dev->info = &gyro_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = hid_sensor_configure_buffer(indio_dev);
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_free_dev;
+ }
+
+ ret = iio_buffer_register(indio_dev,
+ gyro_3d_channels,
+ ARRAY_SIZE(gyro_3d_channels));
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_unreg_ring_funcs;
+ }
+ 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);
+ st->data_ready = true;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ hid_err(hdev, "trigger setup failed\n");
+ goto error_uninit_ring;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ hid_err(hdev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ *priv = (void *)indio_dev;
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_uninit_ring:
+ iio_buffer_unregister(indio_dev);
+error_unreg_ring_funcs:
+ hid_sensor_cleanup_buffer(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_free_state:
+ kfree(gyro_state);
+error_ret:
+ return ret;
+}
+
+static int gyro_3d_exit(struct hid_device *hdev, void *priv)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct gyro_3d_state *gyro_state =
+ (struct gyro_3d_state *)st->private;
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_buffer_unregister(indio_dev);
+ hid_sensor_cleanup_buffer(indio_dev);
+ iio_free_device(indio_dev);
+
+ kfree(gyro_state);
+ return ret;
+}
+
+static struct sensor_hub_callbacks gyro_3d_callbacks = {
+ .enter = gyro_3d_enter,
+ .exit = gyro_3d_exit,
+ .send_event = gyro_3d_proc_event,
+ .capture_sample = gyro_3d_capture_sample,
+};
+
+struct sensor_hub_callbacks *gyro_3d_register_callbacks(void)
+{
+ return &gyro_3d_callbacks;
+}
diff --git a/drivers/staging/hid-sensors/hid-sensor-hub.c b/drivers/staging/hid-sensors/hid-sensor-hub.c
index a5b90bb..21ca1d9 100644
--- a/drivers/staging/hid-sensors/hid-sensor-hub.c
+++ b/drivers/staging/hid-sensors/hid-sensor-hub.c
@@ -61,6 +61,7 @@ struct sensor_hub_callbacks_list {
static struct sensor_hub_callbacks_list usage_callbacks[] = {
{HID_USAGE_SENSOR_ACCEL_3D, accel_3d_register_callbacks},
+ {HID_USAGE_SENSOR_GYRO_3D, gyro_3d_register_callbacks},
{0}
};
diff --git a/drivers/staging/hid-sensors/hid-sensor-interface.h b/drivers/staging/hid-sensors/hid-sensor-interface.h
index 2c7ef9f..92589ba 100644
--- a/drivers/staging/hid-sensors/hid-sensor-interface.h
+++ b/drivers/staging/hid-sensors/hid-sensor-interface.h
@@ -88,5 +88,6 @@ void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
/* Sensor usage id processing callbacks */
struct sensor_hub_callbacks *accel_3d_register_callbacks(void);
+struct sensor_hub_callbacks *gyro_3d_register_callbacks(void);
#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 7/8] HID-Sensors: Added Compass 3D
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (5 preceding siblings ...)
2012-06-10 1:53 ` [PATCH 6/8] HID-Sensors: Added Gyro 3D srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-10 1:53 ` [PATCH 8/8] HID-Sensors: Added ALS srinivas pandruvada
` (2 subsequent siblings)
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, Srinivas pandruvada
From: Srinivas pandruvada <srinivas.pandruvada@intel.com>
Added usage id processing for Compass 3D. This uses IIO
interfaces "buffer and trigger interface" to present
data to user mode.
Signed-off-by: Srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/hid-sensors/Makefile | 1 +
.../staging/hid-sensors/hid-sensor-compass-3d.c | 375 ++++++++++++++++++++
drivers/staging/hid-sensors/hid-sensor-hub.c | 1 +
drivers/staging/hid-sensors/hid-sensor-interface.h | 1 +
4 files changed, 378 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/hid-sensors/hid-sensor-compass-3d.c
diff --git a/drivers/staging/hid-sensors/Makefile b/drivers/staging/hid-sensors/Makefile
index 9056015..f78fcf6 100644
--- a/drivers/staging/hid-sensors/Makefile
+++ b/drivers/staging/hid-sensors/Makefile
@@ -11,4 +11,5 @@ hid-sensors-y += hid-sensor-buffer.o
hid-sensors-y += hid-sensor-trigger.o
hid-sensors-y += hid-sensor-accel-3d.o
hid-sensors-y += hid-sensor-gyro-3d.o
+hid-sensors-y += hid-sensor-compass-3d.o
obj-$(CONFIG_HID_SENSORS) += hid-sensors.o
diff --git a/drivers/staging/hid-sensors/hid-sensor-compass-3d.c b/drivers/staging/hid-sensors/hid-sensor-compass-3d.c
new file mode 100644
index 0000000..1786cd7
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-compass-3d.c
@@ -0,0 +1,375 @@
+/*
+ * 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 "iio/iio.h"
+#include "iio/sysfs.h"
+#include "iio/ring_sw.h"
+#include "iio/trigger.h"
+#include "hid-sensor-ids.h"
+#include "hid-sensor-interface.h"
+#include "hid-sensor-attributes.h"
+
+#define CHANNEL_SCAN_INDEX_X 0
+#define CHANNEL_SCAN_INDEX_Y 1
+#define CHANNEL_SCAN_INDEX_Z 2
+
+struct compass_3d_sample {
+ u32 compass_x;
+ u32 compass_y;
+ u32 compass_z;
+} __packed;
+
+struct compass_3d_state {
+ struct hid_sensor_hub_attribute_info compass_x;
+ struct hid_sensor_hub_attribute_info compass_y;
+ struct hid_sensor_hub_attribute_info compass_z;
+ struct compass_3d_sample compass_sample_data;
+};
+
+static struct iio_chan_spec compass_3d_channels[] = {
+ {
+ .type = IIO_MAGN,
+ .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_MAGN,
+ .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_MAGN,
+ .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 compass_3d_adjust_channel_bit_mask(int channel, int size)
+{
+ compass_3d_channels[channel].scan_type.sign = 's';
+ compass_3d_channels[channel].scan_type.realbits = size * 8;
+ compass_3d_channels[channel].scan_type.storagebits = sizeof(u32) * 8;
+}
+
+static int compass_3d_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct compass_3d_state *compass_state =
+ (struct compass_3d_state *)st->private;
+ 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 = compass_state->compass_x.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_X_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Y:
+ report_id = compass_state->compass_y.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Y_AXIS;
+ break;
+ case CHANNEL_SCAN_INDEX_Z:
+ report_id = compass_state->compass_z.report_id;
+ address =
+ HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Z_AXIS;
+ break;
+ default:
+ report_id = -1;
+ break;
+ }
+ if (report_id >= 0)
+ *val = sensor_hub_input_attr_get_raw_value(st->hdev,
+ HID_USAGE_SENSOR_COMPASS_3D, address,
+ report_id);
+ else
+ *val = 0;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = compass_state->compass_x.units;
+ break;
+ case IIO_CHAN_INFO_OFFSET:
+ *val = compass_state->compass_x.unit_expo;
+ break;
+ default:
+ break;
+
+ }
+ return IIO_VAL_INT;
+}
+
+static int compass_3d_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ printk(KERN_ERR "%s\n", __func__);
+
+ return 0;
+}
+
+static struct attribute *compass_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 compass_3d_attribute_group = {
+ .attrs = compass_3d_attributes,
+};
+
+static const struct iio_info compass_3d_info = {
+ .attrs = &compass_3d_attribute_group,
+ .driver_module = THIS_MODULE,
+ .read_raw = &compass_3d_read_raw,
+ .write_raw = &compass_3d_write_raw,
+};
+
+/* Function to push data to IIO ring */
+int compass_3d_proc_event(struct hid_device *hdev, unsigned usage_id, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct compass_3d_state *compass_state =
+ (struct compass_3d_state *)st->private;
+
+ hid_dbg(hdev, "compass_3d_proc_event\n");
+ if (st->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&compass_state->compass_sample_data,
+ sizeof(struct compass_3d_sample));
+ else
+ hid_dbg(hdev, "compass_3d_proc_event data not ready\n");
+ return 0;
+}
+
+/* Capture samples in local storage */
+int compass_3d_capture_sample(struct hid_device *hdev, unsigned usage_id,
+ size_t raw_len, char *raw_data, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct compass_3d_state *compass_state =
+ (struct compass_3d_state *)st->private;
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_X_AXIS:
+ compass_state->compass_sample_data.compass_x =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Y_AXIS:
+ compass_state->compass_sample_data.compass_y =
+ *(u32 *)raw_data;
+ break;
+ case HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Z_AXIS:
+ compass_state->compass_sample_data.compass_z =
+ *(u32 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int compass_3d_parse_report(struct hid_device *hdev, unsigned usage_id,
+ struct compass_3d_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_X_AXIS,
+ &st->compass_x);
+ if (!ret)
+ hid_dbg(hdev, "No Compass X attribute\n");
+ compass_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_X,
+ st->compass_x.size);
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Y_AXIS,
+ &st->compass_y);
+ if (!ret)
+ hid_dbg(hdev, "No Compass Y attribute\n");
+ compass_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Y,
+ st->compass_y.size);
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_ORIENTATION_MAGNETIC_FLUX_Z_AXIS,
+ &st->compass_z);
+ if (!ret)
+ hid_dbg(hdev, "No Compass Z attribute\n");
+ compass_3d_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_Z,
+ st->compass_z.size);
+
+ hid_dbg(hdev, "compass_3d %x:%x, %x:%x, %x:%x\n", st->compass_x.index,
+ st->compass_x.report_id,
+ st->compass_y.index, st->compass_y.report_id,
+ st->compass_z.index, st->compass_z.report_id);
+
+ return 0;
+}
+
+/* Entry function to initialize the processing for usage id */
+static int compass_3d_enter(struct hid_device *hdev, unsigned usage_id,
+ void **priv)
+{
+ int ret = 0;
+ static char *name = "compass_3d";
+ struct iio_dev *indio_dev;
+ struct compass_3d_state *compass_state;
+ struct hid_sensor_attributes *st;
+
+ compass_state = kzalloc(sizeof(struct compass_3d_state), GFP_KERNEL);
+ if (compass_state == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ indio_dev = iio_allocate_device(sizeof(struct hid_sensor_attributes));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_free_state;
+ }
+ st = iio_priv(indio_dev);
+ st->usage_id = usage_id;
+ st->hdev = hdev;
+ st->private = (void *)compass_state;
+
+ ret = hid_sensor_parse_common_attributes(hdev, usage_id, st);
+ if (ret) {
+ hid_err(hdev, "failed to setup common attributes\n");
+ goto error_free_dev;
+ }
+ ret = compass_3d_parse_report(hdev, usage_id, compass_state);
+ if (ret) {
+ hid_err(hdev, "failed to setup attributes\n");
+ goto error_free_dev;
+ }
+
+ indio_dev->channels = compass_3d_channels;
+ indio_dev->num_channels =
+ ARRAY_SIZE(compass_3d_channels);
+ indio_dev->dev.parent = &hdev->dev;
+ indio_dev->info = &compass_3d_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = hid_sensor_configure_buffer(indio_dev);
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_free_dev;
+ }
+
+ ret = iio_buffer_register(indio_dev,
+ compass_3d_channels,
+ ARRAY_SIZE(compass_3d_channels));
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_unreg_ring_funcs;
+ }
+ 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);
+ st->data_ready = true;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ hid_err(hdev, "trigger setup failed\n");
+ goto error_uninit_ring;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ hid_err(hdev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ *priv = (void *)indio_dev;
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_uninit_ring:
+ iio_buffer_unregister(indio_dev);
+error_unreg_ring_funcs:
+ hid_sensor_cleanup_buffer(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_free_state:
+ kfree(compass_state);
+error_ret:
+ return ret;
+}
+
+static int compass_3d_exit(struct hid_device *hdev, void *priv)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct compass_3d_state *compass_state =
+ (struct compass_3d_state *)st->private;
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_buffer_unregister(indio_dev);
+ hid_sensor_cleanup_buffer(indio_dev);
+ iio_free_device(indio_dev);
+
+ kfree(compass_state);
+ return ret;
+}
+
+static struct sensor_hub_callbacks compass_3d_callbacks = {
+ .enter = compass_3d_enter,
+ .exit = compass_3d_exit,
+ .send_event = compass_3d_proc_event,
+ .capture_sample = compass_3d_capture_sample,
+};
+
+struct sensor_hub_callbacks *compass_3d_register_callbacks(void)
+{
+ return &compass_3d_callbacks;
+}
diff --git a/drivers/staging/hid-sensors/hid-sensor-hub.c b/drivers/staging/hid-sensors/hid-sensor-hub.c
index 21ca1d9..3fad890 100644
--- a/drivers/staging/hid-sensors/hid-sensor-hub.c
+++ b/drivers/staging/hid-sensors/hid-sensor-hub.c
@@ -62,6 +62,7 @@ struct sensor_hub_callbacks_list {
static struct sensor_hub_callbacks_list usage_callbacks[] = {
{HID_USAGE_SENSOR_ACCEL_3D, accel_3d_register_callbacks},
{HID_USAGE_SENSOR_GYRO_3D, gyro_3d_register_callbacks},
+ {HID_USAGE_SENSOR_COMPASS_3D, compass_3d_register_callbacks},
{0}
};
diff --git a/drivers/staging/hid-sensors/hid-sensor-interface.h b/drivers/staging/hid-sensors/hid-sensor-interface.h
index 92589ba..d7da165 100644
--- a/drivers/staging/hid-sensors/hid-sensor-interface.h
+++ b/drivers/staging/hid-sensors/hid-sensor-interface.h
@@ -89,5 +89,6 @@ void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
/* Sensor usage id processing callbacks */
struct sensor_hub_callbacks *accel_3d_register_callbacks(void);
struct sensor_hub_callbacks *gyro_3d_register_callbacks(void);
+struct sensor_hub_callbacks *compass_3d_register_callbacks(void);
#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 8/8] HID-Sensors: Added ALS
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (6 preceding siblings ...)
2012-06-10 1:53 ` [PATCH 7/8] HID-Sensors: Added Compass 3D srinivas pandruvada
@ 2012-06-10 1:53 ` srinivas pandruvada
2012-06-14 13:08 ` [PATCH 0/8] HID-Sensor: v2 Jiri Kosina
2012-06-15 13:12 ` Jonathan Cameron
9 siblings, 0 replies; 28+ messages in thread
From: srinivas pandruvada @ 2012-06-10 1:53 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Jiri Kosina, Srinivas pandruvada
From: Srinivas pandruvada <srinivas.pandruvada@intel.com>
Added usage id processing for ALS. This uses IIO
interfaces "ring/buffer and trigger interface" to present
data to user mode.
Signed-off-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
---
drivers/staging/hid-sensors/Makefile | 1 +
drivers/staging/hid-sensors/hid-sensor-als.c | 313 ++++++++++++++++++++
drivers/staging/hid-sensors/hid-sensor-hub.c | 1 +
drivers/staging/hid-sensors/hid-sensor-interface.h | 1 +
4 files changed, 316 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/hid-sensors/hid-sensor-als.c
diff --git a/drivers/staging/hid-sensors/Makefile b/drivers/staging/hid-sensors/Makefile
index f78fcf6..2d7d296 100644
--- a/drivers/staging/hid-sensors/Makefile
+++ b/drivers/staging/hid-sensors/Makefile
@@ -12,4 +12,5 @@ hid-sensors-y += hid-sensor-trigger.o
hid-sensors-y += hid-sensor-accel-3d.o
hid-sensors-y += hid-sensor-gyro-3d.o
hid-sensors-y += hid-sensor-compass-3d.o
+hid-sensors-y += hid-sensor-als.o
obj-$(CONFIG_HID_SENSORS) += hid-sensors.o
diff --git a/drivers/staging/hid-sensors/hid-sensor-als.c b/drivers/staging/hid-sensors/hid-sensor-als.c
new file mode 100644
index 0000000..6b89b20
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-als.c
@@ -0,0 +1,313 @@
+/*
+ * 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 "iio/iio.h"
+#include "iio/sysfs.h"
+#include "iio/ring_sw.h"
+#include "iio/trigger.h"
+#include "hid-sensor-ids.h"
+#include "hid-sensor-interface.h"
+#include "hid-sensor-attributes.h"
+
+#define CHANNEL_SCAN_INDEX_ILLUM 0
+
+struct als_sample {
+ u16 illum;
+};
+
+struct als_state {
+ struct hid_sensor_hub_attribute_info als_illum;
+ struct als_sample als_sample_data;
+};
+
+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 hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct als_state *als_state =
+ (struct als_state *)st->private;
+ 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(st->hdev,
+ 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)
+{
+ printk(KERN_ERR "%s\n", __func__);
+
+ return 0;
+}
+
+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,
+};
+
+/* Function to push data to IIO ring */
+int als_proc_event(struct hid_device *hdev, unsigned usage_id, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct als_state *als_state =
+ (struct als_state *)st->private;
+
+ hid_dbg(hdev, "als_proc_event\n");
+ if (st->data_ready)
+ hid_sensor_push_data(indio_dev,
+ (u8 *)&als_state->als_sample_data,
+ sizeof(struct als_sample));
+ else
+ hid_dbg(hdev, "als_proc_event data not ready\n");
+ return 0;
+}
+
+/* Capture samples in local storage */
+int als_capture_sample(struct hid_device *hdev, unsigned usage_id,
+ size_t raw_len, char *raw_data, void *priv)
+{
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct als_state *als_state =
+ (struct als_state *)st->private;
+
+ switch (usage_id) {
+ case HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE:
+ als_state->als_sample_data.illum =
+ *(u32 *)raw_data;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+/* Parse report which is specific to an usage id*/
+static int als_parse_report(struct hid_device *hdev, unsigned usage_id,
+ struct als_state *st)
+{
+ int ret;
+
+ ret = sensor_hub_input_get_attribute_info(hdev, HID_INPUT_REPORT,
+ usage_id,
+ HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE,
+ &st->als_illum);
+ if (!ret)
+ hid_dbg(hdev, "No Accel X attribute\n");
+ als_adjust_channel_bit_mask(CHANNEL_SCAN_INDEX_ILLUM,
+ st->als_illum.size);
+
+ hid_dbg(hdev, "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_enter(struct hid_device *hdev, unsigned usage_id,
+ void **priv)
+{
+ int ret = 0;
+ static char *name = "als";
+ struct iio_dev *indio_dev;
+ struct als_state *als_state;
+ struct hid_sensor_attributes *st;
+
+ als_state = kzalloc(sizeof(struct als_state), GFP_KERNEL);
+ if (als_state == NULL) {
+ ret = -ENOMEM;
+ goto error_ret;
+ }
+
+ indio_dev = iio_allocate_device(sizeof(struct hid_sensor_attributes));
+ if (indio_dev == NULL) {
+ ret = -ENOMEM;
+ goto error_free_state;
+ }
+ st = iio_priv(indio_dev);
+ st->usage_id = usage_id;
+ st->hdev = hdev;
+ st->private = (void *)als_state;
+
+ ret = hid_sensor_parse_common_attributes(hdev, usage_id, st);
+ if (ret) {
+ hid_err(hdev, "failed to setup common attributes\n");
+ goto error_free_dev;
+ }
+ ret = als_parse_report(hdev, usage_id, als_state);
+ if (ret) {
+ hid_err(hdev, "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 = &hdev->dev;
+ indio_dev->info = &als_info;
+ indio_dev->name = name;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = hid_sensor_configure_buffer(indio_dev);
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_free_dev;
+ }
+
+ ret = iio_buffer_register(indio_dev,
+ als_channels,
+ ARRAY_SIZE(als_channels));
+ if (ret) {
+ hid_err(hdev, "failed to initialize the ring\n");
+ goto error_unreg_ring_funcs;
+ }
+ iio_scan_mask_set(indio_dev, indio_dev->buffer,
+ CHANNEL_SCAN_INDEX_ILLUM);
+ st->data_ready = true;
+ ret = hid_sensor_setup_trigger(indio_dev, name);
+ if (ret < 0) {
+ hid_err(hdev, "trigger setup failed\n");
+ goto error_uninit_ring;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret) {
+ hid_err(hdev, "device register failed\n");
+ goto error_remove_trigger;
+ }
+ *priv = (void *)indio_dev;
+ return ret;
+
+error_remove_trigger:
+ hid_sensor_remove_trigger(indio_dev);
+error_uninit_ring:
+ iio_buffer_unregister(indio_dev);
+error_unreg_ring_funcs:
+ hid_sensor_cleanup_buffer(indio_dev);
+error_free_dev:
+ iio_free_device(indio_dev);
+error_free_state:
+ kfree(als_state);
+error_ret:
+ return ret;
+}
+
+static int als_exit(struct hid_device *hdev, void *priv)
+{
+ int ret = 0;
+ struct iio_dev *indio_dev = (struct iio_dev *)priv;
+ struct hid_sensor_attributes *st = iio_priv(indio_dev);
+ struct als_state *als_state =
+ (struct als_state *)st->private;
+
+ iio_device_unregister(indio_dev);
+ hid_sensor_remove_trigger(indio_dev);
+ iio_buffer_unregister(indio_dev);
+ hid_sensor_cleanup_buffer(indio_dev);
+ iio_free_device(indio_dev);
+
+ kfree(als_state);
+ return ret;
+}
+
+static struct sensor_hub_callbacks als_callbacks = {
+ .enter = als_enter,
+ .exit = als_exit,
+ .send_event = als_proc_event,
+ .capture_sample = als_capture_sample,
+};
+
+struct sensor_hub_callbacks *als_register_callbacks(void)
+{
+ return &als_callbacks;
+}
diff --git a/drivers/staging/hid-sensors/hid-sensor-hub.c b/drivers/staging/hid-sensors/hid-sensor-hub.c
index 3fad890..d838e25 100644
--- a/drivers/staging/hid-sensors/hid-sensor-hub.c
+++ b/drivers/staging/hid-sensors/hid-sensor-hub.c
@@ -63,6 +63,7 @@ static struct sensor_hub_callbacks_list usage_callbacks[] = {
{HID_USAGE_SENSOR_ACCEL_3D, accel_3d_register_callbacks},
{HID_USAGE_SENSOR_GYRO_3D, gyro_3d_register_callbacks},
{HID_USAGE_SENSOR_COMPASS_3D, compass_3d_register_callbacks},
+ {HID_USAGE_SENSOR_ALS, als_register_callbacks},
{0}
};
diff --git a/drivers/staging/hid-sensors/hid-sensor-interface.h b/drivers/staging/hid-sensors/hid-sensor-interface.h
index d7da165..56d860b 100644
--- a/drivers/staging/hid-sensors/hid-sensor-interface.h
+++ b/drivers/staging/hid-sensors/hid-sensor-interface.h
@@ -90,5 +90,6 @@ void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
struct sensor_hub_callbacks *accel_3d_register_callbacks(void);
struct sensor_hub_callbacks *gyro_3d_register_callbacks(void);
struct sensor_hub_callbacks *compass_3d_register_callbacks(void);
+struct sensor_hub_callbacks *als_register_callbacks(void);
#endif
--
1.7.7.6
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (7 preceding siblings ...)
2012-06-10 1:53 ` [PATCH 8/8] HID-Sensors: Added ALS srinivas pandruvada
@ 2012-06-14 13:08 ` Jiri Kosina
2012-06-14 13:12 ` Jonathan Cameron
2012-06-15 13:12 ` Jonathan Cameron
9 siblings, 1 reply; 28+ messages in thread
From: Jiri Kosina @ 2012-06-14 13:08 UTC (permalink / raw)
To: srinivas pandruvada; +Cc: linux-iio, Jonathan Cameron
On Sat, 9 Jun 2012, srinivas pandruvada wrote:
> Submitting v2.
> Changes compared to version 1:
>
> - Replaced Ring-SW with KFiFO
> - Accel-3d, Gyro-3D and Compass-3D uses 3 different channels for X, Y and Z
> - SysFS (
> --- Changed "polling_interval" to sampling_frequency (IIO_DEV_ATTR_SAMP_FREQ) with units HZ
> --- Changed "sensitivity" to hyst_raw, which is already used by some ADC modules
> --- Removed "Activate". No longer need this. Using trigger state to activate/deactivate
> )
> - Removed sysfs attributes for "xxx_offset". Instead using mask 0 in read_raw. So each
> sensor have only channels, sampling_frequency and hyst_raw as the ABI.
> - Additional patch to enable ST Micro sensor hub
>
> TBD for v3
> - Use Lars-Peter's patch: "v2 1/9 patch: Add helper function for initialize trigger buffers). Want to make sure
> that API is final.
>
> DATA Format examples:
> Had few questions on data format for floating point. This spec uses.
> - First of size of each field is specified in report descriptor. So it is variable
> - It uses VT_F16Ex format. For example VTF16E0 means 16 bit float with unit exponent 0.
> Refer to Page 43 of the "HID Sensor Usage Table"
> For example, if the size is 16 bits
> 0xFFF4 with VTF16E14 format -> -0.12
> 0xFFF8 with VTF16E14 format -> -0.08
> 0x0067 with VTF16E14 format -> +1.03
>
> I tried sensor hubs from two different makers. One use 16 bit and other uses 32 bit for accelerometer.
> Also the unit expo is different for them. Also units are different.
>
> Possible IIO addition:
> I wish we can add two more items for unit and unit_expo in IIO_CHAN_INFO_XXXX. So that we can add
> them during channel definition. Currently I am using offset and scale, which doesn't actually mean
> this. I think conversion should be done is user space based on the info provided.
Thanks for your work on this.
As this is however a staging driver (and depends on IIO, which is a
staging infrastructure), I suggest you resend the patch to staging
maintainers so that it gets applied and we can work on polishing the
driver there.
Also, what are the plans regarding moving IIO out of staging, please?
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-14 13:08 ` [PATCH 0/8] HID-Sensor: v2 Jiri Kosina
@ 2012-06-14 13:12 ` Jonathan Cameron
2012-06-14 13:25 ` Jiri Kosina
0 siblings, 1 reply; 28+ messages in thread
From: Jonathan Cameron @ 2012-06-14 13:12 UTC (permalink / raw)
To: Jiri Kosina; +Cc: srinivas pandruvada, linux-iio, Jonathan Cameron
On 6/14/2012 2:08 PM, Jiri Kosina wrote:
> On Sat, 9 Jun 2012, srinivas pandruvada wrote:
>
>> Submitting v2.
>> Changes compared to version 1:
>>
>> - Replaced Ring-SW with KFiFO
>> - Accel-3d, Gyro-3D and Compass-3D uses 3 different channels for X, Y and Z
>> - SysFS (
>> --- Changed "polling_interval" to sampling_frequency (IIO_DEV_ATTR_SAMP_FREQ) with units HZ
>> --- Changed "sensitivity" to hyst_raw, which is already used by some ADC modules
>> --- Removed "Activate". No longer need this. Using trigger state to activate/deactivate
>> )
>> - Removed sysfs attributes for "xxx_offset". Instead using mask 0 in read_raw. So each
>> sensor have only channels, sampling_frequency and hyst_raw as the ABI.
>> - Additional patch to enable ST Micro sensor hub
>>
>> TBD for v3
>> - Use Lars-Peter's patch: "v2 1/9 patch: Add helper function for initialize trigger buffers). Want to make sure
>> that API is final.
>>
>> DATA Format examples:
>> Had few questions on data format for floating point. This spec uses.
>> - First of size of each field is specified in report descriptor. So it is variable
>> - It uses VT_F16Ex format. For example VTF16E0 means 16 bit float with unit exponent 0.
>> Refer to Page 43 of the "HID Sensor Usage Table"
>> For example, if the size is 16 bits
>> 0xFFF4 with VTF16E14 format -> -0.12
>> 0xFFF8 with VTF16E14 format -> -0.08
>> 0x0067 with VTF16E14 format -> +1.03
>>
>> I tried sensor hubs from two different makers. One use 16 bit and other uses 32 bit for accelerometer.
>> Also the unit expo is different for them. Also units are different.
>>
>> Possible IIO addition:
>> I wish we can add two more items for unit and unit_expo in IIO_CHAN_INFO_XXXX. So that we can add
>> them during channel definition. Currently I am using offset and scale, which doesn't actually mean
>> this. I think conversion should be done is user space based on the info provided.
>
> Thanks for your work on this.
>
> As this is however a staging driver (and depends on IIO, which is a
> staging infrastructure), I suggest you resend the patch to staging
> maintainers so that it gets applied and we can work on polishing the
> driver there.
> Also, what are the plans regarding moving IIO out of staging, please?
The core is out of staging as of the current cycle. Drivers are moving
out whenever someone has time to take a look at each one and clean
up any loose ends. A couple went with the last merge window, lots
more a queued up for the next one.
Generally any new drivers shouldn't go into staging but directly
into drivers/iio.
Sorry for my lack of responses on this revised version, been a busy
week and it's a fairly big review to do.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-14 13:12 ` Jonathan Cameron
@ 2012-06-14 13:25 ` Jiri Kosina
2012-06-14 13:39 ` Jonathan Cameron
0 siblings, 1 reply; 28+ messages in thread
From: Jiri Kosina @ 2012-06-14 13:25 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: srinivas pandruvada, linux-iio, Jonathan Cameron
On Thu, 14 Jun 2012, Jonathan Cameron wrote:
> > As this is however a staging driver (and depends on IIO, which is a
> > staging infrastructure), I suggest you resend the patch to staging
> > maintainers so that it gets applied and we can work on polishing the
> > driver there.
>
> > Also, what are the plans regarding moving IIO out of staging, please?
> The core is out of staging as of the current cycle.
Ah, you are right, I missed that this has already happened.
> Drivers are moving out whenever someone has time to take a look at each
> one and clean up any loose ends. A couple went with the last merge
> window, lots more a queued up for the next one.
>
> Generally any new drivers shouldn't go into staging but directly
> into drivers/iio.
For hid sensors I'd probably prefer drivers/hid though.
> Sorry for my lack of responses on this revised version, been a busy
> week and it's a fairly big review to do.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-14 13:25 ` Jiri Kosina
@ 2012-06-14 13:39 ` Jonathan Cameron
2012-06-14 15:25 ` Pandruvada, Srinivas
0 siblings, 1 reply; 28+ messages in thread
From: Jonathan Cameron @ 2012-06-14 13:39 UTC (permalink / raw)
To: Jiri Kosina; +Cc: srinivas pandruvada, linux-iio, Jonathan Cameron
On 6/14/2012 2:25 PM, Jiri Kosina wrote:
> On Thu, 14 Jun 2012, Jonathan Cameron wrote:
>
>>> As this is however a staging driver (and depends on IIO, which is a
>>> staging infrastructure), I suggest you resend the patch to staging
>>> maintainers so that it gets applied and we can work on polishing the
>>> driver there.
>>
>>> Also, what are the plans regarding moving IIO out of staging, please?
>> The core is out of staging as of the current cycle.
>
> Ah, you are right, I missed that this has already happened.
>
>> Drivers are moving out whenever someone has time to take a look at each
>> one and clean up any loose ends. A couple went with the last merge
>> window, lots more a queued up for the next one.
>>
>> Generally any new drivers shouldn't go into staging but directly
>> into drivers/iio.
>
> For hid sensors I'd probably prefer drivers/hid though.
There's some pretty strong moves to clasify drivers by function not
by 'bus' (which is kind of what hid is I guess?)
I do wonder if this driver would work better as an mfd type device
with the sensor specific bits each having their own module?
Honestly I've never been much of a stickler for where things are as
long as someone is happy to look after them.
>
>> Sorry for my lack of responses on this revised version, been a busy
>> week and it's a fairly big review to do.
>
> Thanks,
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* RE: [PATCH 0/8] HID-Sensor: v2
2012-06-14 13:39 ` Jonathan Cameron
@ 2012-06-14 15:25 ` Pandruvada, Srinivas
2012-06-14 16:04 ` Jonathan Cameron
2012-06-15 12:50 ` Jonathan Cameron
0 siblings, 2 replies; 28+ messages in thread
From: Pandruvada, Srinivas @ 2012-06-14 15:25 UTC (permalink / raw)
To: Jonathan Cameron, Jiri Kosina; +Cc: linux-iio, Jonathan Cameron
Hi Jonathan and Jiri,
I am in process of implementing as mfd device. In this case I can keep the =
core HID stuff in driver/hid and move sensor implantation using IIO to driv=
ers/iio/hid-sensors.
In this way if some driver if just want to use HID sensor but want to use s=
ome other mechanism to communicate with user mode, they can do in their res=
pective drivers.
What do you think about this approach?
Thanks,
Srinivas
-----Original Message-----
From: Jonathan Cameron [mailto:jic23@cam.ac.uk]=20
Sent: Thursday, June 14, 2012 6:40 AM
To: Jiri Kosina
Cc: Pandruvada, Srinivas; linux-iio@vger.kernel.org; Jonathan Cameron
Subject: Re: [PATCH 0/8] HID-Sensor: v2
On 6/14/2012 2:25 PM, Jiri Kosina wrote:
> On Thu, 14 Jun 2012, Jonathan Cameron wrote:
>
>>> As this is however a staging driver (and depends on IIO, which is a=20
>>> staging infrastructure), I suggest you resend the patch to staging=20
>>> maintainers so that it gets applied and we can work on polishing the=20
>>> driver there.
>>
>>> Also, what are the plans regarding moving IIO out of staging, please?
>> The core is out of staging as of the current cycle.
>
> Ah, you are right, I missed that this has already happened.
>
>> Drivers are moving out whenever someone has time to take a look at=20
>> each one and clean up any loose ends. A couple went with the last=20
>> merge window, lots more a queued up for the next one.
>>
>> Generally any new drivers shouldn't go into staging but directly into=20
>> drivers/iio.
>
> For hid sensors I'd probably prefer drivers/hid though.
There's some pretty strong moves to clasify drivers by function not by 'bus=
' (which is kind of what hid is I guess?)
I do wonder if this driver would work better as an mfd type device with the=
sensor specific bits each having their own module?
Honestly I've never been much of a stickler for where things are as long as=
someone is happy to look after them.
>
>> Sorry for my lack of responses on this revised version, been a busy=20
>> week and it's a fairly big review to do.
>
> Thanks,
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* RE: [PATCH 0/8] HID-Sensor: v2
2012-06-14 15:25 ` Pandruvada, Srinivas
@ 2012-06-14 16:04 ` Jonathan Cameron
2012-06-15 12:50 ` Jonathan Cameron
1 sibling, 0 replies; 28+ messages in thread
From: Jonathan Cameron @ 2012-06-14 16:04 UTC (permalink / raw)
To: Pandruvada, Srinivas, Jiri Kosina; +Cc: linux-iio, Jonathan Cameron
"Pandruvada, Srinivas" <srinivas.pandruvada@intel.com> wrote:
>Hi Jonath=
an and Jiri,
>
>I am in process of implementing as mfd device. In this case=
I can keep
>the core HID stuff in driver/hid and move sensor implantation =
using IIO
>to drivers/iio/hid-sensors.
>In this way if some driver if just =
want to use HID sensor but want to
>use some other mechanism to communicate=
with user mode, they can do in
>their respective drivers.
>
>What do you t=
hink about this approach?
Sounds like a sensible plan. I would put the ind=
ividual drivers in iio/accel and similar though.
>
>Thanks,
>Srinivas
>
>
=
>-----Original Message-----
>From: Jonathan Cameron [mailto:jic23@cam.ac.uk=
]
>Sent: Thursday, June 14, 2012 6:40 AM
>To: Jiri Kosina
>Cc: Pandruvada,=
Srinivas; linux-iio@vger.kernel.org; Jonathan Cameron
>Subject: Re: [PATCH=
0/8] HID-Sensor: v2
>
>On 6/14/2012 2:25 PM, Jiri Kosina wrote:
>> On Thu,=
14 Jun 2012, Jonathan Cameron wrote:
>>
>>>> As this is however a staging =
driver (and depends on IIO, which is a
>
>>>> staging infrastructure), I su=
ggest you resend the patch to staging
>>>> maintainers so that it gets app=
lied and we can work on polishing
>the
>>>> driver there.
>>>
>>>> Also, w=
hat are the plans regarding moving IIO out of staging,
>please?
>>> The cor=
e is out of staging as of the current cycle.
>>
>> Ah, you are right, I mis=
sed that this has already happened.
>>
>>> Drivers are moving out whenever =
someone has time to take a look at
>>> each one and clean up any loose end=
s. A couple went with the last
>>> merge window, lots more a queued up fo=
r the next one.
>>>
>>> Generally any new drivers shouldn't go into staging=
but directly
>into
>>> drivers/iio.
>>
>> For hid sensors I'd probably pr=
efer drivers/hid though.
>There's some pretty strong moves to clasify drive=
rs by function not by
>'bus' (which is kind of what hid is I guess?)
>
>I d=
o wonder if this driver would work better as an mfd type device with
>the s=
ensor specific bits each having their own module?
>
>Honestly I've never be=
en much of a stickler for where things are as
>long as someone is happy to =
look after them.
>>
>>> Sorry for my lack of responses on this revised vers=
ion, been a busy
>>> week and it's a fairly big review to do.
>>
>> Thanks=
,
>>
--
Sent from my Android phone with K-9 Mail. Please excuse my brevit=
y.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-14 15:25 ` Pandruvada, Srinivas
2012-06-14 16:04 ` Jonathan Cameron
@ 2012-06-15 12:50 ` Jonathan Cameron
2012-06-15 15:27 ` Pandruvada, Srinivas
1 sibling, 1 reply; 28+ messages in thread
From: Jonathan Cameron @ 2012-06-15 12:50 UTC (permalink / raw)
To: Pandruvada, Srinivas; +Cc: Jiri Kosina, linux-iio, Jonathan Cameron
Srinivas,
shall I hold off reviewing until your next version?
Might be a little while longer before I get to it either way!
>
> I am in process of implementing as mfd device. In this case I can keep the core HID stuff in driver/hid and move sensor implantation using IIO to drivers/iio/hid-sensors.
> In this way if some driver if just want to use HID sensor but want to use some other mechanism to communicate with user mode, they can do in their respective drivers.
>
> What do you think about this approach?
>
> Thanks,
> Srinivas
>
>
> -----Original Message-----
> From: Jonathan Cameron [mailto:jic23@cam.ac.uk]
> Sent: Thursday, June 14, 2012 6:40 AM
> To: Jiri Kosina
> Cc: Pandruvada, Srinivas; linux-iio@vger.kernel.org; Jonathan Cameron
> Subject: Re: [PATCH 0/8] HID-Sensor: v2
>
> On 6/14/2012 2:25 PM, Jiri Kosina wrote:
>> On Thu, 14 Jun 2012, Jonathan Cameron wrote:
>>
>>>> As this is however a staging driver (and depends on IIO, which is a
>>>> staging infrastructure), I suggest you resend the patch to staging
>>>> maintainers so that it gets applied and we can work on polishing the
>>>> driver there.
>>>
>>>> Also, what are the plans regarding moving IIO out of staging, please?
>>> The core is out of staging as of the current cycle.
>>
>> Ah, you are right, I missed that this has already happened.
>>
>>> Drivers are moving out whenever someone has time to take a look at
>>> each one and clean up any loose ends. A couple went with the last
>>> merge window, lots more a queued up for the next one.
>>>
>>> Generally any new drivers shouldn't go into staging but directly into
>>> drivers/iio.
>>
>> For hid sensors I'd probably prefer drivers/hid though.
> There's some pretty strong moves to clasify drivers by function not by 'bus' (which is kind of what hid is I guess?)
>
> I do wonder if this driver would work better as an mfd type device with the sensor specific bits each having their own module?
>
> Honestly I've never been much of a stickler for where things are as long as someone is happy to look after them.
>>
>>> Sorry for my lack of responses on this revised version, been a busy
>>> week and it's a fairly big review to do.
>>
>> Thanks,
>>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* RE: [PATCH 0/8] HID-Sensor: v2
2012-06-15 12:50 ` Jonathan Cameron
@ 2012-06-15 15:27 ` Pandruvada, Srinivas
0 siblings, 0 replies; 28+ messages in thread
From: Pandruvada, Srinivas @ 2012-06-15 15:27 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Jiri Kosina, linux-iio, Jonathan Cameron
HI Jonathan,
It is better to hold off till I submit a version using mfd framework.
Thanks,
Srinivas
-----Original Message-----
From: Jonathan Cameron [mailto:jic23@cam.ac.uk]=20
Sent: Friday, June 15, 2012 5:50 AM
To: Pandruvada, Srinivas
Cc: Jiri Kosina; linux-iio@vger.kernel.org; Jonathan Cameron
Subject: Re: [PATCH 0/8] HID-Sensor: v2
Srinivas,
shall I hold off reviewing until your next version?
Might be a little while longer before I get to it either way!
>
> I am in process of implementing as mfd device. In this case I can keep th=
e core HID stuff in driver/hid and move sensor implantation using IIO to dr=
ivers/iio/hid-sensors.
> In this way if some driver if just want to use HID sensor but want to use=
some other mechanism to communicate with user mode, they can do in their r=
espective drivers.
>
> What do you think about this approach?
>
> Thanks,
> Srinivas
>
>
> -----Original Message-----
> From: Jonathan Cameron [mailto:jic23@cam.ac.uk]
> Sent: Thursday, June 14, 2012 6:40 AM
> To: Jiri Kosina
> Cc: Pandruvada, Srinivas; linux-iio@vger.kernel.org; Jonathan Cameron
> Subject: Re: [PATCH 0/8] HID-Sensor: v2
>
> On 6/14/2012 2:25 PM, Jiri Kosina wrote:
>> On Thu, 14 Jun 2012, Jonathan Cameron wrote:
>>
>>>> As this is however a staging driver (and depends on IIO, which is a=20
>>>> staging infrastructure), I suggest you resend the patch to staging=20
>>>> maintainers so that it gets applied and we can work on polishing=20
>>>> the driver there.
>>>
>>>> Also, what are the plans regarding moving IIO out of staging, please?
>>> The core is out of staging as of the current cycle.
>>
>> Ah, you are right, I missed that this has already happened.
>>
>>> Drivers are moving out whenever someone has time to take a look at=20
>>> each one and clean up any loose ends. A couple went with the last=20
>>> merge window, lots more a queued up for the next one.
>>>
>>> Generally any new drivers shouldn't go into staging but directly=20
>>> into drivers/iio.
>>
>> For hid sensors I'd probably prefer drivers/hid though.
> There's some pretty strong moves to clasify drivers by function not by=20
> 'bus' (which is kind of what hid is I guess?)
>
> I do wonder if this driver would work better as an mfd type device with t=
he sensor specific bits each having their own module?
>
> Honestly I've never been much of a stickler for where things are as long =
as someone is happy to look after them.
>>
>>> Sorry for my lack of responses on this revised version, been a busy=20
>>> week and it's a fairly big review to do.
>>
>> Thanks,
>>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-10 1:53 [PATCH 0/8] HID-Sensor: v2 srinivas pandruvada
` (8 preceding siblings ...)
2012-06-14 13:08 ` [PATCH 0/8] HID-Sensor: v2 Jiri Kosina
@ 2012-06-15 13:12 ` Jonathan Cameron
2012-06-15 15:31 ` Pandruvada, Srinivas
9 siblings, 1 reply; 28+ messages in thread
From: Jonathan Cameron @ 2012-06-15 13:12 UTC (permalink / raw)
To: srinivas pandruvada; +Cc: linux-iio, Jiri Kosina
On 6/10/2012 2:53 AM, srinivas pandruvada wrote:
> Submitting v2.
> Changes compared to version 1:
>
> - Replaced Ring-SW with KFiFO
> - Accel-3d, Gyro-3D and Compass-3D uses 3 different channels for X, Y and Z
> - SysFS (
> --- Changed "polling_interval" to sampling_frequency (IIO_DEV_ATTR_SAMP_FREQ) with units HZ
> --- Changed "sensitivity" to hyst_raw, which is already used by some ADC modules
> --- Removed "Activate". No longer need this. Using trigger state to activate/deactivate
> )
> - Removed sysfs attributes for "xxx_offset". Instead using mask 0 in read_raw. So each
> sensor have only channels, sampling_frequency and hyst_raw as the ABI.
> - Additional patch to enable ST Micro sensor hub
>
> TBD for v3
> - Use Lars-Peter's patch: "v2 1/9 patch: Add helper function for initialize trigger buffers). Want to make sure
> that API is final.
>
> DATA Format examples:
> Had few questions on data format for floating point. This spec uses.
> - First of size of each field is specified in report descriptor. So it is variable
yuk. Thats annoying. I guess we'll have to extend the scan_type bit of
IIO_CHAN to include this.
> - It uses VT_F16Ex format. For example VTF16E0 means 16 bit float with unit exponent 0.
> Refer to Page 43 of the "HID Sensor Usage Table"
> For example, if the size is 16 bits
> 0xFFF4 with VTF16E14 format -> -0.12
> 0xFFF8 with VTF16E14 format -> -0.08
> 0x0067 with VTF16E14 format -> +1.03
>
> I tried sensor hubs from two different makers. One use 16 bit and other uses 32 bit for accelerometer.
> Also the unit expo is different for them. Also units are different.
That shouldn't be a problem.
> Possible IIO addition:
> I wish we can add two more items for unit and unit_expo in IIO_CHAN_INFO_XXXX. So that we can add
> them during channel definition. Currently I am using offset and scale, which doesn't actually mean
> this.
I am a little unclear on why they are different, ulitmately we are not
have variable units for a given sensor type.
That way just lies a whole pile of pain for userspace libraries. They
are offsets and scales even if framed in
different terminology as far as I can see.
> I think conversion should be done is user space based on the info provided.
>
> Srinivas pandruvada (5):
> HID-Sensors: Common attributes and interfaces
> HID-Sensors: Added accelerometer 3D
> HID-Sensors: Added Gyro 3D
> HID-Sensors: Added Compass 3D
> HID-Sensors: Added ALS
>
> srinivas pandruvada (3):
> HID-Sensors: Add ST Micro Sensor hub
> HID-Sensors: Add Intel HID sensor
> HID-Sensors: Sensor framework
>
> drivers/hid/hid-core.c | 8 +
> drivers/hid/hid-ids.h | 6 +
> drivers/staging/Kconfig | 2 +
> drivers/staging/Makefile | 1 +
> drivers/staging/hid-sensors/Kconfig | 19 +
> drivers/staging/hid-sensors/Makefile | 16 +
> drivers/staging/hid-sensors/hid-sensor-accel-3d.c | 375 ++++++++++
> drivers/staging/hid-sensors/hid-sensor-als.c | 313 ++++++++
> .../staging/hid-sensors/hid-sensor-attributes.c | 169 +++++
> .../staging/hid-sensors/hid-sensor-attributes.h | 51 ++
> drivers/staging/hid-sensors/hid-sensor-buffer.c | 98 +++
> .../staging/hid-sensors/hid-sensor-compass-3d.c | 375 ++++++++++
> drivers/staging/hid-sensors/hid-sensor-gyro-3d.c | 375 ++++++++++
> drivers/staging/hid-sensors/hid-sensor-hub.c | 747 ++++++++++++++++++++
> drivers/staging/hid-sensors/hid-sensor-ids.h | 117 +++
> drivers/staging/hid-sensors/hid-sensor-interface.h | 95 +++
> drivers/staging/hid-sensors/hid-sensor-trigger.c | 83 +++
> 17 files changed, 2850 insertions(+), 0 deletions(-)
> create mode 100644 drivers/staging/hid-sensors/Kconfig
> create mode 100644 drivers/staging/hid-sensors/Makefile
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-accel-3d.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-als.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.h
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-buffer.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-compass-3d.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-gyro-3d.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-hub.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-ids.h
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-interface.h
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-trigger.c
>
^ permalink raw reply [flat|nested] 28+ messages in thread* RE: [PATCH 0/8] HID-Sensor: v2
2012-06-15 13:12 ` Jonathan Cameron
@ 2012-06-15 15:31 ` Pandruvada, Srinivas
2012-06-18 7:43 ` Jonathan Cameron
0 siblings, 1 reply; 28+ messages in thread
From: Pandruvada, Srinivas @ 2012-06-15 15:31 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Jiri Kosina
> Had few questions on data format for floating point. This spec uses.
> - First of size of each field is specified in report descriptor. So it=20
> is variable
yuk. Thats annoying. I guess we'll have to extend the scan_type bit of IIO=
_CHAN to include this.
Currently I am setting real bits and storage bits of a channel, to specify =
size. Just before registering channel to IIO, setting these values.
Thanks,
Srinivas
-----Original Message-----
From: Jonathan Cameron [mailto:jic23@kernel.org]=20
Sent: Friday, June 15, 2012 6:12 AM
To: Pandruvada, Srinivas
Cc: linux-iio@vger.kernel.org; Jiri Kosina
Subject: Re: [PATCH 0/8] HID-Sensor: v2
On 6/10/2012 2:53 AM, srinivas pandruvada wrote:
> Submitting v2.
> Changes compared to version 1:
>
> - Replaced Ring-SW with KFiFO
> - Accel-3d, Gyro-3D and Compass-3D uses 3 different channels for X, Y=20
> and Z
> - SysFS (
> --- Changed "polling_interval" to sampling_frequency=20
> (IIO_DEV_ATTR_SAMP_FREQ) with units HZ
> --- Changed "sensitivity" to hyst_raw, which is already used by some=20
> ADC modules
> --- Removed "Activate". No longer need this. Using trigger state to=20
> activate/deactivate
> )
> - Removed sysfs attributes for "xxx_offset". Instead using mask 0 in=20
> read_raw. So each sensor have only channels, sampling_frequency and hyst_=
raw as the ABI.
> - Additional patch to enable ST Micro sensor hub
>
> TBD for v3
> - Use Lars-Peter's patch: "v2 1/9 patch: Add helper function for=20
> initialize trigger buffers). Want to make sure that API is final.
>
> DATA Format examples:
> Had few questions on data format for floating point. This spec uses.
> - First of size of each field is specified in report descriptor. So it=20
> is variable
yuk. Thats annoying. I guess we'll have to extend the scan_type bit of IIO=
_CHAN to include this.
> - It uses VT_F16Ex format. For example VTF16E0 means 16 bit float with un=
it exponent 0.
> Refer to Page 43 of the "HID Sensor Usage Table"
> For example, if the size is 16 bits
> 0xFFF4 with VTF16E14 format -> -0.12
> 0xFFF8 with VTF16E14 format -> -0.08
> 0x0067 with VTF16E14 format -> +1.03
>
> I tried sensor hubs from two different makers. One use 16 bit and other u=
ses 32 bit for accelerometer.
> Also the unit expo is different for them. Also units are different.
That shouldn't be a problem.
> Possible IIO addition:
> I wish we can add two more items for unit and unit_expo in=20
> IIO_CHAN_INFO_XXXX. So that we can add them during channel definition.=20
> Currently I am using offset and scale, which doesn't actually mean this.
I am a little unclear on why they are different, ulitmately we are not have=
variable units for a given sensor type.
That way just lies a whole pile of pain for userspace libraries. They=20
are offsets and scales even if framed in different terminology as far as I =
can see.
> I think conversion should be done is user space based on the info provide=
d.
>
> Srinivas pandruvada (5):
> HID-Sensors: Common attributes and interfaces
> HID-Sensors: Added accelerometer 3D
> HID-Sensors: Added Gyro 3D
> HID-Sensors: Added Compass 3D
> HID-Sensors: Added ALS
>
> srinivas pandruvada (3):
> HID-Sensors: Add ST Micro Sensor hub
> HID-Sensors: Add Intel HID sensor
> HID-Sensors: Sensor framework
>
> drivers/hid/hid-core.c | 8 +
> drivers/hid/hid-ids.h | 6 +
> drivers/staging/Kconfig | 2 +
> drivers/staging/Makefile | 1 +
> drivers/staging/hid-sensors/Kconfig | 19 +
> drivers/staging/hid-sensors/Makefile | 16 +
> drivers/staging/hid-sensors/hid-sensor-accel-3d.c | 375 ++++++++++
> drivers/staging/hid-sensors/hid-sensor-als.c | 313 ++++++++
> .../staging/hid-sensors/hid-sensor-attributes.c | 169 +++++
> .../staging/hid-sensors/hid-sensor-attributes.h | 51 ++
> drivers/staging/hid-sensors/hid-sensor-buffer.c | 98 +++
> .../staging/hid-sensors/hid-sensor-compass-3d.c | 375 ++++++++++
> drivers/staging/hid-sensors/hid-sensor-gyro-3d.c | 375 ++++++++++
> drivers/staging/hid-sensors/hid-sensor-hub.c | 747 +++++++++++++=
+++++++
> drivers/staging/hid-sensors/hid-sensor-ids.h | 117 +++
> drivers/staging/hid-sensors/hid-sensor-interface.h | 95 +++
> drivers/staging/hid-sensors/hid-sensor-trigger.c | 83 +++
> 17 files changed, 2850 insertions(+), 0 deletions(-)
> create mode 100644 drivers/staging/hid-sensors/Kconfig
> create mode 100644 drivers/staging/hid-sensors/Makefile
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-accel-3d.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-als.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.h
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-buffer.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-compass-3d.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-gyro-3d.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-hub.c
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-ids.h
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-interface.h
> create mode 100644 drivers/staging/hid-sensors/hid-sensor-trigger.c
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/8] HID-Sensor: v2
2012-06-15 15:31 ` Pandruvada, Srinivas
@ 2012-06-18 7:43 ` Jonathan Cameron
0 siblings, 0 replies; 28+ messages in thread
From: Jonathan Cameron @ 2012-06-18 7:43 UTC (permalink / raw)
To: Pandruvada, Srinivas; +Cc: linux-iio, Jiri Kosina
On 6/15/2012 4:31 PM, Pandruvada, Srinivas wrote:
>> Had few questions on data format for floating point. This spec uses.
>> - First of size of each field is specified in report descriptor. So it
>> is variable
> yuk. Thats annoying. I guess we'll have to extend the scan_type bit of IIO_CHAN to include this.
>
> Currently I am setting real bits and storage bits of a channel, to specify size. Just before registering channel to IIO, setting these values.
That is fine and how it is typically done. The bit that will need new
support is if we have true floating point (e.g. need to encode the
exponent in
individual readings).
I don't have any real problem doing this other than annoyance based on the
fact I doubt any of the underlying hardware is floating point (though I'd
love to see a data sheet if it is!)
>
> Thanks,
> Srinivas
>
> -----Original Message-----
> From: Jonathan Cameron [mailto:jic23@kernel.org]
> Sent: Friday, June 15, 2012 6:12 AM
> To: Pandruvada, Srinivas
> Cc: linux-iio@vger.kernel.org; Jiri Kosina
> Subject: Re: [PATCH 0/8] HID-Sensor: v2
>
> On 6/10/2012 2:53 AM, srinivas pandruvada wrote:
>> Submitting v2.
>> Changes compared to version 1:
>>
>> - Replaced Ring-SW with KFiFO
>> - Accel-3d, Gyro-3D and Compass-3D uses 3 different channels for X, Y
>> and Z
>> - SysFS (
>> --- Changed "polling_interval" to sampling_frequency
>> (IIO_DEV_ATTR_SAMP_FREQ) with units HZ
>> --- Changed "sensitivity" to hyst_raw, which is already used by some
>> ADC modules
>> --- Removed "Activate". No longer need this. Using trigger state to
>> activate/deactivate
>> )
>> - Removed sysfs attributes for "xxx_offset". Instead using mask 0 in
>> read_raw. So each sensor have only channels, sampling_frequency and hyst_raw as the ABI.
>> - Additional patch to enable ST Micro sensor hub
>>
>> TBD for v3
>> - Use Lars-Peter's patch: "v2 1/9 patch: Add helper function for
>> initialize trigger buffers). Want to make sure that API is final.
>>
>> DATA Format examples:
>> Had few questions on data format for floating point. This spec uses.
>> - First of size of each field is specified in report descriptor. So it
>> is variable
> yuk. Thats annoying. I guess we'll have to extend the scan_type bit of IIO_CHAN to include this.
>> - It uses VT_F16Ex format. For example VTF16E0 means 16 bit float with unit exponent 0.
>> Refer to Page 43 of the "HID Sensor Usage Table"
>> For example, if the size is 16 bits
>> 0xFFF4 with VTF16E14 format -> -0.12
>> 0xFFF8 with VTF16E14 format -> -0.08
>> 0x0067 with VTF16E14 format -> +1.03
>>
>> I tried sensor hubs from two different makers. One use 16 bit and other uses 32 bit for accelerometer.
>> Also the unit expo is different for them. Also units are different.
> That shouldn't be a problem.
>> Possible IIO addition:
>> I wish we can add two more items for unit and unit_expo in
>> IIO_CHAN_INFO_XXXX. So that we can add them during channel definition.
>> Currently I am using offset and scale, which doesn't actually mean this.
> I am a little unclear on why they are different, ulitmately we are not have variable units for a given sensor type.
> That way just lies a whole pile of pain for userspace libraries. They
> are offsets and scales even if framed in different terminology as far as I can see.
>
>> I think conversion should be done is user space based on the info provided.
>>
>> Srinivas pandruvada (5):
>> HID-Sensors: Common attributes and interfaces
>> HID-Sensors: Added accelerometer 3D
>> HID-Sensors: Added Gyro 3D
>> HID-Sensors: Added Compass 3D
>> HID-Sensors: Added ALS
>>
>> srinivas pandruvada (3):
>> HID-Sensors: Add ST Micro Sensor hub
>> HID-Sensors: Add Intel HID sensor
>> HID-Sensors: Sensor framework
>>
>> drivers/hid/hid-core.c | 8 +
>> drivers/hid/hid-ids.h | 6 +
>> drivers/staging/Kconfig | 2 +
>> drivers/staging/Makefile | 1 +
>> drivers/staging/hid-sensors/Kconfig | 19 +
>> drivers/staging/hid-sensors/Makefile | 16 +
>> drivers/staging/hid-sensors/hid-sensor-accel-3d.c | 375 ++++++++++
>> drivers/staging/hid-sensors/hid-sensor-als.c | 313 ++++++++
>> .../staging/hid-sensors/hid-sensor-attributes.c | 169 +++++
>> .../staging/hid-sensors/hid-sensor-attributes.h | 51 ++
>> drivers/staging/hid-sensors/hid-sensor-buffer.c | 98 +++
>> .../staging/hid-sensors/hid-sensor-compass-3d.c | 375 ++++++++++
>> drivers/staging/hid-sensors/hid-sensor-gyro-3d.c | 375 ++++++++++
>> drivers/staging/hid-sensors/hid-sensor-hub.c | 747 ++++++++++++++++++++
>> drivers/staging/hid-sensors/hid-sensor-ids.h | 117 +++
>> drivers/staging/hid-sensors/hid-sensor-interface.h | 95 +++
>> drivers/staging/hid-sensors/hid-sensor-trigger.c | 83 +++
>> 17 files changed, 2850 insertions(+), 0 deletions(-)
>> create mode 100644 drivers/staging/hid-sensors/Kconfig
>> create mode 100644 drivers/staging/hid-sensors/Makefile
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-accel-3d.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-als.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-attributes.h
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-buffer.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-compass-3d.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-gyro-3d.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-hub.c
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-ids.h
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-interface.h
>> create mode 100644 drivers/staging/hid-sensors/hid-sensor-trigger.c
>>
^ permalink raw reply [flat|nested] 28+ messages in thread