peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a new callback response for iso_xmit handlers: RAW1394_ISO_AGAIN. 

This would be returned when the callback doesn't have enough data to
create a complete packet. This can occur when the xmit buffers are
bigger than the buffers supplying the data. It is not nescessarily an
error, because there are enough packets in the xmit buffer. This
response could give the data supplyer more time to fill the intermediate
buffer without losing any packets.

Signed-off-by: Pieter Palmers <pieterp@joow.be>
Signed-off-by: Dan Dennedy <dan@dennedy.org>


git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@161 53a565d1-3bb7-0310-b661-cf11e63c67ab
This commit is contained in:
ddennedy 2006-03-04 01:17:46 +00:00
parent a51052f41b
commit 96aaa4ca65
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/iso.c
View File

@ -316,6 +316,14 @@ static int _raw1394_iso_xmit_queue_packets(raw1394handle_t handle)
packets.n_packets++; packets.n_packets++;
if(disp == RAW1394_ISO_DEFER) { if(disp == RAW1394_ISO_DEFER) {
/* queue an event so that we don't hang in the next read() */
if(ioctl(handle->fd, RAW1394_IOC_ISO_QUEUE_ACTIVITY, 0))
goto out_produce;
break;
} else if(disp == RAW1394_ISO_AGAIN) {
/* the last packet was not ready, decrement counter */
packets.n_packets--;
/* queue an event so that we don't hang in the next read() */ /* queue an event so that we don't hang in the next read() */
if(ioctl(handle->fd, RAW1394_IOC_ISO_QUEUE_ACTIVITY, 0)) if(ioctl(handle->fd, RAW1394_IOC_ISO_QUEUE_ACTIVITY, 0))
goto out_produce; goto out_produce;

5
src/raw1394.h
View File

@ -106,6 +106,11 @@ enum raw1394_iso_disposition {
/* (transmission only) - like ISO_STOP, but don't wait for the buffer to empty */ /* (transmission only) - like ISO_STOP, but don't wait for the buffer to empty */
RAW1394_ISO_STOP_NOSYNC = 4, RAW1394_ISO_STOP_NOSYNC = 4,
/* (transmission only) - use this if the data you need for the packet was not ready yet
* The packet queueing will retry at a later point
*/
RAW1394_ISO_AGAIN = 5,
}; };
enum raw1394_modify_mode { enum raw1394_modify_mode {