Changeset 1715

Timestamp:

11/16/09 03:47:58 (13 years ago)

Author:

jwoithe

Message:

MOTU: add some initial details relating to the original 828 interface (known in FFADO as the 828Mk1).

Files:

• branches/libffado-2.0/src/motu/motu_avdevice.cpp (modified) (8 diffs)
• branches/libffado-2.0/src/motu/motu_avdevice.h (modified) (1 diff)

branches/libffado-2.0/src/motu/motu_avdevice.cpp

@@ -473 +473 @@
- * Retrieve the current sample rate from the MOTU device.
- */
-ReadRegister(MOTU_REG_CLK_CTRL)
+0
-    int rate = 0;
-
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        /* The original MOTU interfaces did things rather differently */
+        q = ReadRegister(MOTU_G1_REG_CONFIG);
+        if ((q & MOTU_G1_RATE_MASK) == MOTU_G1_RATE_44100)
+            rate = 44100;
+        else
+            rate = 48000;
+        return rate;
+    }
+
+    q = ReadRegister(MOTU_REG_CLK_CTRL);
-    switch (q & MOTU_RATE_BASE_MASK) {
-        case MOTU_RATE_BASE_44100:
@@ -520 +531 @@
-    if ( samplingFrequency > DevicesProperty[m_motu_model-1].MaxSampleRate )
-       return false; 
+
+    /* The original MOTU devices do things differently; they are much
+     * simpler than the later interfaces.
+     */
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        reg = ReadRegister(MOTU_G1_REG_CONFIG);
+        if (samplingFrequency > 0) {
+            reg &= ~MOTU_G1_RATE_MASK;
+            switch (samplingFrequency) {
+                case 44100:
+                    reg |= MOTU_G1_RATE_44100;
+                    break;
+                case 48000:
+                    reg |= MOTU_G1_RATE_48000;
+                default:
+                    // Unsupported rate
+                    return false;
+            }
+        }
+        if (clock_source != MOTU_CLKSRC_UNCHANGED) {
+            switch (clock_source) {
+                case MOTU_CLKSRC_INTERNAL:
+                    clock_source = MOTU_G1_CLKSRC_INTERNAL; break;
+                case MOTU_CLKSRC_SPDIF_TOSLINK:
+                    clock_source = MOTU_G1_CLKSRC_SPDIF; break;
+                case MOTU_CLKSRC_ADAT_9PIN:
+                    clock_source = MOTU_G1_CLKSRC_ADAT_9PIN; break;
+                default:
+                    // Unsupported clock source
+                    return false;
+            }
+            reg &= ~MOTU_G1_CLKSRC_MASK;
+            reg |= clock_source;
+        }
+        if (WriteRegister(MOTU_G1_REG_CONFIG, reg) != 0)
+            return false;
+        return true;
+    }
+
+    /* The rest of this function deals with later generation devices */
-
-    reg = ReadRegister(MOTU_REG_CLK_CTRL);
@@ -683 +734 @@
-MotuDevice::clockIdToClockSource(unsigned int id) {
-    ClockSource s;
+    bool g1_model = (m_motu_model == MOTU_MODEL_828MkI);
-    s.id = id;
-
@@ -698 +750 @@
-            s.type = eCT_ADAT;
-            s.description = "ADAT optical";
+            s.valid = s.active = s.locked = !g1_model;
-            break;
-        case MOTU_CLKSRC_SPDIF_TOSLINK:
@@ -715 +768 @@
-            s.type = eCT_WordClock;
-            s.description = "Wordclock";
+            s.valid = s.active = s.locked = !g1_model;
-            break;
-        case MOTU_CLKSRC_ADAT_9PIN:
@@ -723 +777 @@
-            s.type = eCT_AES;
-            s.description = "AES/EBU";
+            s.valid = s.active = s.locked = !g1_model;
-            break;
-        default:
@@ -1113 +1168 @@
-
-unsigned int MotuDevice::getOpticalMode(unsigned int dir) {
-
+
+
+
+
+
+
+
+
+
-
-debugOutput(DEBUG_LEVEL_VERBOSE, "optical mode: %x %x %x %x\n",dir, reg, reg & MOTU_OPTICAL_IN_MODE_MASK,
@@ -1133 +1196 @@
-    if (m_motu_model==MOTU_MODEL_896HD && mode==MOTU_OPTICAL_MODE_TOSLINK)
-        return -1;
+
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        // The earlier MOTUs handle this differently.
+        // To be completed.
+        return 0;
+    }
-
-    // Set up the optical control register value according to the current

branches/libffado-2.0/src/motu/motu_avdevice.h

@@ -89 +89 @@
-#define MOTU_REG_INPUT_GAIN_PHINV1 0x0c74
-#define MOTU_REG_INPUT_GAIN_PHINV2 0x0c78
+
+/* Device register definitions for the earliest generation devices */
+#define MOTU_G1_REG_CONFIG         0x0b00
+
+/* The optical mode defines for the 828Mk1 are estimates at present, to be 
+ * confirmed.
+ */
+#define MOTU_G1_OPT_IN_MODE_MASK   0x0000  // Still be be observed
+#define MOTU_G1_OPT_IN_MODE_BIT0        0  // Still to be observed
+#define MOTU_G1_OPT_OUT_MODE_MASK  0xc000
+#define MOTU_G1_OPT_OUT_MODE_BIT0      26
+#define MOTU_G1_OPTICAL_OFF        0x0000
+#define MOTU_G1_OPTICAL_TOSLINK    0x0001
+#define MOTU_G1_OPTICAL_ADAT       0x0002
+
+#define MOTU_G1_RATE_MASK          0x0004
+#define MOTU_G1_RATE_44100         0x0000
+#define MOTU_G1_RATE_48000         0x0004
+
+#define MOTU_G1_CLKSRC_MASK        0x0003
+#define MOTU_G1_CLKSRC_INTERNAL    0x0000
+#define MOTU_G1_CLKSRC_ADAT_9PIN   0x0001
+#define MOTU_G1_CLKSRC_SPDIF       0x0002
+#define MOTU_G1_CLKSRC_UNCHANGED   MOTU_CLKSRC_UNCHANGED
+
+#define MOTU_G1_MONIN_MASK         0x3f00
+#define MOTU_G1_MONIN_L_SRC_MASK   0x0600
+#define MOTU_G1_MONIN_R_SRC_MASK   0x3000
+#define MOTU_G1_MONIN_L_MUTE_MASK  0x0100  // Yes, the sense of these 2 bits
+#define MOTU_G1_MONIN_R_EN_MASK    0x0800  //   really are reversed
+#define MOTU_G1_MONIN_L_MUTE       0x0100
+#define MOTU_G1_MONIN_L_ENABLE     0x0000
+#define MOTU_G1_MONIN_R_MUTE       0x0000
+#define MOTU_G1_MONIN_R_ENABLE     0x0800
+#define MOTU_G1_MONIN_L_CH1        0x0000
+#define MOTU_G1_MONIN_L_CH3        0x0020
+#define MOTU_G1_MONIN_L_CH5        0x0040
+#define MOTU_G1_MONIN_L_CH7        0x0060
+#define MOTU_G1_MONIN_R_CH2        0x0000
+#define MOTU_G1_MONIN_R_CH4        0x1000
+#define MOTU_G1_MONIN_R_CH6        0x2000
+#define MOTU_G1_MONIN_R_CH8        0x3000
-
-/* Mark3 device registers - these don't have MOTU_BASE_ADDR as the base