Changeset 1833

Timestamp:

05/17/10 04:42:30 (2 years ago)

Author:

jwoithe

Message:

MOTU: initial implementation of clock source control for "Mark 3" devices.

Files:

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

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -570 +570 @@
-
-    reg = ReadRegister(MOTU_REG_CLK_CTRL);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return MOTU_CLKSRC_NONE;
@@ -595 +607 @@
-    quadlet_t reg;
-    unsigned int old_clock_src = getHwClockSource();
+    signed int device_gen = getDeviceGeneration();
-
-    /* Don't touch anything if there's nothing to do */
@@ -645 +658 @@
-    reg = ReadRegister(MOTU_REG_CLK_CTRL);
-
+    /* Control of sampling rate is the same for both G2 and G3 devices */
-    switch ( samplingFrequency ) {
-        case -1:
@@ -697 +711 @@
-        // Set up new clock source if required
-        if (clock_source != MOTU_CLKSRC_UNCHANGED) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        } else {
@@ -748 +774 @@
-        // A write to the rate/clock control register requires the
-        // textual name of the current clock source be sent to the
-
+
+
-        switch (clock_source) {
-            case MOTU_CLKSRC_INTERNAL:
@@ -777 +804 @@
-                src_name = "AES-EBU         ";
-                break;
+            case MOTU_CLKSRC_OPTICAL_A: {
+                unsigned int p0_mode;
+                getOpticalMode(MOTU_DIR_IN, &p0_mode, NULL);
+                if (p0_mode == MOTU_OPTICAL_MODE_TOSLINK)
+                    src_name = "Toslink-A       ";
+                else
+                    src_name = "ADAT-A Optical  ";
+                break;
+            }
+            case MOTU_CLKSRC_OPTICAL_B: {
+                unsigned int p1_mode;
+                getOpticalMode(MOTU_DIR_IN, &p1_mode, NULL);
+                if (p1_mode == MOTU_OPTICAL_MODE_TOSLINK)
+                    src_name = "Toslink-B       ";
+                else
+                    src_name = "ADAT-B Optical  ";
+                break;
+            }
-            default:
-                src_name = "Unknown         ";
@@ -842 +887 @@
-        case MOTU_CLKSRC_SPDIF_TOSLINK:
-            s.type = eCT_SPDIF;
-
+
+
+
+
-            break;
-        case MOTU_CLKSRC_SMPTE:
@@ -867 +915 @@
-            s.valid = s.active = s.locked = (device_gen!=MOTU_DEVICE_G1);
-            break;
+        case MOTU_CLKSRC_OPTICAL_A:
+            s.type = eCT_ADAT;
+            s.description = "ADAT/Toslink port A";
+            break;
+        case MOTU_CLKSRC_OPTICAL_B:
+            s.type = eCT_ADAT;
+            s.description = "ADAT/Toslink port B";
+            break;
-        default:
-            s.type = eCT_Invalid;
@@ -879 +935 @@
-    FFADODevice::ClockSourceVector r;
-    ClockSource s;
+    signed int device_gen = getDeviceGeneration();
-
-    /* Form a list of clocks supported by MOTU interfaces */
+
+    /* All interfaces support an internal clock */
-    s = clockIdToClockSource(MOTU_CLKSRC_INTERNAL);
-    r.push_back(s);
-
-
+
+
+
+
+
+
-    s = clockIdToClockSource(MOTU_CLKSRC_SPDIF_TOSLINK);
-    r.push_back(s);
@@ -891 +954 @@
-    s = clockIdToClockSource(MOTU_CLKSRC_WORDCLOCK);
-    r.push_back(s);
-
-
+
+
+
+
+
-    s = clockIdToClockSource(MOTU_CLKSRC_AES_EBU);
-    r.push_back(s);
+
+    if (device_gen == MOTU_DEVICE_G3) {
+        s = clockIdToClockSource(MOTU_CLKSRC_OPTICAL_A);
+        r.push_back(s);
+        s = clockIdToClockSource(MOTU_CLKSRC_OPTICAL_B);
+        r.push_back(s);
+    }
-
-    return r;

trunk/libffado/src/motu/motu_avdevice.h

@@ -156 +156 @@
-#define MOTU_G3_CLKSRC_INTERNAL  0x00000000
-#define MOTU_G3_CLKSRC_WORDCLOCK 0x00000001
-TP
+PT
-#define MOTU_G3_CLKSRC_SPDIF     0x00000010
-#define MOTU_G3_CLKSRC_OPTICAL_A 0x00000018
@@ -221 +221 @@
-#define MOTU_CLKSRC_WORDCLOCK        4
-#define MOTU_CLKSRC_ADAT_9PIN        5
-
-
+
+
+
+
-#define MOTU_CLKSRC_NONE             0xffff
-#define MOTU_CLKSRC_UNCHANGED        MOTU_CLKSRC_NONE