Changeset 1688

Timestamp:

10/15/09 06:55:37 (14 years ago)

Author:

jwoithe

Message:

RME: more work on the streaming system.

Files:

• trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/rme/fireface_hw.cpp (modified) (4 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (5 diffs)

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

@@ -106 +106 @@
-                                                uint32_t pkt_ctr)
-{
+// For testing
+debugOutput(DEBUG_LEVEL_VERBOSE, "data packet header\n");
+
-    if (length > 8) {
-        // The iso data blocks from the RMEs comprise 24-bit audio
@@ -163 +166 @@
-    }
-    #endif
+
+// For testing
+debugOutput(DEBUG_LEVEL_VERBOSE, "data packet data\n");
-
-    if(m_data_buffer->writeFrames(n_events, (char *)data, m_last_timestamp)) {

trunk/libffado/src/rme/fireface_hw.cpp

@@ -648 +648 @@
-{
-    // tx_channel is the ISO channel the PC will transmit on.
-4
+5
-    fb_nodeaddr_t addr;
-    unsigned int size;
+
+debugOutput(DEBUG_LEVEL_VERBOSE, "*** stream init: %d, %d, %d\n",
+  sample_rate, num_channels, tx_channel);
-
-    buf[0] = sample_rate;
@@ -683 +686 @@
-    config_lock();
-    if (not(hardware_is_streaming())) {
+debugOutput(DEBUG_LEVEL_VERBOSE,"*** starting: listen=%d, num_ch=%d\n", listen_channel, num_channels);
-        if (m_rme_model == RME_MODEL_FIREFACE400) {
-            addr = RME_FF400_STREAM_START_REG;
@@ -693 +697 @@
-
-        ret = writeRegister(addr, data);
-!
+=
-            dev_config->is_streaming = 1;
-        }
@@ -721 +725 @@
-
-        ret = writeBlock(addr, buf, size);
-!
+=
-            dev_config->is_streaming = 0;
-        }

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -567 +567 @@
-    // rx channel is also allocated for the FF400.  The FF800 chooses
-    // the rx channel to be used but does not handle the bus-level
-/
+.
-    if (iso_tx_channel < 0) {
-        iso_tx_channel = get1394Service().allocateIsoChannelGeneric(bandwidth);
@@ -623 +623 @@
-      m_rme_model, event_size);
-    m_receiveProcessor->setVerboseLevel(getDebugLevel());
-
+->init()
-        debugFatal("Could not initialize receive processor!\n");
-        return false;
@@ -634 +634 @@
-    }
-
+
-    // Add ports to the processor - TODO
-    std::string id=std::string("dev?");
@@ -648 +649 @@
-int
-Device::getStreamCount() {
-
+
+
-}
-
-Streaming::StreamProcessor *
-Device::getStreamProcessorByIndex(int i) {
+    switch (i) {
+        case 0:
+            return m_receiveProcessor;
+        case 1:
+            return m_transmitProcessor;
+        default:
+            debugWarning("Invalid stream index %d\n", i);
+    }
-    return NULL;
-}
@@ -663 +673 @@
-    // (unconditionally flagging them as being successful).
-    if (i == 0) {
+        m_receiveProcessor->setChannel(iso_rx_channel);
+        // m_transmitProcessor->setChannel(iso_tx_channel);
-        if (hardware_start_streaming(iso_rx_channel) != 0)
-            return false;