Changeset 1868

Timestamp:

07/15/10 07:20:13 (2 years ago)

Author:

jwoithe

Message:

RME: more work to stabilise streaming startup.
RME: delete the tx/rx stream processors when the RME device object is destroyed (fixes several iso handler related issues at shutdown).

Files:

• trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/rme/fireface_hw.cpp (modified) (3 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (1 diff)

trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp

@@ -340 +340 @@
-RmeReceiveStreamProcessor *rxsp = static_cast<Rme::Device *>
-  (&m_Parent)->getRxSP();
+#if 0
-debugOutput(DEBUG_LEVEL_VERBOSE, "tx timestamp: %lld, ct=%08x (%03ld,%04ld,%04ld)\n",
-  m_last_timestamp, pkt_ctr, CYCLE_TIMER_GET_SECS(pkt_ctr), CYCLE_TIMER_GET_CYCLES(pkt_ctr), CYCLE_TIMER_GET_OFFSET(pkt_ctr));
-debugOutput(DEBUG_LEVEL_VERBOSE, "  hw tx: 0x%08x\n", rxsp->n_hw_tx_buffer_samples);
+#endif
-//if (rxsp->n_hw_tx_buffer_samples < 0x38)
-
+
+
+
+
+
+
+
+
+
-        *length = getMaxPacketSize();
-
-has_dryrun = 1;
-
-
-
+  
+} else
+
+
+//
-    }
-

trunk/libffado/src/rme/fireface_hw.cpp

@@ -746 +746 @@
-    }
-
+/*
-{signed int i;
-  printf("addr %016llx\n", addr);
@@ -756 +757 @@
-readRegister(0xfffff000040cLL);
-readRegister(0xfffff000040cLL);
-
+
-    return writeBlock(addr, buf, size);
+
+//  i = writeBlock(addr, buf, size);
+//  get_hardware_streaming_status(buf, 4);
+//printf(" - 0x%08x 0x%08x 0x%08x 0x%08x\n",
+//  buf[0], buf[1], buf[2], buf[3]);
+//  return i;
-}
-
@@ -781 +788 @@
-        }
-
-
+//
-
-printf("start 0x%016llx data: %08x\n", addr, data);
-        ret = writeRegister(addr, data);
+printf("  ret=%d\n", ret);
-        if (ret == 0) {
-            dev_config->is_streaming = 1;

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -101 +101 @@
-Device::~Device()
-{
+    delete m_receiveProcessor;
+    delete m_transmitProcessor;
+
-    if (iso_tx_channel>=0 && !get1394Service().freeIsoChannel(iso_tx_channel)) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Could not free tx iso channel %d\n", iso_tx_channel);