Changeset 1609

Timestamp:

08/02/09 06:48:07 (14 years ago)

Author:

jwoithe

Message:

RME: provide low-level support for the channel 3/4 pad/instrument options of the Fireface-400
RME: update device documentation

Files:

• trunk/libffado/doc/rme_notes/rme_config_register_map.txt (modified) (4 diffs)
• trunk/libffado/src/rme/fireface_def.h (modified) (4 diffs)
• trunk/libffado/src/rme/fireface_flash.cpp (modified) (2 diffs)
• trunk/libffado/src/rme/fireface_hw.cpp (modified) (3 diffs)

trunk/libffado/doc/rme_notes/rme_config_register_map.txt

@@ -2 +2 @@
-============================================
-
-2
+3
-Author: Jonathan Woithe
-12 July
+2 August
-
-
@@ -119 +119 @@
-block of 12 bytes starting at 0xfc88f014 with a block write operation.
-
-
+5
-
-  bits 31-18: unknown, set to 0
@@ -131 +131 @@
-    010 = +4dBU
-    100 = -10dBV
-
-
+
+
+
+
-  bit 7: Phantom power, mic 8 (active = 1)
-  bit 6: unknown, set to 0
@@ -139 +141 @@
-    010 = +4dBU
-    100 = -10dbV
-
-
-
+
+
+
+
+
-  bit 0: Phantom power, mic 7 (active = 1)
-

trunk/libffado/src/rme/fireface_def.h

@@ -127 +127 @@
-// Configuration register 0
-#define CR0_PHANTOM_MIC0        0x00000001
+
-#define CR0_PHANTOM_MIC2        0x00000002
-#define CR0_FILTER_FPGA         0x00000004
+#define CR0_BIT01               0x00000002  // Use depends on model - see below
+#define CR0_BIT02               0x00000004  // Use depends on model - see below
-#define CR0_ILEVEL_FPGA_CTRL0   0x00000008
-#define CR0_ILEVEL_FPGA_CTRL1   0x00000010
@@ -134 +137 @@
-#define CR0_ZEROBIT06           0x00000040
-#define CR0_PHANTOM_MIC1        0x00000080
-
-
-
+
+
-#define CRO_OLEVEL_FPGA_CTRL_0  0x00000400
-#define CRO_OLEVEL_FPGA_CTRL_1  0x00000800
@@ -146 +148 @@
-#define CRO_PHLEVEL_CTRL1       0x00020000
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-#define CR0_ILEVEL_FPGA_LOGAIN  CR0_ILEVEL_FPGA_CTRL0
-#define CR0_ILEVEL_FPGA_4dBU    CR0_ILEVEL_FPGA_CTRL1
@@ -427 +435 @@
-    uint32_t sample_rate;
-    uint32_t word_clock_single_speed;
+    uint32_t ff400_input_pad[2];       // Channels 3/4, FF400 only
+    uint32_t ff400_instr_input[2];     // Channels 3/4, FF400 only
-    uint32_t phones_level;             // Derived from fields in device flash
-    uint32_t input_opt[3];             // Derived from fields in device flash

trunk/libffado/src/rme/fireface_flash.cpp

@@ -252 +252 @@
-        // Copy hardware details to the software settings structure as
-        // appropriate.
-4
+2
-            settings->mic_phantom[i] = hw_settings.mic_phantom[i];
+        if (m_rme_model == RME_MODEL_FIREFACE800) {
+            for (i=2; i<4; i++)
+                settings->mic_phantom[i] = hw_settings.mic_phantom[i];
+        } else {
+            // TODO: confirm this is true
+            for (i=2; i<4; i++)
+                settings->ff400_input_pad[i-2] = hw_settings.mic_phantom[i];
+        }
-        settings->spdif_input_mode = hw_settings.spdif_input_mode;
-        settings->spdif_output_emphasis = hw_settings.spdif_output_emphasis;
@@ -266 +274 @@
-        settings->input_level = hw_settings.input_level;
-        settings->output_level = hw_settings.output_level;
-
-
+
+
+
+
+
+
+
+
-        settings->limiter_disable = (hw_settings.p12db_an[0] == 0)?1:0;
-        settings->sample_rate = hw_settings.sample_rate;

trunk/libffado/src/rme/fireface_hw.cpp

@@ -232 +232 @@
-    if (sw_settings->mic_phantom[1])
-      data[0] |= CR0_PHANTOM_MIC1;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Phones level */
@@ -290 +297 @@
-    data[1] |= (sw_settings->input_opt[2] & FF_SWPARAM_INPUT_OPT_B) ? CR1_INPUT_OPT2_B : 0;
-
-
-
+
+
+
+
+
+
+
-
-    // Set the "rear" option for input 0 if selected
@@ -313 +325 @@
-    /* TMS / TCO toggle bits in CR2 are not set by other drivers */
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Drop-and-stop is hardwired on in other drivers */