staging:iio: header reorganization

Issue brought up by Lars-Peter Clausen. This is a varient of what
he suggested.

io/iio.h for driver stuff (has to include types.h)
	Sub files for the bits drivers may or may not use
	iio/sysfs.h
	iio/buffer.h (contents of current buffer_generic.h)
	(obviously anything offering events will need events.h as well)
iio/types.h for the enums that matter to both
	iio_chan_type, iio_modifier
iio/events.h for the event code stuff
	IIO_EVENT_CODE and friends.  + everything in chrdev.h  So this
	is the stuff that userspace cares about.
	Also include iio_event_type, iio_event_direction

Thus iio drivers include iio.h + as required
events.h
sysfs.h
buffer.h

in kernel users (once that interface is merged) will need inkern.h
which will pull in types.h

Userspace will need just events.h (which pulls in types.h) to get
everything they need to know about.  Buffer userspace access doesn't
currently need any core defines. All information about the data
format is passed through sysfs.

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-10-26 17:41:32 +01:00 committed by Greg Kroah-Hartman
parent f791cec850
commit af5046af1c
47 changed files with 168 additions and 140 deletions

View file

@ -17,7 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16201.h"

View file

@ -17,7 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16203.h"

View file

@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16204.h"

View file

@ -18,7 +18,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16209.h"

View file

@ -21,7 +21,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16240.h"

View file

@ -25,7 +25,8 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../events.h"
#include "../buffer.h"
#include "lis3l02dq.h"

View file

@ -20,7 +20,8 @@
#include <linux/module.h>
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../events.h"
#include "../buffer.h"
#include "sca3000.h"

View file

@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_hw.h"
#include "sca3000.h"

View file

@ -19,7 +19,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger.h"
#include "../trigger_consumer.h"

View file

@ -18,6 +18,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include "ad7280a.h"

View file

@ -19,6 +19,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
/*
* Simplified handling

View file

@ -18,7 +18,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "ad7298.h"

View file

@ -12,7 +12,7 @@
#include <linux/spi/spi.h>
#include "../iio.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger_consumer.h"

View file

@ -17,7 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "ad7476.h"

View file

@ -14,7 +14,7 @@
#include <linux/spi/spi.h>
#include "../iio.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger_consumer.h"

View file

@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "ad7606.h"

View file

@ -12,7 +12,7 @@
#include <linux/slab.h>
#include "../iio.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger_consumer.h"

View file

@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger.h"
#include "../trigger_consumer.h"

View file

@ -18,6 +18,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
/*
* AD7816 config masks

View file

@ -17,7 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "ad7887.h"

View file

@ -13,7 +13,7 @@
#include <linux/spi/spi.h>
#include "../iio.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger_consumer.h"

View file

@ -35,7 +35,8 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../events.h"
#include "../buffer.h"
#include "ad799x.h"

View file

@ -17,7 +17,7 @@
#include <linux/bitops.h>
#include "../iio.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger_consumer.h"

View file

@ -17,7 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
/*
* ADT7310 registers definition
*/

View file

@ -17,6 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
/*
* ADT7410 registers definition

View file

@ -34,7 +34,8 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../events.h"
#include "../buffer.h"
#include "max1363.h"

View file

@ -15,7 +15,7 @@
#include <linux/bitops.h>
#include "../iio.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "../trigger_consumer.h"

View file

@ -20,6 +20,7 @@
#include <linux/module.h>
#include "../iio.h"
#include "../events.h"
#include "../sysfs.h"
#include "adt7316.h"

View file

@ -11,7 +11,6 @@
#define _IIO_BUFFER_GENERIC_H_
#include <linux/sysfs.h>
#include "iio.h"
#include "chrdev.h"
#ifdef CONFIG_IIO_BUFFER

View file

@ -15,7 +15,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
/*
* AD7150 registers definition
*/

View file

@ -1,25 +0,0 @@
/* The industrial I/O core - character device related
*
* Copyright (c) 2008 Jonathan Cameron
*
* 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 _IIO_CHRDEV_H_
#define _IIO_CHRDEV_H_
/**
* struct iio_event_data - The actual event being pushed to userspace
* @id: event identifier
* @timestamp: best estimate of time of event occurrence (often from
* the interrupt handler)
*/
struct iio_event_data {
u64 id;
s64 timestamp;
};
#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
#endif

