Changeset 1696

Timestamp:

10/18/09 04:07:09 (13 years ago)

Author:

jwoithe

Message:

RME: add some device initialisation details.

Files:

• trunk/libffado/src/rme/fireface_def.h (modified) (1 diff)
• trunk/libffado/src/rme/fireface_hw.cpp (modified) (2 diffs)

trunk/libffado/src/rme/fireface_def.h

@@ -88 +88 @@
-
-#define RME_FF400_GAIN_REG           0x801c0180
+
+#define RME_FF400_MIDI_HIGH_ADDR     0x801003f4
-
-/* Addresses of various blocks in memory-mapped flash */

trunk/libffado/src/rme/fireface_hw.cpp

@@ -24 +24 @@
-/* This file implements miscellaneous lower-level hardware functions for the Fireface */
-
+#include "libieee1394/configrom.h"
+#include "libieee1394/ieee1394service.h"
+
-#include "rme/rme_avdevice.h"
-#include "rme/fireface_def.h"
@@ -103 +106 @@
-        }
-        dev_config->tco_settings_valid = 1;
+    }
+
+    if (ret==0 && m_rme_model==RME_MODEL_FIREFACE400) {
+        unsigned int node_id = getConfigRom().getNodeId();
+        unsigned int midi_hi_addr;
+        // For now we'll fix this since that's what's done under other
+        // systems.
+        midi_hi_addr = 0x01;
+        if (writeRegister(RME_FF400_MIDI_HIGH_ADDR, (node_id<<16) | midi_hi_addr) != 0)
+            ret = -1;
+    }
+
+    if (ret==0) {
+        signed freq = dev_config->software_freq;
+        if (dev_config->dds_freq > 0)
+            freq = dev_config->dds_freq;
+        if (set_hardware_dds_freq(freq) != 0)
+            ret = -1;
-    }
-