Changeset 1835

Timestamp:

05/21/10 08:07:01 (2 years ago)

Author:

jwoithe

Message:

MOTU:

• Implement optical mode control for G3/Mk3 devices. This is currently untested.
  
• Fix bug from r1834 which broke streaming for all non-G3 MOTU devices (the wrong MOTU_PA_MK3_OPT_* value was used to force the port B test in addDirPorts() and getEventSize() to True for these devices).
  
• Allow MOTU registers to be optionally absolute rather than relative to a notional base address. This is needed to accommodate some G3 registers which do not share the same base address as traditional MOTU registers.
  
• Update G3 protocol document to include input and output control of optical port modes.
  
• Note that streaming for non-G3 devices was broken by r1831 (optical_mode was used uninitialised to set flags). This was implicitly fixed by changes in r1834, but as noted above r1834 introduced a new bug which kept G1/G2 streaming broken until now.
  

Files:

• trunk/libffado/doc/motu_firewire_protocol-mk3.txt (modified) (1 diff)
• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (7 diffs)
• trunk/libffado/src/motu/motu_avdevice.h (modified) (6 diffs)

trunk/libffado/doc/motu_firewire_protocol-mk3.txt

@@ -113 +113 @@
-0xfffff0000c94.
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-Other areas of the driver also appear to refresh the device status with

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -1474 +1474 @@
-
-    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-    }
@@ -1524 +1547 @@
-    }
-
+    /* The G3 devices are also quite a bit different to the G2 units */
-    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -1617 +1682 @@
-    }
-    switch (optical_mode_b) {
-
+B_
-        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;
@@ -1631 +1696 @@
-         */
-        if (optical_mode_b == MOTU_OPTICAL_MODE_NONE) {
-
+B_
-        }
-        if (( port_flags & dir ) &&
@@ -1700 +1765 @@
-    }
-    switch (optical_b_mode) {
-
+B_
-        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;
@@ -1724 +1789 @@
-         */
-        if (optical_b_mode == MOTU_OPTICAL_MODE_NONE)
-
+B_
-
-        if (( port_flags & dir ) &&
@@ -1742 +1807 @@
-/* ======================================================================== */
-
-unsigned in
+fb_nodeaddr_
-/*
- * Attempts to read the requested register from the MOTU.
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/*
- * Attempts to write the given data to the requested MOTU register.
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/src/motu/motu_avdevice.h

@@ -36 +36 @@
-#include "motu_controls.h"
-#include "motu_mark3_controls.h"
-
-#define MOTU_BASE_ADDR               0xfffff0000000ULL
-
-/* Bitmasks and values used when setting MOTU device registers.  Note that
@@ -80 +78 @@
-#define MOTU_METER_PROG_SRC_SHIFT    0
-
-
+
+
+
+
+
+
+
-#define MOTU_REG_ISOCTRL           0x0b00
-#define MOTU_REG_OPTICAL_CTRL      0x0b10
@@ -99 +103 @@
-#define MOTU_G1_REG_ISOCTRL        0x0b10
-
-
+
+
+
- * 1" devices such as the 828Mk1.  It seems that the same configuration
- * register setting is used for "off" and "adat" modes.  There must be more
@@ -142 +148 @@
-#define MOTU_G1_MONIN_R_CH8        0x3000
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-/* Mark3 (aka G3) register constants for cases where the G3 devices differ
@@ -164 +171 @@
-#define MOTU_G3_CLKSRC_TOSLINK_A MOTU_G3_CLKSRC_OPTICAL_A
-#define MOTU_G3_CLKSRC_TOSLINK_B MOTU_G3_CLKSRC_OPTICAL_A
+
+#define MOTU_G3_OPT_A_IN_ENABLE   0x00000001
+#define MOTU_G3_OPT_B_IN_ENABLE   0x00000002
+#define MOTU_G3_OPT_A_OUT_ENABLE  0x00000100
+#define MOTU_G3_OPT_B_OUT_ENABLE  0x00000200
+#define MOTU_G3_OPT_A_IN_TOSLINK  0x00010000  // If these mode bits are not 
+#define MOTU_G3_OPT_A_OUT_TOSLINK 0x00040000  //   set the mode is ADAT if
+#define MOTU_G3_OPT_B_IN_TOSLINK  0x00100000  //   the port is enabled
+#define MOTU_G3_OPT_B_OUT_TOSLINK 0x00400000
+#define MOTU_G3_OPT_A_IN_MASK     (MOTU_G3_OPT_A_IN_ENABLE|MOTU_G3_OPT_A_IN_TOSLINK)
+#define MOTU_G3_OPT_A_OUT_MASK    (MOTU_G3_OPT_A_OUT_ENABLE|MOTU_G3_OPT_A_OUT_TOSLINK)
+#define MOTU_G3_OPT_B_IN_MASK     (MOTU_G3_OPT_B_IN_ENABLE|MOTU_G3_OPT_B_IN_TOSLINK)
+#define MOTU_G3_OPT_B_OUT_MASK    (MOTU_G3_OPT_B_OUT_ENABLE|MOTU_G3_OPT_B_OUT_TOSLINK)
-
-/* The following values are used when defining configuration structures and
@@ -387 +407 @@
-
-public:
-unsigned in
-unsigned in
+fb_nodeaddr_
+fb_nodeaddr_
-
-private: