diff options
| author |  dmaas
| 2003-01-06 04:08:00 +0000 |
|---|---|---|
| committer | dmaas
| 2003-01-06 04:08:00 +0000 |
| commit | ce3cc1bd34bb2f450b231ffc92765f88d3422cad (patch) | |
| tree | b9b2a332ef8629d1b02ff89714e6698262c203fe /src/raw1394_private.h | |
| parent | emulate legacy ISO reception API on top of new rawiso API (diff) | |
back out previous commit - don't drop the legacy API just yet
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@100 53a565d1-3bb7-0310-b661-cf11e63c67ab
Diffstat (limited to '')
| -rw-r--r-- | src/raw1394_private.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/raw1394_private.h b/src/raw1394_private.h index 6cbc165..98e073d 100644 --- a/src/raw1394_private.h +++ b/src/raw1394_private.h @@ -1,3 +1,4 @@ + #ifndef _RAW1394_PRIVATE_H #define _RAW1394_PRIVATE_H @@ -20,7 +21,8 @@ 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 */ @@ -28,7 +30,7 @@ struct raw1394_handle { /* iso XMIT only: */ unsigned int iso_buf_stride; /* offset between successive packets */ - unsigned int next_packet; /* buffer index of next packet to be transmitted */ + unsigned int next_packet; /* index of next packet to be transmitted */ /* status buffer, updated from _raw1394_iso_iterate() */ struct raw1394_iso_status iso_status; @@ -38,10 +40,6 @@ 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 */ }; |