Changeset 1828

Timestamp:

05/10/10 07:44:28 (2 years ago)

Author:

jwoithe

Message:

MOTU: begin expansion of optical mode functions needed to support the 828Mk3:

• expand optical port mode control function interface to allow for the two ports on some of the G3 devices (eg: the 828Mk3). Actual G3 support code is yet to be written.
  
• consolidate optical port mode code to device methods and have control objects call these.
  
• optical port mode identifiers passed to optical mode functions are now decoupled from the values sent to (G2) device registers making them truly device independent.
  
• improved readability of the G2 optical mode code.
  

MOTU: fix retrieval of optical port mode for "generation 1" devices (ie: the original 828).
MOTU: added clock source defines for the G3 devices.
MOTU: added function to return device generation.
MOTU: minor Mark3 documentation fixes.

Files:

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

trunk/libffado/doc/motu_firewire_protocol-mk3.txt

@@ -2 +2 @@
-using an 828 Mk 3.
-
-426
+510
-Author: Jonathan Woithe
-
@@ -126 +126 @@
-
-The clock source is set with a quadlet write to bits 0, 3 and 4 of register 
-1
+0
-  0-0-0 = internal / SMTPE
-  0-0-1 = Word clock

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -657 +657 @@
-        // port if the sample rate is set to a 1x or 2x rate later.
-        if (cancel_adat) {
-
+0, 
-        }
-
@@ -714 +714 @@
-                break;
-            case MOTU_CLKSRC_SPDIF_TOSLINK:
-
+0, 
-                    src_name = "TOSLink         ";
-                else
@@ -895 +895 @@
-
-    int samp_freq = getSamplingFrequency();
-
-
+0, 
+0, 
-    unsigned int event_size_in = getEventSize(MOTU_DIR_IN);
-    unsigned int event_size_out= getEventSize(MOTU_DIR_OUT);
@@ -907 +907 @@
-    // up without this set to anything sensible.  In this case, writes to
-    // MOTU_REG_ISOCTRL fail more often than not, which is bad.
-
-
+0, 
+0, 
-
-    // Allocate bandwidth if not previously done.
@@ -1221 +1221 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    unsigned int reg;
+    unsigned int mask, shift;
-
-    if (m_motu_model == MOTU_MODEL_828MkI) {
-        // The early devices used a different register layout.  
-        unsigned int mask, shift;
-        reg = ReadRegister(MOTU_G1_REG_CONFIG);
-        mask = (dir==MOTU_DIR_IN)?MOTU_G1_OPT_IN_MODE_MASK:MOTU_G1_OPT_OUT_MODE_MASK;
-        shift = (dir==MOTU_DIR_IN)?MOTU_G1_OPT_IN_MODE_BIT0:MOTU_G1_OPT_OUT_MODE_BIT0;
-reg & mask
+(reg & mask) >> shift
-            case MOTU_G1_OPTICAL_OFF: return MOTU_OPTICAL_MODE_OFF;
-            case MOTU_G1_OPTICAL_TOSLINK: return MOTU_OPTICAL_MODE_TOSLINK;
@@ -1241 +1253 @@
-    }
-
+    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
+        debugOutput(DEBUG_LEVEL_INFO, "Optical mode control not implemented for Mark3/G3 devices yet");
+        return 0;
+    }
+
-    reg = ReadRegister(MOTU_REG_ROUTE_PORT_CONF);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    unsigned int opt_ctrl = 0x0000002;
-
@@ -1275 +1301 @@
-    }
-
+    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
+        debugOutput(DEBUG_LEVEL_INFO, "Optical mode control not implemented for Mark3/G3 devices yet");
+        return 0;
+    }
+
-    reg = ReadRegister(MOTU_REG_ROUTE_PORT_CONF);
+
+    // Map from user mode to values sent to the device registers.
+    g2mode = 0;
+    switch (mode) {
+        case MOTU_OPTICAL_MODE_OFF: g2mode = MOTU_G2_OPTICAL_MODE_OFF; break;
+        case MOTU_OPTICAL_MODE_ADAT: g2mode = MOTU_G2_OPTICAL_MODE_ADAT; break;
+        case MOTU_OPTICAL_MODE_TOSLINK: g2mode = MOTU_G2_OPTICAL_MODE_TOSLINK; break;
+    }
-
-    // Set up the optical control register value according to the current
@@ -1281 +1320 @@
-    // what the "Optical control" register does, so the values it's set to
-    // are more or less "magic" numbers.
-OPTICAL_IN_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<8
+G2_OPTICAL_IN_MODE_MASK) != (MOTU_G2_OPTICAL_MODE_ADAT<<MOTU_G2_OPTICAL_IN_MODE_BIT0
-        opt_ctrl |= 0x00000080;
-OPTICAL_OUT_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<1
+G2_OPTICAL_OUT_MODE_MASK) != (MOTU_G2_OPTICAL_MODE_ADAT<<MOTU_G2_OPTICAL_OUT_MODE_BIT
-        opt_ctrl |= 0x00000040;
-
-    if (dir & MOTU_DIR_IN) {
-
-mode << 8) & MOTU
-mode != MOTU
+G2_
+g2mode << MOTU_G2_OPTICAL_IN_MODE_BIT0) & MOTU_G2
+g2mode != MOTU_G2
-            opt_ctrl |= 0x00000080;
-        else
@@ -1295 +1334 @@
-    }
-    if (dir & MOTU_DIR_OUT) {
-
-10) & MOTU
-mode != MOTU
+G2_
+ MOTU_G2_OPTICAL_OUT_MODE_BIT0) & MOTU_G2
+g2mode != MOTU_G2
-            opt_ctrl |= 0x00000040;
-        else
-            opt_ctrl &= ~0x00000040;
-    }
+
+    /* Setting bit 25 in the route/port configuration register enables the
+     * setting of the optical mode.  Bit 24 allows the phones assign to be
+     * set using the lower 8 bits of the register.  This function has no
+     * business setting that, so make sure bit 24 is masked off.
+     */
+    reg |= 0x02000000;
+    reg &= ~0x01000000;
-
-    // FIXME: there seems to be more to it than this, but for
@@ -1323 +1370 @@
-// Note that all audio channels are sent using 3 bytes.
-signed int sample_rate = getSamplingFrequency();
-
+0, 
-signed int size = 4+6;
-

