Changeset 1882

Timestamp:

08/26/10 05:27:41 (1 year ago)

Author:

jwoithe

Message:

MOTU: correctly read the sample rate from G3 devices.

Files:

• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (2 diffs)

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -681 +681 @@
-    quadlet_t q = 0;
-    int rate = 0;
+    unsigned int rate_base_mask, rate_base48k;
+    unsigned int rate_mult_mask, rate_mult2, rate_mult4;
-
-    if (m_motu_model == MOTU_MODEL_828MkI) {
@@ -692 +694 @@
-    }
-
+    /* The way the rate is managed is the same across G2 and G3 devices,
+     * but the actual bits used in the clock control register is different.
+     */
+    if (getDeviceGeneration() == MOTU_DEVICE_G2) {
+        rate_base_mask = MOTU_RATE_BASE_MASK;
+        rate_base48k = MOTU_RATE_BASE_48000;
+        rate_mult_mask = MOTU_RATE_MULTIPLIER_MASK;
+        rate_mult2 = MOTU_RATE_MULTIPLIER_2X;
+        rate_mult4 = MOTU_RATE_MULTIPLIER_4X;
+    } else {
+        rate_base_mask = MOTU_G3_RATE_BASE_MASK;
+        rate_base48k = MOTU_G3_RATE_BASE_48000;
+        rate_mult_mask = MOTU_G3_RATE_MULTIPLIER_MASK;
+        rate_mult2 = MOTU_G3_RATE_MULTIPLIER_2X;
+        rate_mult4 = MOTU_G3_RATE_MULTIPLIER_4X;
+    }
+
-    q = ReadRegister(MOTU_REG_CLK_CTRL);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    return rate;
-}