summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Clemens Ladisch 2012-03-19 22:07:46 +0100
committerGravatar Stefan Richter 2012-03-19 22:52:41 +0100
commitd3ba40481f6b9193c9c9b1c8b92d4a87fad45cb9 (patch)
tree43691dfe9ca98ee0607775af2c4537cad2e96758 /src
parentFix incorrect use of == instead of =. (diff)
Implement raw1394_iso_recv_flush() on Juju
Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'src')
-rw-r--r--src/fw-iso.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/fw-iso.c b/src/fw-iso.c
index d44a945..ea0a249 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
@@ -431,9 +431,14 @@ int fw_iso_xmit_sync(raw1394handle_t handle)
int fw_iso_recv_flush(fw_handle_t handle)
{
- /* FIXME: huh, we'll need kernel support here... */
+#ifdef FW_CDEV_IOC_FLUSH_ISO /* added in kernel 3.4 */
+ struct fw_cdev_flush_iso flush;
+ flush.handle = handle->iso.kernel_handle;
+ return ioctl(handle->iso.fd, FW_CDEV_IOC_FLUSH_ISO, &flush);
+#else
return 0;
+#endif /* defined(FW_CDEV_IOC_FLUSH_ISO) */
}
static unsigned int
eader'>2002-12-24update iso API for multi-channel reception and new packet buffer layoutGravatar dmaas 4-123/+236 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@98 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-20oops, irq_interval needs to be signedGravatar anonymous 1-1/+1 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@97 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-20dmaas - renamed exported arm definitions into the raw1394_ namespace; ↵Gravatar anonymous 3-124/+48 brought kernel-raw1394.h back in sync with the kernel version git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@96 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-16rawiso updates:Gravatar dmaas 3-18/+25 - changed return type of rawiso xmit/recv handlers from int to enum raw1394_iso_disposition - added an ioctl (RAW1394_ISO_QUEUE_ACTIVITY) to force an ISO_ACTIVITY event into the queue. This is needed for handling RAW1394_ISO_DEFER, to kick us out of the next read() instead of sleeping forever. - removed references to "8-byte" isochronous header - this is an OHCI-specific implementation detail git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@95 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-11-18fix cplusplus extern C blockGravatar ddennedy 1-4/+4 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@94 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-11-18merged rawiso branchGravatar ddennedy 7-6/+488 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@93 53a565d1-3bb7-0310-b661-cf11e63c67ab