Changeset 1266

Timestamp:

06/23/08 01:16:51 (13 years ago)

Author:

ppalmers

Message:

fix compilation issue. allow more debug output when streaming problems occur.

Files:

• branches/libffado-2.0/src/libieee1394/IsoHandler.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandler.h (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (1 diff)

branches/libffado-2.0/src/libieee1394/IsoHandler.cpp

@@ -76 +76 @@
-
-    IsoHandler *handler = static_cast<IsoHandler *>(raw1394_get_userdata(handle));
+    // FIXME: we should update the generation.
-    assert(handler);
-    return handler->handleBusReset(generation);
@@ -289 +290 @@
-IsoHandler::handleBusReset(unsigned int generation)
-{
-VERBOSE
+NORMAL
-
-    #define CSR_CYCLE_TIME            0x200
@@ -497 +498 @@
-    // leave the offset field (for now?)
-
-
-
-
+
+
+
+
-    #ifdef DEBUG
-    m_packets++;
-    if (length > m_max_packet_size) {
-        debugWarning("(%p, %s) packet too large: len=%u max=%u\n",
@@ -588 +589 @@
-        m_last_packet_handled_at = pkt_ctr;
-    }
-
-
-
+
+
+
+
+
-
-    #ifdef DEBUG
-    m_packets++;
-    if(m_last_cycle == -1) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Handler for %s SP %p is alive (cycle = %d)\n", getTypeString(), this, cycle);

branches/libffado-2.0/src/libieee1394/IsoHandler.h

@@ -201 +201 @@
-
-public:
+    unsigned int    m_packets;
-    #ifdef DEBUG
-    unsigned int    m_packets;
-    unsigned int    m_dropped;
-    unsigned int    m_skipped;

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp

@@ -1843 +1843 @@
-    PortManager::setVerboseLevel(l);
-    m_data_buffer->setVerboseLevel(l);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-}
-