Changeset 1589

Timestamp:

06/27/09 06:25:55 (14 years ago)

Author:

jwoithe

Message:

RME: tidied up software settings structure and removed unused fields.
RME: map configuration flash contents into software settings structure after flash is read.
RME: rename some methods to better reflect their function.
RME: documentation update to reflect the information embodied in these changes.

Files:

• trunk/libffado/doc/rme_notes/rme_config_register_map.txt (modified) (3 diffs)
• trunk/libffado/src/rme/fireface_def.h (modified) (5 diffs)
• trunk/libffado/src/rme/fireface_flash.cpp (modified) (4 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (1 diff)

trunk/libffado/doc/rme_notes/rme_config_register_map.txt

@@ -4 +4 @@
-Version: 0.10
-Author: Jonathan Woithe
-9 May
+7 June
-
-
@@ -345 +345 @@
- 29 Input level (0=default, 1=lo-gain, 2=+4dBU, 3=-10dBV ???)
- 30 Output level (0=default, 1=hi-gain, 2=+4dBU, 3=-10dBV ???)
-
-
+
+
+
+
- 33 Mic phantom power [4]
-
+
+
- 38 Filter (aka speaker emulation)
- 39 Fuzz (aka drive)
@@ -360 +363 @@
- 47 - Number of channels (FF400=0x000000f0)
- 48 - Dropped samples
-input
+channel
- 50 - p12db_an[1-9]
-

trunk/libffado/src/rme/fireface_def.h

@@ -278 +278 @@
-    uint32_t input_level;
-    uint32_t output_level;
-
+
+
-    uint32_t mic_phantom[4];
-;
+_plug_select; // Front/rear select for FF800 ch 1
-    uint32_t filter;
-    uint32_t fuzz;
@@ -326 +327 @@
-#define FF_DEV_FLASH_MIC_PHANTOM_ON            0x00000001
-#define FF_DEV_FLASH_WORD_CLOCK_1x             0x00000001
+#define FF_DEV_FLASH_PLUG_SELECT_FRONT         0x00000001  // To be confirmed
+#define FF_DEV_FLASH_PLUG_SELECT_REAR          0x00000000  // To be confirmed
-
-// Structure used by FFADO to keep track of the device status.  This is
@@ -346 +349 @@
-    uint32_t input_level;
-    uint32_t output_level;
-    uint32_t mic_level[2];
-    uint32_t instrument;
-    uint32_t filter;
-    uint32_t fuzz;
@@ -353 +354 @@
-    uint32_t sample_rate;
-    uint32_t word_clock_single_speed;
-No equivalent
-No equivalent
+Derived from fields
+Derived from fields
-} FF_software_settings_t;
-
@@ -387 +388 @@
-#define FF_SWPARAM_WORD_CLOCK_1x               FF_DEV_FLASH_WORD_CLOCK_1x
-//
- which have no
-equivalent in the
+
+which are derived from one or more fields in
-#define FF_SWPARAM_PHONESLEVEL_HIGAIN          0x00000001
-#define FF_SWPARAM_PHONESLEVEL_4dBU            0x00000002

trunk/libffado/src/rme/fireface_flash.cpp

@@ -205 +205 @@
-
-signed int 
-settings(void
+flash_settings(FF_software_settings_t *settings
-{
-    // Read the device's configuration flash RAM and use this to set up 
-object's "settings" data member field
+given settings structure
-
-    FF_device_flash_settings_t hw_settings;
-
+, err = 0
-    unsigned int rev;
-
@@ -225 +225 @@
-
-    // Read settings flash ram block
-i
+err
-      RME_FF800_FLASH_SETTINGS_ADDR:RME_FF400_FLASH_SETTINGS_ADDR, 
-        (quadlet_t *)&hw_settings, sizeof(hw_settings)/sizeof(uint32_t));
-i
+err
-        debugOutput(DEBUG_LEVEL_WARNING, "Error reading device flash settings: %d\n", i);
-    } else {
@@ -248 +248 @@
-    }
-
+    if (settings != NULL) {
+        memset(settings, 0, sizeof(settings));
+        // Copy hardware details to the software settings structure as
+        // appropriate.
+        for (i=0; i<4; i++)
+            settings->mic_phantom[i] = hw_settings.mic_phantom[i];
+        settings->spdif_input_mode = hw_settings.spdif_input_mode;
+        settings->spdif_output_emphasis = hw_settings.spdif_output_emphasis;
+        settings->spdif_output_pro = hw_settings.spdif_output_pro;
+        settings->spdif_output_nonaudio = hw_settings.spdif_output_nonaudio;
+        settings->spdif_output_mode = hw_settings.spdif_output_mode;
+        settings->clock_mode = hw_settings.clock_mode;
+        settings->sync_ref = hw_settings.sync_ref;
+        settings->tms = hw_settings.tms;
+        settings->limit_bandwidth = hw_settings.limit_bandwidth;
+        settings->stop_on_dropout = hw_settings.stop_on_dropout;
+        settings->input_level = hw_settings.input_level;
+        settings->output_level = hw_settings.output_level;
+        settings->filter = hw_settings.filter;
+        settings->fuzz = hw_settings.fuzz;
+        settings->limiter_disable = (hw_settings.p12db_an[0] == 0)?1:0;
+        settings->sample_rate = hw_settings.sample_rate;
+        settings->word_clock_single_speed = hw_settings.word_clock_single_speed;
+
+        // The FF800 has front/rear selectors for the "instrument" input 
+        // (aka channel 1) and the two "mic" channels (aka channels 7 and 8).
+        // The FF400 does not.  The FF400 borrows the mic0 selector field 
+        // in the flash configuration structure to use for the "phones"
+        // level which the FF800 doesn't have.
+        // The offset of 1 here is to maintain consistency with the values
+        // used in the flash by other operating systems.
+        if (m_rme_model == RME_MODEL_FIREFACE400)
+            settings->phones_level = hw_settings.mic_plug_select[0] + 1;
+        else {
+            settings->input_opt[0] = hw_settings.instrument_plug_select + 1;
+            settings->input_opt[1] = hw_settings.mic_plug_select[0] + 1;
+            settings->input_opt[2] = hw_settings.mic_plug_select[1] + 1;
+        }
+    }
+
-{
-quadlet_t buf[4];
@@ -272 +312 @@
-#endif
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    // FIXME: fairly obviously the detail needs to be filled in here.

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -182 +182 @@
-
-    // This is just for testing
-settings(
+flash_settings(NULL
-
-    return true;

trunk/libffado/src/rme/rme_avdevice.h

@@ -115 +115 @@
-
-    /* Upper level flash memory functions */
-settings(void
-settings(void
+flash_settings(FF_software_settings_t *settings
+flash_settings(FF_software_settings_t *settings
-
-    /* Hardware functions */