summaryrefslogtreecommitdiffstats
path: root/src/raw1394_private.h
diff options
context:
space:
mode:
authorGravatar dmaas 2003-01-05 20:58:19 +0000
committerGravatar dmaas 2003-01-05 20:58:19 +0000
commit5bb327dc9030acfdc281583f1b1bc67380c04cbc (patch)
tree66900ca110fddb67f656fd9877228ee7ef43a66f /src/raw1394_private.h
parentupdate iso API for multi-channel reception and new packet buffer layout (diff)
emulate legacy ISO reception API on top of new rawiso API
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@99 53a565d1-3bb7-0310-b661-cf11e63c67ab
Diffstat (limited to 'src/raw1394_private.h')
-rw-r--r--src/raw1394_private.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/raw1394_private.h b/src/raw1394_private.h
index 98e073d..6cbc165 100644
--- a/src/raw1394_private.h
+++ b/src/raw1394_private.h
@@ -1,4 +1,3 @@
-
#ifndef _RAW1394_PRIVATE_H
#define _RAW1394_PRIVATE_H
@@ -21,8 +20,7 @@ struct raw1394_handle {
tag_handler_t tag_handler;
arm_tag_handler_t arm_tag_handler;
fcp_handler_t fcp_handler;
- iso_handler_t iso_handler[64];
-
+
/* new ISO API */
/* memory mapping of the DMA buffer */
@@ -30,7 +28,7 @@ struct raw1394_handle {
/* iso XMIT only: */
unsigned int iso_buf_stride; /* offset between successive packets */
- unsigned int next_packet; /* index of next packet to be transmitted */
+ unsigned int next_packet; /* buffer index of next packet to be transmitted */
/* status buffer, updated from _raw1394_iso_iterate() */
struct raw1394_iso_status iso_status;
@@ -40,6 +38,10 @@ struct raw1394_handle {
raw1394_iso_xmit_handler_t iso_xmit_handler;
raw1394_iso_recv_handler_t iso_recv_handler;
+ /* legacy ISO API emulation */
+ int legacy_iso_active; /* 1 if we are in legacy emulation mode */
+ iso_handler_t iso_handler[64];
+
struct raw1394_request req;
quadlet_t buffer[HBUF_SIZE/4]; /* 2048 */
};