From 5e3dfc456005d05ca8af0a2521836029fbff77d5 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:41:57 +0100 Subject: [PATCH] --- yaml --- r: 249831 b: refs/heads/master c: eb7fea53e53ed47e82b4cc9911dd8fdc7f953de5 h: refs/heads/master i: 249829: e55aa5c277c837ebc0e73f1381f2be83113deb03 249827: a8bac83e153140ec0b7fe4d9fe602d4be6f360ad 249823: 15e45f46b7b9b5e6a1ee20d4638c338a3f1f75e8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/iio.h | 6 +++++- trunk/drivers/staging/iio/industrialio-core.c | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5fa2d0242de1..18c5379b29fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e8fa5b8631a0965065d621240c0eafe879ac5d0 +refs/heads/master: eb7fea53e53ed47e82b4cc9911dd8fdc7f953de5 diff --git a/trunk/drivers/staging/iio/iio.h b/trunk/drivers/staging/iio/iio.h index c6b471cf3b42..1a6bedc01f4c 100644 --- a/trunk/drivers/staging/iio/iio.h +++ b/trunk/drivers/staging/iio/iio.h @@ -73,7 +73,11 @@ enum iio_chan_info_enum { IIO_CHAN_INFO_CALIBSCALE_SHARED, IIO_CHAN_INFO_CALIBSCALE_SEPARATE, IIO_CHAN_INFO_CALIBBIAS_SHARED, - IIO_CHAN_INFO_CALIBBIAS_SEPARATE + IIO_CHAN_INFO_CALIBBIAS_SEPARATE, + IIO_CHAN_INFO_PEAK_SHARED, + IIO_CHAN_INFO_PEAK_SEPARATE, + IIO_CHAN_INFO_PEAK_SCALE_SHARED, + IIO_CHAN_INFO_PEAK_SCALE_SEPARATE, }; /** diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index e943dacf8bfa..e3582c9e18c1 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -80,6 +80,8 @@ static const char * const iio_chan_info_postfix[] = { [IIO_CHAN_INFO_OFFSET_SHARED/2] = "offset", [IIO_CHAN_INFO_CALIBSCALE_SHARED/2] = "calibscale", [IIO_CHAN_INFO_CALIBBIAS_SHARED/2] = "calibbias", + [IIO_CHAN_INFO_PEAK_SHARED/2] = "peak_raw", + [IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale", }; int iio_push_event(struct iio_dev *dev_info,