View file

@ -18,6 +18,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include "dac.h"
#include "ad5504.h"

View file

@ -0,0 +1,72 @@
/* The industrial I/O - event passing to userspace
*
* Copyright (c) 2008-2011 Jonathan Cameron
*
* 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 _IIO_EVENTS_H_
#define _IIO_EVENTS_H_
#include <linux/ioctl.h>
#include "types.h"
/**
* struct iio_event_data - The actual event being pushed to userspace
* @id: event identifier
* @timestamp: best estimate of time of event occurrence (often from
* the interrupt handler)
*/
struct iio_event_data {
u64 id;
s64 timestamp;
};
#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
enum iio_event_type {
IIO_EV_TYPE_THRESH,
IIO_EV_TYPE_MAG,
IIO_EV_TYPE_ROC,
IIO_EV_TYPE_THRESH_ADAPTIVE,
IIO_EV_TYPE_MAG_ADAPTIVE,
};
enum iio_event_direction {
IIO_EV_DIR_EITHER,
IIO_EV_DIR_RISING,
IIO_EV_DIR_FALLING,
};
#define IIO_EVENT_CODE(chan_type, diff, modifier, direction, \
type, chan, chan1, chan2) \
(((u64)type << 56) | ((u64)diff << 55) | \
((u64)direction << 48) | ((u64)modifier << 40) | \
((u64)chan_type << 32) | (chan2 << 16) | chan1 | chan)
#define IIO_EV_DIR_MAX 4
#define IIO_EV_BIT(type, direction) \
(1 << (type*IIO_EV_DIR_MAX + direction))
#define IIO_MOD_EVENT_CODE(channelclass, number, modifier, \
type, direction) \
IIO_EVENT_CODE(channelclass, 0, modifier, direction, type, number, 0, 0)
#define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction) \
IIO_EVENT_CODE(channelclass, 0, 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) & 0xCF)
#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
/* Event code number extraction depends on which type of event we have.
* Perhaps review this function in the future*/
#define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF)
#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
#endif

View file

@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16260.h"

View file

