Changeset 1834

Timestamp:

05/17/10 07:39:19 (2 years ago)

Author:

jwoithe

Message:

MOTU: rename the ADAT channels on the 828mk3 to be more consistent with the hardware naming convention.
MOTU: if present on the interface, utilise the modes of the two independent ADAT interfaces when configuring such things as audio channels (some "mark 3" devices have 2 ADAT interfaces). Note that getting/setting the optical modes on Mark3/G3 devices is yet to be coded.
MOTU: attempt to be more complete with the 828mk3 channel specification with respect to optical port modes.
MOTU: streaming to/from the 828Mk3 device seems to be working at 1x rates if the device is configured with both ADAT interfaces set for ADAT input/output.
MOTU: document toslink/adat channel assignment within the "mark 3" data stream.

Files:

• trunk/libffado/doc/motu_firewire_protocol-mk3.txt (modified) (2 diffs)
• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (17 diffs)
• trunk/libffado/src/motu/motu_avdevice.h (modified) (2 diffs)

trunk/libffado/doc/motu_firewire_protocol-mk3.txt

@@ -2 +2 @@
-using an 828 Mk 3.
-
-6
+7
-Author: Jonathan Woithe
-
@@ -91 +91 @@
-------------------------------------------------------------------------  
-#ch    30         34         22         26         10         14
+
+When an optical port is configured in Toslink mode, the two Toslink channels
+take the place of that port's 8 ADAT channels in the data stream.  That is,
+ADAT-x 1-8 are removed and in their place Toslink-A 1-2 are added.  So in
+the case of 1x playback, the Toslink channels appear at offset 52, with
+ADAT-B's channels commencing at offset 58 (the total packet size in this
+case being 0x02c8 bytes).
+
+Unlike previous MOTU generations, the Toslink outputs in the Mark 3 devices
+are present as channels in their own right - they do not mirror the SPDIF
+channel.
-
-

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -287 +287 @@
-    {"Return-1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_MK3_OPT_ANY, 40},
-    {"Return-2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_MK3_OPT_ANY, 43},
-
-
-
-
+
+
-    {"Unknown-1", MOTU_PA_OUT | MOTU_PA_RATE_4x|MOTU_PA_MK3_OPT_ANY, 46},
-    {"Unknown-2", MOTU_PA_OUT | MOTU_PA_RATE_4x|MOTU_PA_MK3_OPT_ANY, 49},
@@ -296 +294 @@
-    {"Reverb-2", MOTU_PA_IN | MOTU_PA_RATE_1x2x|MOTU_PA_MK3_OPT_ANY, 55},
-    //
-
-
-
-
-
+
+
+
-    //
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    //
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {"Unknown-1", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_MK3_OPT_ANY, 58},
-    {"Unknown-2", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_MK3_OPT_ANY, 61},
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -785 +872 @@
-            case MOTU_CLKSRC_SPDIF_TOSLINK: {
-                unsigned int p0_mode;
-
+
+
+
+
-                if (p0_mode == MOTU_OPTICAL_MODE_TOSLINK)
-                    src_name = "TOSLink         ";
@@ -815 +905 @@
-            case MOTU_CLKSRC_OPTICAL_B: {
-                unsigned int p1_mode;
-&p1_mode, NULL
+NULL, &p1_mode
-                if (p1_mode == MOTU_OPTICAL_MODE_TOSLINK)
-                    src_name = "Toslink-B       ";
@@ -1014 +1104 @@
-
-    int samp_freq = getSamplingFrequency();
-
+
+
-    unsigned int event_size_in = getEventSize(MOTU_DIR_IN);
-    unsigned int event_size_out= getEventSize(MOTU_DIR_OUT);
@@ -1020 +1111 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing MotuDevice...\n" );
-
-, NULL
-, NULL
+_a, &optical_in_mode_b
+_a, &optical_out_mode_b
-
-    // Explicitly set the optical mode, primarily to ensure that the
@@ -1028 +1119 @@
-    // up without this set to anything sensible.  In this case, writes to
-    // MOTU_REG_ISOCTRL fail more often than not, which is bad.
-, MOTU_OPTICAL_MODE_KEEP
-, MOTU_OPTICAL_MODE_KEEP
+_a, optical_in_mode_b
+_a, optical_out_mode_b
-
-    // Allocate bandwidth if not previously done.
@@ -1123 +1214 @@
-
-    // Add audio capture ports
-
+_a, optical_in_mode_b
-        return false;
-    }
@@ -1181 +1272 @@
-
-    // Add audio playback ports
-
+_a, optical_out_mode_b
-        return false;
-    }
@@ -1383 +1474 @@
-
-    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
+        /* FIXME */
-        debugOutput(DEBUG_LEVEL_INFO, "Optical mode control not implemented for Mark3/G3 devices yet");
+        *port_a_mode = *port_b_mode = MOTU_OPTICAL_MODE_ADAT;
-        return 0;
-    }
@@ -1432 +1525 @@
-
-    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
+        /* FIXME */
-        debugOutput(DEBUG_LEVEL_INFO, "Optical mode control not implemented for Mark3/G3 devices yet");
-        return 0;
@@ -1500 +1594 @@
-// Note that all audio channels are sent using 3 bytes.
-signed int sample_rate = getSamplingFrequency();
-
+_a, optical_mode_b
-signed int size = 4+6;
-
-unsigned int i;
-unsigned int dir = direction==Streaming::Port::E_Capture?MOTU_PA_IN:MOTU_PA_OUT;
-
-
-
+
+
+
+
-
-    if ( sample_rate > 96000 )
@@ -1516 +1611 @@
-        flags |= MOTU_PA_RATE_1x;
-
+    switch (optical_mode_a) {
+        case MOTU_OPTICAL_MODE_OFF: flags |= MOTU_PA_OPTICAL_OFF; break;
+        case MOTU_OPTICAL_MODE_ADAT: flags |= MOTU_PA_OPTICAL_ADAT; break;
+        case MOTU_OPTICAL_MODE_TOSLINK: flags |= MOTU_PA_OPTICAL_TOSLINK; break;
+    }
+    switch (optical_mode_b) {
+        case MOTU_OPTICAL_MODE_NONE: flags |= MOTU_PA_MK3_OPT_ANY; break;
+        case MOTU_OPTICAL_MODE_OFF: flags |= MOTU_PA_MK3_OPT_B_OFF; break;
+        case MOTU_OPTICAL_MODE_ADAT: flags |= MOTU_PA_MK3_OPT_B_ADAT; break;
+        case MOTU_OPTICAL_MODE_TOSLINK: flags |= MOTU_PA_MK3_OPT_B_TOSLINK; break;
+    }
+
-    // Don't test for padding port flag here since we need to include such
-    // pseudo-ports when calculating the event size.
-    for (i=0; i < DevicesProperty[m_motu_model-1].n_port_entries; i++) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            size += 3;
-        }
@@ -1553 +1668 @@
-
-bool MotuDevice::addDirPorts(
-
-sample_rate, unsigned int optical
+ unsigned int sample_rate, 
+optical_a_mode, unsigned int optical_b
-/*
- * Internal helper method: adds all required ports for the given direction
@@ -1568 +1683 @@
-char *buff;
-unsigned int dir = direction==Streaming::Port::E_Capture?MOTU_PA_IN:MOTU_PA_OUT;
-
+
+
+
-
-    if ( sample_rate > 96000 )
@@ -1577 +1694 @@
-        flags |= MOTU_PA_RATE_1x;
-
+    switch (optical_a_mode) {
+        case MOTU_OPTICAL_MODE_OFF: flags |= MOTU_PA_OPTICAL_OFF; break;
+        case MOTU_OPTICAL_MODE_ADAT: flags |= MOTU_PA_OPTICAL_ADAT; break;
+        case MOTU_OPTICAL_MODE_TOSLINK: flags |= MOTU_PA_OPTICAL_TOSLINK; break;
+    }
+    switch (optical_b_mode) {
+        case MOTU_OPTICAL_MODE_NONE: flags |= MOTU_PA_MK3_OPT_ANY; break;
+        case MOTU_OPTICAL_MODE_OFF: flags |= MOTU_PA_MK3_OPT_B_OFF; break;
+        case MOTU_OPTICAL_MODE_ADAT: flags |= MOTU_PA_MK3_OPT_B_ADAT; break;
+        case MOTU_OPTICAL_MODE_TOSLINK: flags |= MOTU_PA_MK3_OPT_B_TOSLINK; break;
+    }
+
-    // retrieve the ID
-    std::string id=std::string("dev?");
@@ -1590 +1719 @@
-
-    for (i=0; i < DevicesProperty[m_motu_model-1].n_port_entries; i++) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            asprintf(&buff,"%s_%s_%s" , id.c_str(), mode_str,
-              DevicesProperty[m_motu_model-1].port_entry[i].port_name);

trunk/libffado/src/motu/motu_avdevice.h

@@ -199 +199 @@
-#define MOTU_PA_MK3_OPT_B_ON      (MOTU_PA_MK3_OPT_B_ADAT|MOTU_PA_MK3_OPT_B_TOSLINK)
-#define MOTU_PA_MK3_OPT_B_ANY     (MOTU_PA_MK3_OPT_B_OFF|MOTU_PA_MK3_OPT_B_ON)
-MASK
+ANY
-#define MOTU_PA_MK3_OPT_ANY       (MOTU_PA_MK3_OPT_A_ANY|MOTU_PA_MK3_OPT_B_ANY)
-
@@ -383 +383 @@
-        int position, int size);
-    bool addDirPorts(
-
-sample_rate, unsigned int optical
+ unsigned int sample_rate, 
+optical_a_mode, unsigned int optical_b
-
-public: