summaryrefslogtreecommitdiffstats
path: root/src/fw.h
diff options
context:
space:
mode:
authorGravatar Jarod Wilson 2008-12-09 00:08:35 -0500
committerGravatar Dan Dennedy 2008-12-08 21:13:41 -0800
commitd69397ae8f3519cf291ba2efc173ad257376cf0d (patch)
treeff3ce487f700d6ab4b4ff5322165718cd4549d9f /src/fw.h
parentChecking /dev/raw1394 and recommendation for creating it for the install make... (diff)
Fix iso_shutdown with juju firewire stack
Make iso start/stop/start sequences on the same handle, such as those used by apps such as MythTV behave as expected. I can finally watch video off my cable box over FireWire using MythTV w/the juju stack now. :) Initially, seemed a one-liner might be the ticket (setting handle->iso.fd = -1 at the end of fw_iso_shutdown()), but that led to memory corruption and a locked up system. What ultimately worked was essentially mimicking what the old stack did to track iso state, and call fw_iso_stop() from fw_iso_shutdown() as needed. Nb: Only lightly tested with iso receive via MythTV, but its all fairly straight-forward, I think. Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Dan Dennedy <dan@dennedy.org>
Diffstat (limited to 'src/fw.h')
-rw-r--r--src/fw.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/fw.h b/src/fw.h
index 5b99245..56b59d9 100644
--- a/src/fw.h
+++ b/src/fw.h
@@ -129,6 +129,7 @@ struct fw_handle {
int prebuffer;
int start_on_cycle;
enum raw1394_iso_dma_recv_mode recv_mode;
+ enum { ISO_STOPPED, ISO_ACTIVE } state;
raw1394_iso_xmit_handler_t xmit_handler;
raw1394_iso_recv_handler_t recv_handler;
unsigned char *buffer, *buffer_end, *head;