Changeset 1599

Timestamp:

07/18/09 23:22:51 (14 years ago)

Author:

jwoithe

Message:

RME: implement highlevel function for setting phantom power status.
RME: add phantom power control to the generic device control mixer element.

Files:

• trunk/libffado/src/rme/fireface_hw.cpp (modified) (2 diffs)
• trunk/libffado/src/rme/fireface_settings_ctrls.cpp (modified) (2 diffs)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (3 diffs)
• trunk/libffado/src/rme/rme_avdevice_settings.cpp (added)
• trunk/libffado/src/SConscript (modified) (1 diff)

trunk/libffado/src/rme/fireface_hw.cpp

@@ -198 +198 @@
-
-signed int 
-sw
+use
-{
-    // Initialises the hardware to the state defined by the supplied
@@ -205 +205 @@
-    // "Host" LED on the FF400 when done for the first time after the
-    // interface has been powered up.
-
+
+
+
+
+
-    quadlet_t data[3] = {0, 0, 0};
-    unsigned int conf_reg;
+
+    if (use_settings == NULL)
+      sw_settings = &settings;
+    else
+      sw_settings = use_settings;
-
-    if (sw_settings->mic_phantom[0])

trunk/libffado/src/rme/fireface_settings_ctrls.cpp

@@ -70 +70 @@
-RmeSettingsCtrl::setValue(int v) {
-
+signed int i;
+signed int err = 0;
+
-    switch (m_type) {
-        case RME_CTRL_PHANTOM_SW:
+            // Lowest 16 bits are phantom status bits (max 16 channels). 
+            // High 16 bits are "write enable" bits for the correspoding
+            // channel represented in the low 16 bits.  This way changes can
+            // be made to one channel without needing to first read the
+            // existing value.
+            //
+            // At present there are at most 4 phantom-capable channels.
+            // Flag attempts to write to the bits corresponding to channels
+            // beyond this.
+            if (v & 0xfff00000) {
+                debugOutput(DEBUG_LEVEL_WARNING, "Ignored out-of-range phantom set request: mask=0x%04x, value=0x%04x\n",
+                  (v >> 16) & 0xfff0, v && 0xfff0);
+            }
+
+            for (i=0; i<4; i++) {
+                if (v & (0x00010000 << i)) {
+                    unsigned int on = (v & (0x00000001 << i)) != 0;
+                    err = m_parent.setPhantom(i, on);
+                    if (!err && on) {
+                        m_value |= (0x01 << i);
+                    } else {
+                        m_value &= ~(0x01 << i);
+                    }
+                }
+            }
-            break;
-    }
-
+
+
-}
-
@@ -82 +111 @@
-    switch (m_type) {
-        case RME_CTRL_PHANTOM_SW:
+            return m_value;
-            break;
-    }

trunk/libffado/src/rme/rme_avdevice.h

@@ -89 +89 @@
-    signed int writeBlock(fb_nodeaddr_t reg, quadlet_t *data, unsigned int n_quads);
-
+    /* Device control functions */
+    signed int setPhantom(unsigned int channel, unsigned int status);
+
-protected:
-    enum ERmeModel m_rme_model;
@@ -124 +127 @@
-    signed int write_device_flash_settings(FF_software_settings_t *settings);
-
-H
+Low-level h
-    unsigned int multiplier_of_freq(unsigned int freq);
-    signed int init_hardware(void);
@@ -130 +133 @@
-    signed int get_hardware_streaming_status(unsigned int *stat, unsigned int n);
-    signed int get_hardware_state(FF_state_t *state);
-sw_settings
+use_settings = NULL
-
-    signed int read_tco(quadlet_t *tco_data, signed int size);

trunk/libffado/src/SConscript

@@ -171 +171 @@
-rme_source = env.Split( '\
-        rme/rme_avdevice.cpp \
+        rme/rme_avdevice_settings.cpp \
-        rme/fireface_flash.cpp \
-        rme/fireface_hw.cpp \