Changeset 1684

Timestamp:

10/12/09 05:11:09 (13 years ago)

Author:

jwoithe

Message:

RME: more preparatory work on the streaming system

Files:

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

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

@@ -97 +97 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- */
-enum StreamProcessor::eChildReturnValue
@@ -113 +107 @@
-{
-    if (length > 8) {
-a CIP-like
-header followed by a number of events (8 for 1x rates, 16
-for 2x rates, 32 for 4x rates)
-quadlet_t *quadlet = (quadlet_t *)data;
-unsigned int dbs = get_bits(CondSwapFromBus32(quadlet[0]), 23, 8);  // Size of one event in terms of fdf_size
-unsigned int fdf_size = get_bits(CondSwapFromBus32(quadlet[1]), 23, 8) == 0x22 ? 32:0; // Event unit size in bits
+24-bit audio
+data encoded in 32-bit integers.  The LSB of the 32-bit integers
+of certain channels are used for house-keeping information
+// The number of samples for each channel present in a packet
+// varies: 7 for 1x rates, 15 for 2x rates and 25 for 4x rates.
+// quadlet_t *quadlet = (quadlet_t *)data;
-
-        // Don't even attempt to process a packet if it isn't what we expect
-
-
-
-
-
-
-
+
+
+
-            return eCRV_Invalid;
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        return eCRV_OK;
@@ -176 +164 @@
-    #endif
-
-(data+8)
+data
-        return eCRV_OK;
-    } else {
@@ -229 +217 @@
-
-    // Use char here since a port's source address won't necessarily be
-
-certain architectures.  Besides, the source (data coming directly
-from the RME) isn't structured in quadlets anyway; it mainly
-consists of packed 24-bit integers
+ certain
+architectures.  Besides, the source (data coming directly from the
+RME) isn't structured in quadlets anyway; it consists 24-bit integers
+within 32-bit quadlets with the LSB being a housekeeping byte
-
-    unsigned char *src_data;

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -89 +89 @@
-    , iso_tx_channel( -1 )
-    , iso_rx_channel( -1 )
+    , m_receiveProcessor( NULL )
+    , m_transmitProcessor( NULL )
-    , m_MixerContainer( NULL )
-    , m_ControlContainer( NULL )
@@ -614 +616 @@
-    config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "xmit_sp_dll_bw", xmit_sp_dll_bw);
-
+    // Set up receive stream processor, initialise it and set DLL bw
+    // TODO: set event_size properly; the value below is just a placeholder.
+    signed int event_size = 0x150;
+    #warning event_size needs setting up
+    m_receiveProcessor = new Streaming::RmeReceiveStreamProcessor(*this, 
+      m_rme_model, event_size);
+    m_receiveProcessor->setVerboseLevel(getDebugLevel());
+    if (!m_receiveProcessor) {
+        debugFatal("Could not initialize receive processor!\n");
+        return false;
+    }
+    if (!m_receiveProcessor->setDllBandwidth(recv_sp_dll_bw)) {
+        debugFatal("Could not set DLL bandwidth\n");
+        delete m_receiveProcessor;
+        m_receiveProcessor = NULL;
+        return false;
+    }
+
+    // Add ports to the processor - TODO
+    std::string id=std::string("dev?");
+    if (!getOption("id", id)) {
+        debugWarning("Could not retrieve id parameter, defaulting to 'dev?'\n");
+    }
+
-    // Other things to be done:
-    //  * create a receive stream processor, set DLL bandwidth, add ports
-    //  * create a transmit stream processor, set DLL bandwidth, add ports
-

trunk/libffado/src/rme/rme_avdevice.h

@@ -34 +34 @@
-
-#include "fireface_def.h"
-
+
+
-
-#include "rme_shm.h"
@@ -128 +129 @@
-    signed int iso_tx_channel, iso_rx_channel;
-
+    Streaming::RmeReceiveStreamProcessor *m_receiveProcessor;
+    Streaming::RmeTransmitStreamProcessor *m_transmitProcessor;
+
-private:
-    unsigned long long int cmd_buffer_addr();