HAPTIC: add HAPTIC class
Subsystems (2)
PATCH 1/1 HAPTIC: add HAPTIC class
This patch is for HAPTIC framework.
---
I post this patch instead of Kyungmin Park.
Maybe Kyungmin will make a description of the patch in the concrete.
arch/arm/Kconfig | 2 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/haptic/Kconfig | 14 ++++ drivers/haptic/Makefile | 2 + drivers/haptic/haptic-class.c | 165 +++++++++++++++++++++++++++++++++++++++++ drivers/haptic/haptic.h | 35 +++++++++ include/linux/haptic.h | 66 ++++++++++++++++ 8 files changed, 287 insertions(+), 0 deletions(-) create mode 100644 drivers/haptic/Kconfig create mode 100644 drivers/haptic/Makefile create mode 100644 drivers/haptic/haptic-class.c create mode 100644 drivers/haptic/haptic.h create mode 100644 include/linux/haptic.h
arch/arm/Kconfig +2 -0
@@ -1463,6 +1463,8 @@ source "drivers/accessibility/Kconfig" source "drivers/leds/Kconfig" +source "drivers/haptic/Kconfig" + source "drivers/rtc/Kconfig" source "drivers/dma/Kconfig"
drivers/Kconfig +2 -0
@@ -90,6 +90,8 @@ source "drivers/memstick/Kconfig" source "drivers/leds/Kconfig" +source "drivers/haptic/Kconfig" + source "drivers/accessibility/Kconfig" source "drivers/infiniband/Kconfig"
drivers/Makefile +1 -0
@@ -93,6 +93,7 @@ obj-y += idle/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_MEMSTICK) += memstick/ obj-$(CONFIG_NEW_LEDS) += leds/ +obj-$(CONFIG_HAPTIC) += haptic/ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/
drivers/haptic/Kconfig new file +14 -0
@@ -0,0 +1,14 @@ +menuconfig HAPTIC + bool "HAPTIC support" + help + Say Y to enalbe haptic support. It enables the haptic and controlled + from both userspace and kernel + +if HAPTIC + +config HAPTIC_CLASS + tristate "Haptic Class Support" + help + This option enables the haptic sysfs class in /sys/class/haptic. + +endif # HAPTIC
drivers/haptic/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +# Haptic Core +obj-$(CONFIG_HAPTIC_CLASS) += haptic-class.o
drivers/haptic/haptic-class.c new file +165 -0
165 lines not on this page · raw message
drivers/haptic/haptic.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Haptic Core +* +* Copyright (C) 2008 Samsung Electronics +* Kyungmin Park <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#ifndef __HAPTIC_H_INCLUDED +#define __HAPTIC_H_INCLUDED + +#include <linux/device.h> +#include <linux/rwsem.h> +#include <linux/haptic.h> + +static inline void haptic_set_value (struct haptic_classdev *haptic_cdev, +enum haptic_value value) +{ +if (value >HAPTIC_FULL ) + value =HAPTIC_FULL ; + haptic_cdev->value = value; +if (!(haptic_cdev->flags &HAPTIC_SUSPENDED )) + haptic_cdev->set (haptic_cdev, value); +} + +static inline int haptic_get_value (struct haptic_classdev *haptic_cdev) +{ +return haptic_cdev->value; +} + +#endif /* __HAPTIC_H_INCLUDED */
include/linux/haptic.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
1.6.0.4
Hi Joonyoung Shim,
Quoted 7 lines · Joonyoung Shim
This patch is for HAPTIC framework.
Signed-off-by Kyungmin Park <[email protected]>Signed-off-by Donggeun Kim <[email protected]>---
I post this patch instead of Kyungmin Park.
Maybe Kyungmin will make a description of the patch in the concrete.
Thanks for posting this patch, I can describe this code probably in one word :) s/led_framework/haptics_framework :) I just hope it meets most of the requirements of haptics devices.
Let's wait for Kyungmin Park to add some more text and hopefully not so patents-breaking sample driver.
Quoted 369 lines
arch/arm/Kconfig | 2 + drivers/Kconfig | 2 + drivers/Makefile | 1 +drivers/haptic/Kconfig | 14 ++++
drivers/haptic/Makefile | 2 +drivers/haptic/haptic-class.c| 165 +++++++++++++++++++++++++++++++++++++++++drivers/haptic/haptic.h| 35 +++++++++include/linux/haptic.h| 66 ++++++++++++++++8 files changed, 287 insertions(+), 0 deletions(-)create mode 100644
drivers/haptic/Kconfig
create mode 100644drivers/haptic/Makefile
create mode 100644drivers/haptic/haptic-class.c
create mode 100644drivers/haptic/haptic.h
create mode 100644include/linux/haptic.harch/arm/Kconfig +0
-0@@ -1463,6 +1463,8 @@ source "drivers/accessibility/Kconfig"source "
drivers/leds/Kconfig"arch/arm/Kconfig +2
-0+source "drivers/haptic/Kconfig" +source "
drivers/rtc/Kconfig"source "
drivers/dma/Kconfig"drivers/Kconfig +0
-0@@ -90,6 +90,8 @@ source "drivers/memstick/Kconfig"source "
drivers/leds/Kconfig"drivers/Kconfig +2
-0+source "drivers/haptic/Kconfig" +source "
drivers/accessibility/Kconfig"source "
drivers/infiniband/Kconfig"drivers/Makefile +0
-0@@ -93,6 +93,7 @@ obj-y += idle/obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_MEMSTICK) += memstick/
obj-$(CONFIG_NEW_LEDS) += leds/
+obj-$(CONFIG_HAPTIC) += haptic/
obj-$(CONFIG_INFINIBAND) += infiniband/
obj-$(CONFIG_SGI_SN) += sn/
obj-y +=firmware/drivers/haptic/Kconfig new file +14
-0@@ -0,0 +1,14 @@ +menuconfig HAPTIC + bool "HAPTIC support" + help + Say Y to enalbe haptic support. It enables the haptic and controlled + from both userspace and kernel + +if HAPTIC + +config HAPTIC_CLASS + tristate "Haptic Class Support" + help + This option enables the haptic sysfs class in /sys/class/haptic. + +endif # HAPTICdrivers/haptic/Makefile new file +2
-0@@ -0,0 +1,2 @@ +# Haptic Core +obj-$(CONFIG_HAPTIC_CLASS) += haptic-class.odrivers/haptic/haptic-class.c new file +165
-0@@ -0,0 +1,165 @@ +/* +* Haptic Class Core +* +* Copyright (C) 2008 Samsung Electronics +* Kyungmin Park <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/list.h> +#include <linux/spinlock.h> +#include <linux/device.h> +#include <linux/rwsem.h> +#include <linux/sysdev.h> +#include <linux/timer.h> +#include <linux/err.h> +#include <linux/ctype.h> +#include <linux/haptic.h> +#include "haptic.h" + +static DECLARE_RWSEM (haptic_list_lock); +static LIST_HEAD (haptic_list); +static struct class *haptic_class; + +static void haptic_update_value (struct haptic_classdev *haptic_cdev) +{ + if (haptic_cdev->get) + haptic_cdev->value = haptic_cdev->get(haptic_cdev); +} + +static ssize_t haptic_value_show (struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct haptic_classdev *haptic_cdev = dev_get_drvdata(dev); + ssize_t ret = 0; + + /* no lock needed for this */ + haptic_update_value(haptic_cdev); + sprintf(buf, "%u\n", haptic_get_value(haptic_cdev)); + ret = strlen(buf) + 1; + + return ret; +} + +static ssize_t haptic_value_store (struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + struct haptic_classdev *haptic_cdev = dev_get_drvdata(dev); + ssize_t ret = -EINVAL; + char *after; + unsigned long state = simple_strtoul(buf, &after, 10); + size_t count = after - buf; + + if (*after && isspace(*after)) + count++; + + if (count == size) { + ret = count; + haptic_set_value(haptic_cdev, state); + } + + return ret; +} + +static DEVICE_ATTR(value, 0644, haptic_value_show, haptic_value_store); + +/** +* haptic_classdev_suspend - suspend an haptic_classdev. +* @haptic_cdev: the haptic_classdev to suspend. +*/ +void haptic_classdev_suspend (struct haptic_classdev *haptic_cdev) +{ + haptic_cdev->flags |= HAPTIC_SUSPENDED; + haptic_cdev->set(haptic_cdev, HAPTIC_OFF); +} +EXPORT_SYMBOL_GPL (haptic_classdev_suspend); + +/** +* haptic_classdev_resume - resume an haptic_classdev. +* @haptic_cdev: the haptic_classdev to resume. +*/ +void haptic_classdev_resume (struct haptic_classdev *haptic_cdev) +{ + haptic_cdev->set(haptic_cdev, haptic_cdev->value); + haptic_cdev->flags &= ~HAPTIC_SUSPENDED; +} +EXPORT_SYMBOL_GPL (haptic_classdev_resume); + +/** +* haptic_classdev_register - register a new object of haptic_classdev class. +* @dev: The device to register. +* @haptic_cdev: the haptic_classdev structure for this device. +*/ +int haptic_classdev_register (struct device *parent, + struct haptic_classdev *haptic_cdev) +{ + int ret; + + haptic_cdev->dev = device_create(haptic_class, parent, 0, + haptic_cdev, "%s", haptic_cdev->name); + if (IS_ERR(haptic_cdev->dev)) + return PTR_ERR(haptic_cdev->dev); + + /* register the attributes */ + ret = device_create_file(haptic_cdev->dev, &dev_attr_value); + if (ret) + goto err_out; + + /* add to the list of haptic */ + down_write(&haptic_list_lock); + list_add_tail(&haptic_cdev->node, &haptic_list); + up_write(&haptic_list_lock); + + haptic_update_value(haptic_cdev); + + printk(KERN_INFO "Registered haptic device: %s\n", haptic_cdev->name); + return 0; + +err_out: + device_unregister(haptic_cdev->dev); + return ret; +} +EXPORT_SYMBOL_GPL (haptic_classdev_register); + +/** +* haptic_classdev_unregister - unregisters a object of haptic_properties class. +* @haptic_cdev: the haptic device to unregister +* +* Unregisters a previously registered via haptic_classdev_register object. +*/ +void haptic_classdev_unregister (struct haptic_classdev *haptic_cdev) +{ + device_remove_file(haptic_cdev->dev, &dev_attr_value); + device_unregister(haptic_cdev->dev); + + down_write(&haptic_list_lock); + list_del(&haptic_cdev->node); + up_write(&haptic_list_lock); +} +EXPORT_SYMBOL_GPL (haptic_classdev_unregister); + +static int __init haptic_init (void ) +{ + haptic_class = class_create(THIS_MODULE, "haptic"); + if (IS_ERR(haptic_class)) + return PTR_ERR(haptic_class); + return 0; +} +subsys_initcall (haptic_init); + +static void __exit haptic_exit(void) +{ + class_destroy(haptic_class); +} +module_exit (haptic_exit); + +MODULE_AUTHOR ("Kyungmin Park <[email protected]>" ); +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("Haptic Class Interface" );drivers/haptic/haptic.h new file +35
-0@@ -0,0 +1,35 @@ +/* +* Haptic Core +* +* Copyright (C) 2008 Samsung Electronics +* Kyungmin Park <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#ifndef __HAPTIC_H_INCLUDED +#define __HAPTIC_H_INCLUDED + +#include <linux/device.h> +#include <linux/rwsem.h> +#include <linux/haptic.h> + +static inline void haptic_set_value (struct haptic_classdev *haptic_cdev, + enum haptic_value value) +{ + if (value > HAPTIC_FULL) + value = HAPTIC_FULL; + haptic_cdev->value = value; + if (!(haptic_cdev->flags & HAPTIC_SUSPENDED)) + haptic_cdev->set(haptic_cdev, value); +} + +static inline int haptic_get_value (struct haptic_classdev *haptic_cdev) +{ + return haptic_cdev->value; +} + +#endif /* __HAPTIC_H_INCLUDED */ include/linux/haptic.h new file +66
-1@@ -0,0 +1,66 @@ +/* +* Driver model for haptic +* +* Copyright (C) 2008 Samsung Electronics +* Kyungmin Park <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#ifndef __LINUX_HAPTIC_H_INCLUDED +#define __LINUX_HAPTIC_H_INCLUDED + +#include <linux/list.h> +#include <linux/spinlock.h> +#include <linux/rwsem.h> + +struct device ; +/* +* Motor Core +*/ + +enum haptic_value { + HAPTIC_OFF = 0, + HAPTIC_HALF = 127, + HAPTIC_FULL = 255, +}; + +struct haptic_classdev { + const char *name; + int value; +#define HAPTIC_SUSPENDED (1 << 0) + int flags; + + /* Set haptic value */ + /* Must not sleep, use a workqueue if needed */ + void (*set)(struct haptic_classdev *self, + enum haptic_value value); + /* Get haptic value */ + enum haptic_value (*get)(struct haptic_classdev *self); + + struct device *dev; + struct list_head node; /* Motor Device list */ +}; + +extern int haptic_classdev_register (struct device *parent, + struct haptic_classdev *haptic_cdev); +extern void haptic_classdev_unregister (struct haptic_classdev *lcd); +extern void haptic_classdev_suspend (struct haptic_classdev *haptic_cdev); +extern void haptic_classdev_resume (struct haptic_classdev *haptic_cdev); + +/* +* Generic and gpio haptic platform data for describing haptic names. +*/ +struct haptic_platform_data { + const char *name; + int pwm_timer; + int gpio; + void (*setup_pin)(void); + u8 active_low; + int ldo_level; +}; + +#endif /* __LINUX_HAPTIC_H_INCLUDED */ --1.6.0.4
Signature · 7 lines
---Trilok Soni http://triloksoni.wordpress.com http://www.linkedin.com/in/triloksoni -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Kyungmin Park,
drivers/haptic/haptic-class.c line 57
Quoted 8 lines
drivers/haptic/haptic-class.c new file +8
-0+ +static ssize_t haptic_value_store (struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + struct haptic_classdev *haptic_cdev = dev_get_drvdata(dev); + ssize_t ret = -EINVAL; + char *after; + unsigned long state = simple_strtoul(buf, &after, 10);
s/simple_strtoul/strict_strtoul. code looks clean, but let's scan it through scripts/checkpatch.pl.
Quoted 29 lines
drivers/haptic/haptic.h new file +23
-0@@ -0,0 +1,35 @@ +/* +* Haptic Core +* +* Copyright (C) 2008 Samsung Electronics +* Kyungmin Park <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#ifndef __HAPTIC_H_INCLUDED +#define __HAPTIC_H_INCLUDED + +#include <linux/device.h> +#include <linux/rwsem.h> +#include <linux/haptic.h> + +static inline void haptic_set_value (struct haptic_classdev *haptic_cdev, + enum haptic_value value) +{ + if (value > HAPTIC_FULL)
drivers/haptic/haptic.h line 33
Quoted 10 lines
drivers/haptic/haptic.h new file +10
-0+ value = HAPTIC_FULL; + haptic_cdev->value = value; + if (!(haptic_cdev->flags & HAPTIC_SUSPENDED)) + haptic_cdev->set(haptic_cdev, value); +} + +static inline int haptic_get_value (struct haptic_classdev *haptic_cdev) +{ + return haptic_cdev->value; +}
You had mentioned in Kconfig help text that haptics set/get APIs can be accessed from kernel drivers too, I am not able to understand that from this code.
Signature · 3 lines
---Trilok Soni http://triloksoni.wordpress.com http://www.linkedin.com/in/triloksoni