@ -7,13 +7,12 @@
* under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*/
#ifndef _INDUSTRIAL_IO_H_
#define _INDUSTRIAL_IO_H_
#include <linux/device.h>
#include <linux/cdev.h>
#include "types.h"
/* IIO TODO LIST */
/*
* Provide means of adjusting timer accuracy.
@ -25,42 +24,6 @@ enum iio_data_type {
IIO_PROCESSED,
};
enum iio_chan_type {
/* real channel types */
IIO_VOLTAGE,
IIO_CURRENT,
IIO_POWER,
IIO_ACCEL,
IIO_ANGL_VEL,
IIO_MAGN,
IIO_LIGHT,
IIO_INTENSITY,
IIO_PROXIMITY,
IIO_TEMP,
IIO_INCLI,
IIO_ROT,
IIO_ANGL,
IIO_TIMESTAMP,
IIO_CAPACITANCE,
};
enum iio_modifier {
IIO_NO_MOD,
IIO_MOD_X,
IIO_MOD_Y,
IIO_MOD_Z,
IIO_MOD_X_AND_Y,
IIO_MOD_X_ANX_Z,
IIO_MOD_Y_AND_Z,
IIO_MOD_X_AND_Y_AND_Z,
IIO_MOD_X_OR_Y,
IIO_MOD_X_OR_Z,
IIO_MOD_Y_OR_Z,
IIO_MOD_X_OR_Y_OR_Z,
IIO_MOD_LIGHT_BOTH,
IIO_MOD_LIGHT_IR,
};
/* Could add the raw attributes as well - allowing buffer only devices */
enum iio_chan_info_enum {
IIO_CHAN_INFO_SCALE_SHARED,

View file

@ -21,7 +21,8 @@
#include "iio.h"
#include "sysfs.h"
#include "buffer_generic.h"
#include "events.h"
#include "buffer.h"
#include "iio_simple_dummy.h"
/*

View file

@ -14,6 +14,7 @@
#include "iio.h"
#include "sysfs.h"
#include "events.h"
#include "iio_simple_dummy.h"
/* Evgen 'fakes' interrupt events for this example */

View file

@ -21,7 +21,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "../ring_sw.h"
#include "ad5933.h"

View file

@ -28,7 +28,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "adis16400.h"
enum adis16400_chip_variant {

View file

@ -24,7 +24,7 @@
#include "iio.h"
#include "iio_core.h"
#include "sysfs.h"
#include "buffer_generic.h"
#include "buffer.h"
static const char * const iio_endian_prefix[] = {
[IIO_BE] = "be",

View file

@ -25,8 +25,8 @@
#include "iio.h"
#include "iio_core.h"
#include "iio_core_trigger.h"
#include "chrdev.h"
#include "sysfs.h"
#include "events.h"
/* IDA to assign each registered device a unique id*/
static DEFINE_IDA(iio_ida);

View file

@ -1,7 +1,7 @@
#include <linux/kfifo.h>
#include "iio.h"
#include "buffer_generic.h"
#include "buffer.h"
extern const struct iio_buffer_access_funcs kfifo_access_funcs;

View file

@ -37,6 +37,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include "tsl2563.h"
/* Use this many bits for fraction part. */

View file

@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../buffer_generic.h"
#include "../buffer.h"
#include "meter.h"
#include "ade7758.h"

View file

@ -23,7 +23,7 @@
#ifndef _IIO_RING_SW_H_
#define _IIO_RING_SW_H_
#include "buffer_generic.h"
#include "buffer.h"
/**
* ring_sw_access_funcs - access functions for a software ring buffer

View file

@ -114,47 +114,4 @@ struct iio_const_attr {
#define IIO_CONST_ATTR_TEMP_SCALE(_string) \
IIO_CONST_ATTR(in_temp_scale, _string)
enum iio_event_type {
IIO_EV_TYPE_THRESH,
IIO_EV_TYPE_MAG,
IIO_EV_TYPE_ROC,
IIO_EV_TYPE_THRESH_ADAPTIVE,
IIO_EV_TYPE_MAG_ADAPTIVE,
};
enum iio_event_direction {
IIO_EV_DIR_EITHER,
IIO_EV_DIR_RISING,
IIO_EV_DIR_FALLING,
};
#define IIO_EVENT_CODE(chan_type, diff, modifier, direction, \
type, chan, chan1, chan2) \
(((u64)type << 56) | ((u64)diff << 55) | \
((u64)direction << 48) | ((u64)modifier << 40) | \
((u64)chan_type << 32) | (chan2 << 16) | chan1 | chan)
#define IIO_EV_DIR_MAX 4
#define IIO_EV_BIT(type, direction) \
(1 << (type*IIO_EV_DIR_MAX + direction))
#define IIO_MOD_EVENT_CODE(channelclass, number, modifier, \
type, direction) \
IIO_EVENT_CODE(channelclass, 0, modifier, direction, type, number, 0, 0)
#define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction) \
IIO_EVENT_CODE(channelclass, 0, 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) & 0xCF)
#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
/* Event code number extraction depends on which type of event we have.
* Perhaps review this function in the future*/
#define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF)
#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
#endif /* _INDUSTRIAL_IO_SYSFS_H_ */

View file

@ -0,0 +1,49 @@
/* industrial I/O data types needed both in and out of kernel
*
* Copyright (c) 2008 Jonathan Cameron
*
* 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 _IIO_TYPES_H_
#define _IIO_TYPES_H_
enum iio_chan_type {
/* real channel types */
IIO_VOLTAGE,
IIO_CURRENT,
IIO_POWER,
IIO_ACCEL,
IIO_ANGL_VEL,
IIO_MAGN,
IIO_LIGHT,
IIO_INTENSITY,
IIO_PROXIMITY,
IIO_TEMP,
IIO_INCLI,
IIO_ROT,
IIO_ANGL,
IIO_TIMESTAMP,
IIO_CAPACITANCE,
};
enum iio_modifier {
IIO_NO_MOD,
IIO_MOD_X,
IIO_MOD_Y,
IIO_MOD_Z,
IIO_MOD_X_AND_Y,
IIO_MOD_X_ANX_Z,
IIO_MOD_Y_AND_Z,
IIO_MOD_X_AND_Y_AND_Z,
IIO_MOD_X_OR_Y,
IIO_MOD_X_OR_Z,
IIO_MOD_Y_OR_Z,
IIO_MOD_X_OR_Y_OR_Z,
IIO_MOD_LIGHT_BOTH,
IIO_MOD_LIGHT_IR,
};
#endif /* _IIO_TYPES_H_ */