Changeset 1843

Timestamp:

05/31/10 05:11:42 (2 years ago)

Author:

jwoithe

Message:

MOTU: some G3 devices don't have any optical ports, so allow for this.

Files:

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

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -1490 +1490 @@
-    if (getDeviceGeneration() == MOTU_DEVICE_G3) {
-        unsigned int mask, enable, toslink;
+        /* The Ultralite Mk3s don't have any optical ports.  All others have 2. */
+        if (m_motu_model==MOTU_MODEL_ULTRALITEmk3 || m_motu_model==MOTU_MODEL_ULTRALITEmk3_HYB) {
+            if (port_a_mode != NULL)
+                *port_a_mode = MOTU_OPTICAL_MODE_NONE;
+            if (port_b_mode != NULL)
+                *port_b_mode = MOTU_OPTICAL_MODE_NONE;
+            return 0;
+        }
-        reg = ReadRegister(MOTU_G3_REG_OPTICAL_CTRL);
-        if (port_a_mode != NULL) {
@@ -1692 +1700 @@
-
-    switch (optical_mode_a) {
+        case MOTU_OPTICAL_MODE_NONE: flags |= MOTU_PA_OPTICAL_ANY; break;
-        case MOTU_OPTICAL_MODE_OFF: flags |= MOTU_PA_OPTICAL_OFF; break;
-        case MOTU_OPTICAL_MODE_ADAT: flags |= MOTU_PA_OPTICAL_ADAT; break;
@@ -1707 +1716 @@
-    for (i=0; i < DevicesProperty[m_motu_model-1].n_port_entries; i++) {
-        port_flags = DevicesProperty[m_motu_model-1].port_entry[i].port_flags;
-"port B" test returns
-a port B
+optical port tests return
+one or both optical ports
-         */
+        if (optical_mode_a == MOTU_OPTICAL_MODE_NONE) {
+            port_flags |= MOTU_PA_OPTICAL_ANY;
+        }
-        if (optical_mode_b == MOTU_OPTICAL_MODE_NONE) {
-            port_flags |= MOTU_PA_MK3_OPT_B_ANY;
@@ -1775 +1787 @@
-
-    switch (optical_a_mode) {
+        case MOTU_OPTICAL_MODE_NONE: flags |= MOTU_PA_OPTICAL_ANY; break;
-        case MOTU_OPTICAL_MODE_OFF: flags |= MOTU_PA_OPTICAL_OFF; break;
-        case MOTU_OPTICAL_MODE_ADAT: flags |= MOTU_PA_OPTICAL_ADAT; break;
@@ -1800 +1813 @@
-    for (i=0; i < DevicesProperty[m_motu_model-1].n_port_entries; i++) {
-        port_flags = DevicesProperty[m_motu_model-1].port_entry[i].port_flags;
-an optical port B ensure the test on the 
-ptical port B mode
+one or more optical ports, ensure the tests
+n the optical ports
-         */
+        if (optical_a_mode == MOTU_OPTICAL_MODE_NONE)
+            port_flags |= MOTU_PA_OPTICAL_ANY;
-        if (optical_b_mode == MOTU_OPTICAL_MODE_NONE)
-            port_flags |= MOTU_PA_MK3_OPT_B_ANY;