trunk/libffado/src/motu/motu_avdevice.h

@@ -39 +39 @@
-#define MOTU_BASE_ADDR               0xfffff0000000ULL
-
-
+
+
+
+
+
+
-#define MOTU_RATE_BASE_44100         (0<<3)
-#define MOTU_RATE_BASE_48000         (1<<3)
@@ -48 +53 @@
-#define MOTU_RATE_MULTIPLIER_MASK    (0x00000030)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-#define MOTU_CLKSRC_MASK             0x00000007
@@ -138 +145 @@
-
-/* Mark3 device registers - these don't have MOTU_BASE_ADDR as the base
-
+
+
+
+
- */
-#define MOTU_MARK3_REG_MIXER     0xffff00010000LL
+
+/* Mark3 (aka G3) register constants for cases where the G3 devices differ
+ * from the G2s.
+ */
+#define MOTU_G3_CLKSRC_MASK      0x00000019
+#define MOTU_G3_CLKSRC_INTERNAL  0x00000000
+#define MOTU_G3_CLKSRC_WORDCLOCK 0x00000001
+#define MOTU_G3_CLKSRC_SPDIR     0x00000010
+#define MOTU_G3_CLKSRC_ADAT_A    0x00000018
+#define MOTU_G3_CLKSRC_ADAT_B    0x00000019
+
+/* The following values are used when defining configuration structures and
+ * calling driver functions.  They are generally not raw values written to
+ * registers.
+ */
-
-/* Port Active Flags (ports declaration) */
@@ -179 +204 @@
-#define MOTU_DIR_INOUT       (MOTU_DIR_IN | MOTU_DIR_OUT)
-
+/* Optical port mode settings/flags */
+#define MOTU_OPTICAL_MODE_OFF     0x0000
+#define MOTU_OPTICAL_MODE_ADAT    0x0001
+#define MOTU_OPTICAL_MODE_TOSLINK 0x0002
+#define MOTU_OPTICAL_PORT_A       0x0001
+#define MOTU_OPTICAL_PORT_B       0x0002
+#define MOTU_OPTICAL_PORT_ALL     (MOTU_OPTICAL_PORT_A|MOTU_OPTICAL_PORT_B)
+
+/* Device generation identifiers */
+#define MOTU_DEVICE_G1            0x0001
+#define MOTU_DEVICE_G2            0x0002
+#define MOTU_DEVICE_G3            0x0003
+
-class ConfigRom;
-class Ieee1394Service;
@@ -300 +338 @@
-    virtual bool stopStreamByIndex(int i);
-
+    signed int getDeviceGeneration(void);
+
-    signed int getIsoRecvChannel(void);
-    signed int getIsoSendChannel(void);
-
-
+port, unsigned int 
+port, unsigned int 
-
-    signed int getEventSize(unsigned int dir);

trunk/libffado/src/motu/motu_controls.cpp

@@ -685 +685 @@
-OpticalMode::setValue(int v)
-{
-
+, dir
-    debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for optical mode %d to %d\n", m_register, v);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    return true;
-}
@@ -710 +703 @@
-OpticalMode::getValue()
-{
-val
+dir
-    debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for optical mode %d\n", m_register);
-
-    // FIXME: we could just read the appropriate mixer status field from the
-    // receive stream processor once we work out an efficient way to do this.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-