From: srinivas pandruvada <srinivas.pandruvada@intel.com>
To: linux-input@vger.kernel.org
Cc: linux-iio@vger.kernel.org,
Srinivas pandruvada <srinivas.pandruvada@intel.com>
Subject: [PATCH, 7/7] HID-Sensors: Added ALS
Date: Wed, 6 Jun 2012 08:39:24 -0700 [thread overview]
Message-ID: <1338997164-5077-8-git-send-email-srinivas.pandruvada@intel.com> (raw)
In-Reply-To: <1338997164-5077-1-git-send-email-srinivas.pandruvada@intel.com>
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 | 326 ++++++++++++++++++++
drivers/staging/hid-sensors/hid-sensor-hub.c | 1 +
drivers/staging/hid-sensors/hid-sensor-interface.h | 1 +
4 files changed, 329 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 9762232..e8d728a 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..360e0c2
--- /dev/null
+++ b/drivers/staging/hid-sensors/hid-sensor-als.c
@@ -0,0 +1,326 @@
+/*
+ * 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"
+
+
+struct als_sample {
+ u16 illum;
+ u16 chromocity;
+} __packed;
+
+struct als_state {
+ struct hid_sensor_hub_attribute_info als_illum;
+ struct hid_sensor_hub_attribute_info als_chromocity;
+ struct als_sample als_sample_data;
+};
+
+
+enum als_chan {
+ ALS_ILLUM,
+};
+
+enum als_scan {
+ ALS_ILLUM_SCAN_ILLUM,
+};
+
+static struct iio_chan_spec als_channels[] = {
+ IIO_CHAN(IIO_INTENSITY, 1, 0, 0, NULL, 0, IIO_MOD_LIGHT_BOTH,
+ IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+ IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
+ ALS_ILLUM, ALS_ILLUM_SCAN_ILLUM,
+ IIO_ST('u', 32, 32, 32), 0),
+};
+
+static ssize_t als_read(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);
+ struct als_state *als_state =
+ (struct als_state *)st->private;
+ struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+ int report_id = -1;
+
+ switch (this_attr->address) {
+ case HID_USAGE_SENSOR_DATA_LIGHT_ILLUMINANCE:
+ report_id = als_state->als_illum.report_id;
+ break;
+
+ default:
+ break;
+ }
+ if (report_id < 0)
+ return -EINVAL;
+
+ return sensor_hub_input_attr_get_value(st->hdev,
+ HID_USAGE_SENSOR_ALS, this_attr->address,
+ report_id, 4, buf);
+}
+
+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;
+ *val = 0;
+ *val2 = 0;
+
+ switch (mask) {
+ case 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;
+}
+
+/* Usage specific attributes */
+static DEVICE_ATTR(illuminance0_input, S_IRUGO, als_read, NULL);
+
+static struct attribute *als_attributes[] = {
+ /* common attributes */
+ &iio_dev_attr_poll_interval.dev_attr.attr,
+ &iio_dev_attr_sensitivity.dev_attr.attr,
+ &iio_dev_attr_activate.dev_attr.attr,
+ /* Usage specific attributes */
+ &dev_attr_illuminance0_input.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_to_ring(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 Light Illum attribute\n");
+
+
+ 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_ring(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;
+ }
+ 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_ring_cleanup(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_ring_cleanup(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 d61affa..6d724da 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 b0df328..2d283ae 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);
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
prev parent reply other threads:[~2012-06-06 15:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-06 15:39 [PATCH, 0/7] HID Sensor Driver srinivas pandruvada
2012-06-06 15:39 ` [PATCH, 1/7] HID-Sensors: Add Intel HID sensor srinivas pandruvada
2012-06-06 15:39 ` [PATCH, 2/7] HID-Sensors: Sensor framework srinivas pandruvada
2012-06-06 15:39 ` [PATCH, 3/7] HID-Sensors: Common attributes and interfaces srinivas pandruvada
2012-06-07 7:54 ` Jonathan Cameron
2012-06-06 15:39 ` [PATCH, 4/7] HID-Sensors: Added accelerometer 3D srinivas pandruvada
2012-06-06 16:28 ` Jonathan Cameron
2012-06-06 16:57 ` Pandruvada, Srinivas
2012-06-06 17:07 ` Lars-Peter Clausen
2012-06-06 17:06 ` Pandruvada, Srinivas
2012-06-07 8:10 ` Jonathan Cameron
2012-06-07 15:41 ` Pandruvada, Srinivas
2012-06-07 20:27 ` Jonathan Cameron
2012-06-06 15:39 ` [PATCH, 5/7] HID-Sensors: Added Gyro 3D srinivas pandruvada
2012-06-06 15:39 ` [PATCH, 6/7] HID-Sensors: Added Compass 3D srinivas pandruvada
2012-06-06 15:39 ` srinivas pandruvada [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338997164-5077-8-git-send-email-srinivas.pandruvada@intel.com \
--to=srinivas.pandruvada@intel.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).