From 549f21e6bd3644e5fa5a25be252a5c4d7d0da937 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 2 Sep 2011 17:14:43 +0100 Subject: [PATCH] --- yaml --- r: 268171 b: refs/heads/master c: 66dbe70437b561c241d1117dd291c11db21072fd h: refs/heads/master i: 268169: 96528182dfe237d38c70422215d79ddfe181a3a2 268167: 87340946c368dee70c2d8fa58e2789c2c8638e5d v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/iio.h | 3 +++ trunk/drivers/staging/iio/industrialio-core.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a3e878b08509..0693639ca194 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c04ea8ae99d71182b525cb8e4d48dc2fde0dd0ee +refs/heads/master: 66dbe70437b561c241d1117dd291c11db21072fd diff --git a/trunk/drivers/staging/iio/iio.h b/trunk/drivers/staging/iio/iio.h index a59988fd8364..742f6c659a71 100644 --- a/trunk/drivers/staging/iio/iio.h +++ b/trunk/drivers/staging/iio/iio.h @@ -42,6 +42,7 @@ enum iio_chan_type { IIO_ROT, IIO_ANGL, IIO_TIMESTAMP, + IIO_CAPACITANCE, }; /* Nasty hack to avoid massive churn */ @@ -81,6 +82,8 @@ enum iio_chan_info_enum { IIO_CHAN_INFO_PEAK_SCALE_SEPARATE, IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED, IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE, + IIO_CHAN_INFO_AVERAGE_RAW_SHARED, + IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE, }; enum iio_endian { diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index 8c054c0a715b..44a5be56208c 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -65,6 +65,7 @@ static const char * const iio_chan_type_name_spec_shared[] = { [IIO_ROT] = "rot", [IIO_ANGL] = "angl", [IIO_TIMESTAMP] = "timestamp", + [IIO_CAPACITANCE] = "capacitance", }; static const char * const iio_chan_type_name_spec_complex[] = { @@ -89,6 +90,7 @@ static const char * const iio_chan_info_postfix[] = { [IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale", [IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED/2] = "quadrature_correction_raw", + [IIO_CHAN_INFO_AVERAGE_RAW_SHARED/2] = "mean_raw", }; /**