Message ID | 1271438745.30561.126.camel@emiko |
---|---|
State | Accepted |
Delegated to: | Andy Whitcroft |
Headers | show |
On Fri, Apr 16, 2010 at 10:25:45AM -0700, Leann Ogasawara wrote: > >From 9fd5520c6803c77052a78f10ae1eb0bfe2358410 Mon Sep 17 00:00:00 2001 > From: Bernd Porr <berndporr@f2s.com> > Date: Fri, 27 Nov 2009 12:07:48 +0000 > Subject: [PATCH 3/3] Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK > > BugLink: http://bugs.launchpad.net/bugs/483343 > > The flag COMEDI_CB_BLOCK was marked as "depricated in the header file". > However, this flag is important to wake up the data-reader (and writer) > after new data has arrived from(for) the DAQ card. > > Signed-off-by: Bernd Porr <berndporr@f2s.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > > (cherry picked from commit d103bef45180892515345e761f42db5601de9846 upstream) > > Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > drivers/staging/comedi/comedi.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h > index 957b640..fc36f2a 100644 > --- a/drivers/staging/comedi/comedi.h > +++ b/drivers/staging/comedi/comedi.h > @@ -455,7 +455,7 @@ extern "C" { > > #define COMEDI_CB_EOS 1 /* end of scan */ > #define COMEDI_CB_EOA 2 /* end of acquisition */ > -#define COMEDI_CB_BLOCK 4 /* DEPRECATED: convenient block size */ > +#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */ > #define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */ > #define COMEDI_CB_ERROR 16 /* card error during acquisition */ > #define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */ Essentially a noop. Acked-by: Andy Whitcroft <apw@canonical.com> -apw
On Fri, 2010-04-16 at 10:25 -0700, Leann Ogasawara wrote: > >From 9fd5520c6803c77052a78f10ae1eb0bfe2358410 Mon Sep 17 00:00:00 2001 > From: Bernd Porr <berndporr@f2s.com> > Date: Fri, 27 Nov 2009 12:07:48 +0000 > Subject: [PATCH 3/3] Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK > > BugLink: http://bugs.launchpad.net/bugs/483343 > > The flag COMEDI_CB_BLOCK was marked as "depricated in the header file". > However, this flag is important to wake up the data-reader (and writer) > after new data has arrived from(for) the DAQ card. > > Signed-off-by: Bernd Porr <berndporr@f2s.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > > (cherry picked from commit d103bef45180892515345e761f42db5601de9846 upstream) > > Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > drivers/staging/comedi/comedi.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h > index 957b640..fc36f2a 100644 > --- a/drivers/staging/comedi/comedi.h > +++ b/drivers/staging/comedi/comedi.h > @@ -455,7 +455,7 @@ extern "C" { > > #define COMEDI_CB_EOS 1 /* end of scan */ > #define COMEDI_CB_EOA 2 /* end of acquisition */ > -#define COMEDI_CB_BLOCK 4 /* DEPRECATED: convenient block size */ > +#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */ > #define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */ > #define COMEDI_CB_ERROR 16 /* card error during acquisition */ > #define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */ > -- > 1.7.0 > Changed to reflect the changed semantics. Acked-by: Colin King <colin.king@canonical.com>
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 957b640..fc36f2a 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -455,7 +455,7 @@ extern "C" { #define COMEDI_CB_EOS 1 /* end of scan */ #define COMEDI_CB_EOA 2 /* end of acquisition */ -#define COMEDI_CB_BLOCK 4 /* DEPRECATED: convenient block size */ +#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */ #define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */ #define COMEDI_CB_ERROR 16 /* card error during acquisition */ #define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */