Changeset 2076

Timestamp:

03/08/12 14:49:56 (11 years ago)

Author:

jwoithe

Message:

isohandlermanager: whitespace cleanup around changes from r2074 and add an explanatory comment. As per the comments, the change prevents getPacket() being called prior to the housekeeping data being properly reset. When these were only reset at the end of the enable() method this was observed. This change may make restarts more reliable on certain devices, which occurs (for example) when jackd is switched out of freewheeling mode.

Files:

• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -1766 +1766 @@
-    raw1394_set_userdata(m_handle, static_cast<void *>(this));
-
+    // Reset housekeeping data before preparing and starting the handler. 
+    // If only done afterwards, the transmit handler could be called before
+    // these have been reset, leading to problems in getPacket().
-#ifdef DEBUG
-    m_min_ahead = 7999;
-#endif
-
-    m_packets = 0;
+    m_last_cycle = -1;
-
-    // indicate that the first iterate() still has to occur.
-    m_last_now = 0xFFFFFFFF;
-    m_last_packet_handled_at = 0xFFFFFFFF;
-
-    m_last_cycle = -1;
-
-
-    // prepare the handler, allocate the resources