On 10/21/2011 11:09 AM, Jonathan Cameron wrote: > 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. This seems to work nicely, thanks. There two minor issues left, but those were also present before the restructuring, I'll send patches shortly. Another issue is that you can only open the iio character device if your device has buffer support, so without buffer support no event support either. Michael said that has been some discussion on this before, do you remember the conclusions of that discussion? > [...] > --- /dev/null > +++ b/drivers/staging/iio/events.h > @@ -0,0 +1,71 @@ > +/* 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. > + */ > +#include "types.h" Any specific reason why you put this include above the include guard? > + > +#ifndef _IIO_EVENTS_H_ > +#define _IIO_EVENTS_H_ > + > [...] > diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h > index 429589f..339b609 100644 > --- a/drivers/staging/iio/iio.h > +++ b/drivers/staging/iio/iio.h > @@ -7,7 +7,7 @@ > * under the terms of the GNU General Public License version 2 as published by > * the Free Software Foundation. > */ > - > +#include "types.h" Same here > #ifndef _INDUSTRIAL_IO_H_ > #define _INDUSTRIAL_IO_H_ > [...] -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
