summaryrefslogtreecommitdiffstats
path: root/src/raw1394.h
diff options
context:
space:
mode:
authorGravatar dmaas 2002-12-16 05:11:45 +0000
committerGravatar dmaas 2002-12-16 05:11:45 +0000
commite01decd75c1455c9fb018494d73ee77928f12ba6 (patch)
tree00a3937aac6ece03bddec9c76ea7a098b2f24062 /src/raw1394.h
parentfix cplusplus extern C block (diff)
rawiso updates:
- 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
Diffstat (limited to 'src/raw1394.h')
-rw-r--r--src/raw1394.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/raw1394.h b/src/raw1394.h
index 42dfe21..8364301 100644
--- a/src/raw1394.h
+++ b/src/raw1394.h
@@ -72,23 +72,23 @@ enum raw1394_iso_disposition {
extern "C" {
#endif
-typedef int (*raw1394_iso_xmit_handler_t)(raw1394handle_t,
- unsigned char *data,
- unsigned int *len,
- unsigned char *tag,
- unsigned char *sy,
- unsigned int cycle,
- unsigned int dropped);
-
-typedef int (*raw1394_iso_recv_handler_t)(raw1394handle_t,
- unsigned char *data,
- unsigned int len,
- unsigned char channel,
- unsigned char tag,
- unsigned char sy,
- unsigned int cycle,
- unsigned int dropped);
+typedef enum raw1394_iso_disposition (*raw1394_iso_xmit_handler_t)(raw1394handle_t,
+ unsigned char *data,
+ unsigned int *len,
+ unsigned char *tag,
+ unsigned char *sy,
+ unsigned int cycle,
+ unsigned int dropped);
+typedef enum raw1394_iso_disposition (*raw1394_iso_recv_handler_t)(raw1394handle_t,
+ unsigned char *data,
+ unsigned int len,
+ unsigned char channel,
+ unsigned char tag,
+ unsigned char sy,
+ unsigned int cycle,
+ unsigned int dropped);
+
int raw1394_iso_xmit_init(raw1394handle_t handle,
raw1394_iso_xmit_handler_t handler,
unsigned int buf_packets,