iio: core: add char type for sysfs attributes

This patch introduces IIO_VAL_CHAR type for standard IIO attributes to
allow for attributes that needs to be represented by character rather
than a number. This is preparatory for introducing a new attribute whose
purpose is to describe thermocouple type, that can be i.e. "J", "K", etc..

The char-type value is stored in the first "value" integer that is passed
to the .[read/write]_raw() callbacks.

Note that in order to make it possible for the IIO core to correctly parse
this type (actually, to avoid integer parsing), it became mandatory for
any driver that wish to use IIO_VAL_CHAR on a writable attribute to
implement .write_raw_get_fmt().

Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Patrick Havelange <patrick.havelange@essensium.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Cc: Matt Ranostay <matt.ranostay@konsulko.com>
Cc: Chuhong Yuan <hslester96@gmail.com>
Cc: Daniel Gomez <dagmcr@gmail.com>
Cc: linux-iio@vger.kernel.org
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index f72c2dc5f703fd9fcd7786d7eeccb97f1a761129..958b5c48a86fa5e66a20a5e7da224703bddd56b7 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -596,6 +596,8 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,
                }
                return l;
        }
+       case IIO_VAL_CHAR:
+               return snprintf(buf, len, "%c", (char)vals[0]);
        default:
                return 0;
        }
@@ -837,7 +839,8 @@ static ssize_t iio_write_channel_info(struct device *dev,
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
        int ret, fract_mult = 100000;
-       int integer, fract;
+       int integer, fract = 0;
+       bool is_char = false;
 
        /* Assumes decimal - precision based on number of digits */
        if (!indio_dev->info->write_raw)
@@ -855,13 +858,24 @@ static ssize_t iio_write_channel_info(struct device *dev,
                case IIO_VAL_INT_PLUS_NANO:
                        fract_mult = 100000000;
                        break;
+               case IIO_VAL_CHAR:
+                       is_char = true;
+                       break;
                default:
                        return -EINVAL;
                }
 
-       ret = iio_str_to_fixpoint(buf, fract_mult, &integer, &fract);
-       if (ret)
-               return ret;
+       if (is_char) {
+               char ch;
+
+               if (sscanf(buf, "%c", &ch) != 1)
+                       return -EINVAL;
+               integer = ch;
+       } else {
+               ret = iio_str_to_fixpoint(buf, fract_mult, &integer, &fract);
+               if (ret)
+                       return ret;
+       }
 
        ret = indio_dev->info->write_raw(indio_dev, this_attr->c,
                                         integer, fract, this_attr->address);

diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index fa824e160f35bc3489afd91d14c2903d3e56e098..8e0026da38c96a519b1a4a119b91982557f859c3 100644 (file)
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -25,6 +25,7 @@ enum iio_event_info {
 #define IIO_VAL_INT_MULTIPLE 5
 #define IIO_VAL_FRACTIONAL 10
 #define IIO_VAL_FRACTIONAL_LOG2 11
+#define IIO_VAL_CHAR 12
 
 enum iio_available_type {
        IIO_AVAIL_LIST,