lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging:iio:add adaptive event types and missing extract_type macro.

Browse Source 
I'm not entirely sure this is the right way to go. Suggestions of other
options welcome!

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron
2011-09-02 17:14:44 +01:00
committed by Greg Kroah-Hartman
parent 66dbe70437
commit 8ce7375be7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/iio/industrialio-core.c
View File

@@ -700,7 +700,9 @@ static void iio_device_unregister_sysfs(struct iio_dev *dev_info)
static const char * const iio_ev_type_text[] = { static const char * const iio_ev_type_text[] = {
[IIO_EV_TYPE_THRESH] = "thresh", [IIO_EV_TYPE_THRESH] = "thresh",
[IIO_EV_TYPE_MAG] = "mag", [IIO_EV_TYPE_MAG] = "mag",
[IIO_EV_TYPE_ROC] = "roc" [IIO_EV_TYPE_ROC] = "roc",
[IIO_EV_TYPE_THRESH_ADAPTIVE] = "thresh_adaptive",
[IIO_EV_TYPE_MAG_ADAPTIVE] = "mag_adaptive",
}; };
static const char * const iio_ev_dir_text[] = { static const char * const iio_ev_dir_text[] = {

3
drivers/staging/iio/sysfs.h
View File

@@ -118,6 +118,8 @@ enum iio_event_type {
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_TYPE_MAG, IIO_EV_TYPE_MAG,
IIO_EV_TYPE_ROC, IIO_EV_TYPE_ROC,
IIO_EV_TYPE_THRESH_ADAPTIVE,
IIO_EV_TYPE_MAG_ADAPTIVE,
}; };
enum iio_event_direction { enum iio_event_direction {
@@ -142,6 +144,7 @@ enum iio_event_direction {
#define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction) \ #define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction) \
IIO_EVENT_CODE(channelclass, 0, direction, type, number, 0, 0) IIO_EVENT_CODE(channelclass, 0, direction, type, number, 0, 0)
#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xFF) #define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xFF)
/* Event code number extraction depends on which type of event we have. /* Event code number extraction depends on which type of event we have.