Changeset 1594

Timestamp:

07/10/09 06:43:04 (14 years ago)

Author:

jwoithe

Message:

RME driver:

• add some missing status bit defines, fix naming of some others
  
• add full decoding of device status registers
  
• cache device run status
  
• take external clock rates and device run status into account when evaluating the validity of sampling rates
  
• minor bugfixes
  
• implement function to configure a fixed DDS frequency on the device
  

Files:

• trunk/libffado/src/rme/fireface_def.h (modified) (5 diffs)
• trunk/libffado/src/rme/fireface_hw.cpp (modified) (6 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (5 diffs)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (3 diffs)

trunk/libffado/src/rme/fireface_def.h

@@ -244 +244 @@
-#define SR0_INP_FREQ2           0x08000000
-#define SR0_INP_FREQ3           0x10000000
-_SYNC  
-_LOCK  
+LK_SYNC
+LK_LOCK
-
-#define SR0_ADAT1_STATUS_MASK   (SR0_ADAT1_LOCK|SR0_ADAT1_SYNC)
@@ -264 +264 @@
-#define SR0_WCLK_STATUS_SYNC    (SR0_WCLK_LOCK|SR0_WCLK_SYNC)
-
+#define SR0_SPDIF_FREQ_MASK     (SR0_SPDIF_F0|SR0_SPDIF_F1|SR0_SPDIF_F2|SR0_SPDIF_F3)
+#define SR0_SPDIF_FREQ_32k      SR0_SPDIF_F0
+#define SR0_SPDIF_FREQ_44k1     SR0_SPDIF_F1
+#define SR0_SPDIF_FREQ_48k      (SR0_SPDIF_F0|SR0_SPDIF_F1)
+#define SR0_SPDIF_FREQ_64k      SR0_SPDIF_F2
+#define SR0_SPDIF_FREQ_88k2     (SR0_SPDIF_F0|SR0_SPDIF_F2)
+#define SR0_SPDIF_FREQ_96k      (SR0_SPDIF_F1|SR0_SPDIF_F2)
+#define SR0_SPDIF_FREQ_128k     (SR0_SPDIF_F0|SR0_SPDIF_F1|SR0_SPDIF_F2)
+#define SR0_SPDIF_FREQ_176k4    SR0_SPDIF_F3
+#define SR0_SPDIF_FREQ_192k     (SR0_SPDIF_F0|SR0_SPDIF_F3)
+
-#define SR0_AUTOSYNC_SRC_MASK   (SR0_SEL_SYNC_REF0|SR0_SEL_SYNC_REF1|SR0_SEL_SYNC_REF2)
-#define SR0_AUTOSYNC_SRC_ADAT1  0
@@ -286 +297 @@
-#define SR1_TCO_SYNC            0x00400000
-
-0_TCO_STATUS_MASK    (SR0_TCO_LOCK|SR0
-0
-0_TCO_STATUS_LOCK    SR0
-0_TCO_STATUS_SYNC    (SR0_TCO_LOCK|SR0
+1_TCO_STATUS_MASK    (SR1_TCO_LOCK|SR1
+1
+1_TCO_STATUS_LOCK    SR1
+1_TCO_STATUS_SYNC    (SR1_TCO_LOCK|SR1
-
-/* Structure used to store device settings in the device flash RAM.  This
@@ -418 +429 @@
-#define FF_SWPARAM_SPDIF_OUTPUT_PRO_ON         FF_DEV_FLASH_SPDIF_OUTPUT_PRO_ON
-#define FF_SWPARAM_SPDIF_OUTPUT_NONAUDIO_ON    FF_DEV_FLASH_SPDIF_OUTPUT_NONAUDIO_ON
-SPDIF_CLOCK_MODE_MASTER
-SPDIF_CLOCK_MODE_AUTOSYNC
-SPDIF_CLOCK_MODE_SLAVE
+CLOCK_MODE_MASTER      
+CLOCK_MODE_AUTOSYNC      
+CLOCK_MODE_SLAVE      
-#define FF_SWPARAM_SYNCREF_WORDCLOCK           FF_DEV_FLASH_SYNCREF_WORDCLOCK
-#define FF_SWPARAM_SYNCREF_ADAT1               FF_DEV_FLASH_SYNCREF_ADAT1
@@ -449 +460 @@
-// The general Fireface state
-typedef struct {
+    uint32_t is_streaming;
-    uint32_t clock_mode;
-    uint32_t autosync_source;

trunk/libffado/src/rme/fireface_hw.cpp

@@ -29 +29 @@
-#include "debugmodule/debugmodule.h"
-
-
+
+
+
+
+
-  if (freq > MIN_QUAD_SPEED)
-    return 4;
@@ -36 +40 @@
-  return 1;
-}
-
-namespace Rme {
-
-signed int
@@ -52 +54 @@
-    settings.spdif_input_mode = FF_SWPARAM_SPDIF_INPUT_COAX;
-    settings.spdif_output_mode = FF_SWPARAM_SPDIF_OUTPUT_COAX;
-SPDIF_
+
-    settings.sync_ref = FF_SWPARAM_SYNCREF_WORDCLOCK;
-    settings.input_level = FF_SWPARAM_ILEVEL_LOGAIN;
-    settings.output_level = FF_SWPARAM_OLEVEL_HIGAIN;
-
+    // A default sampling rate.  An explicit DDS frequency is not enabled
+    // by default.
+    m_software_freq = 44100;
+    m_dds_freq = 0;
+
-    return set_hardware_params(&settings);
-}
@@ -68 +75 @@
-    *stat0 = buf[0];
-    *stat1 = buf[1];
+    return 0;
+}
+
+signed int
+Device::get_hardware_state(FF_state_t *state)
+{
+    // Retrieve the hardware status and deduce the device state.  Return
+    // -1 on error, 0 on success.  The given state structure will be 
+    // cleared by this call.
+    unsigned int stat0, stat1;
+    memset(state, 0, sizeof(*state));
+    if (get_hardware_status(&stat0, &stat1) != 0)
+        return -1;
+
+    state->is_streaming = (stat0 & SR0_IS_STREAMING) != 0;
+
+    state->clock_mode = (settings.clock_mode == FF_SWPARAM_CLOCK_MODE_MASTER)?FF_STATE_CLOCKMODE_MASTER:FF_STATE_CLOCKMODE_AUTOSYNC;
+
+    switch (stat0 & SR0_AUTOSYNC_SRC_MASK) {
+        case SR0_AUTOSYNC_SRC_ADAT1:
+            state->autosync_source = FF_STATE_AUTOSYNC_SRC_ADAT1;
+            break;
+        case SR0_AUTOSYNC_SRC_ADAT2:
+            state->autosync_source = FF_STATE_AUTOSYNC_SRC_ADAT2;
+            break;
+        case SR0_AUTOSYNC_SRC_SPDIF:
+            state->autosync_source = FF_STATE_AUTOSYNC_SRC_SPDIF;
+            break;
+        case SR0_AUTOSYNC_SRC_WCLK:
+            state->autosync_source = FF_STATE_AUTOSYNC_SRC_WCLK;
+            break;
+        case SR0_AUTOSYNC_SRC_TCO:
+            state->autosync_source = FF_STATE_AUTOSYNC_SRC_TCO;
+            break;
+        default: state->autosync_source = FF_STATE_AUTOSYNC_SRC_NOLOCK;
+    }
+
+    switch (stat0 & SR0_AUTOSYNC_FREQ_MASK) {
+        case SR0_AUTOSYNC_FREQ_32k:  state->autosync_freq = 32000; break;
+        case SR0_AUTOSYNC_FREQ_44k1: state->autosync_freq = 44100; break;
+        case SR0_AUTOSYNC_FREQ_48k:  state->autosync_freq = 48000; break;
+        case SR0_AUTOSYNC_FREQ_64k:  state->autosync_freq = 64000; break;
+        case SR0_AUTOSYNC_FREQ_88k2: state->autosync_freq = 88200; break;
+        case SR0_AUTOSYNC_FREQ_96k:  state->autosync_freq = 96000; break;
+        case SR0_AUTOSYNC_FREQ_128k: state->autosync_freq = 128000; break;
+        case SR0_AUTOSYNC_FREQ_176k4:state->autosync_freq = 176400; break;
+        case SR0_AUTOSYNC_FREQ_192k: state->autosync_freq = 192000; break;
+    }
+
+    switch (stat0 & SR0_SPDIF_FREQ_MASK) {
+        case SR0_SPDIF_FREQ_32k:  state->spdif_freq = 32000; break;
+        case SR0_SPDIF_FREQ_44k1: state->spdif_freq = 41000; break;
+        case SR0_SPDIF_FREQ_48k:  state->spdif_freq = 48000; break;
+        case SR0_SPDIF_FREQ_64k:  state->spdif_freq = 64000; break;
+        case SR0_SPDIF_FREQ_88k2: state->spdif_freq = 88200; break;
+        case SR0_SPDIF_FREQ_96k:  state->spdif_freq = 96000; break;
+        case SR0_SPDIF_FREQ_128k: state->spdif_freq = 128000; break;
+        case SR0_SPDIF_FREQ_176k4:state->spdif_freq = 176400; break;
+        case SR0_SPDIF_FREQ_192k: state->spdif_freq = 192000; break;
+    }
+
+    switch (stat0 & SR0_ADAT1_STATUS_MASK) {
+        case SR0_ADAT1_STATUS_NOLOCK:
+            state->adat1_sync_status = FF_STATE_SYNC_NOLOCK; break;
+        case SR0_ADAT1_STATUS_LOCK:
+            state->adat1_sync_status = FF_STATE_SYNC_LOCKED; break;
+        case SR0_ADAT1_STATUS_SYNC: 
+            state->adat1_sync_status = FF_STATE_SYNC_SYNCED; break;
+    }
+    switch (stat0 & SR0_ADAT2_STATUS_MASK) {
+        case SR0_ADAT2_STATUS_NOLOCK:
+            state->adat2_sync_status = FF_STATE_SYNC_NOLOCK; break;
+        case SR0_ADAT2_STATUS_LOCK:
+            state->adat2_sync_status = FF_STATE_SYNC_LOCKED; break;
+        case SR0_ADAT2_STATUS_SYNC:
+            state->adat2_sync_status = FF_STATE_SYNC_SYNCED; break;
+    }
+    switch (stat0 & SR0_SPDIF_STATUS_MASK) {
+        case SR0_SPDIF_STATUS_NOLOCK:
+            state->spdif_sync_status = FF_STATE_SYNC_NOLOCK; break;
+        case SR0_SPDIF_STATUS_LOCK:
+            state->spdif_sync_status = FF_STATE_SYNC_LOCKED; break;
+        case SR0_SPDIF_STATUS_SYNC:
+            state->spdif_sync_status = FF_STATE_SYNC_SYNCED; break;
+    }
+    switch (stat0 & SR0_WCLK_STATUS_MASK) {
+        case SR0_WCLK_STATUS_NOLOCK:
+            state->wclk_sync_status = FF_STATE_SYNC_NOLOCK; break;
+        case SR0_WCLK_STATUS_LOCK:
+            state->wclk_sync_status = FF_STATE_SYNC_LOCKED; break;
+        case SR0_WCLK_STATUS_SYNC:
+            state->wclk_sync_status = FF_STATE_SYNC_SYNCED; break;
+    }
+    switch (stat1 & SR1_TCO_STATUS_MASK) {
+       case SR1_TCO_STATUS_NOLOCK:
+           state->tco_sync_status = FF_STATE_SYNC_NOLOCK; break;
+       case SR1_TCO_STATUS_LOCK:
+           state->tco_sync_status = FF_STATE_SYNC_LOCKED; break;
+       case SR1_TCO_STATUS_SYNC:
+           state->tco_sync_status = FF_STATE_SYNC_SYNCED; break;
+    }
+
-    return 0;
-}
@@ -162 +271 @@
-    data[2] |= (sw_settings->spdif_output_nonaudio==FF_SWPARAM_SPDIF_OUTPUT_NONAUDIO_ON) ? CR2_SPDIF_OUT_NONAUDIO : 0;
-    data[2] |= (sw_settings->spdif_output_mode==FF_SWPARAM_SPDIF_OUTPUT_OPTICAL) ? CR2_SPDIF_OUT_ADAT2 : 0;
-SPDIF_
+
-    data[2] |= (sw_settings->spdif_input_mode==FF_SWPARAM_SPDIF_INPUT_COAX) ? CR2_SPDIF_IN_COAX : CR2_SPDIF_IN_ADAT2;
-    data[2] |= (sw_settings->word_clock_single_speed=FF_SWPARAM_WORD_CLOCK_1x) ? CR2_WORD_CLOCK_1x : 0;
@@ -277 +386 @@
-
-    return 0;
+}
+
+signed int
+Device::hardware_is_streaming(void)
+{
+    // Return 1 if the hardware is streaming, 0 if not.
+    unsigned int s1, s2;
+    if (get_hardware_status(&s1, &s2) != 0)
+        return 0;
+    return (s1 & SR0_IS_STREAMING) != 0;
-}
-

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -180 +180 @@
-    }
-
+    // Find out the device's streaming status
+    is_streaming = hardware_is_streaming();
+
-    init_hardware();
-
@@ -190 +193 @@
-int
-Device::getSamplingFrequency( ) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    return m_software_freq;
-}
@@ -208 +203 @@
-{
-    return 0;
+}
+
+bool
+Device::setDDSFrequency( int dds_freq )
+{
+    // Set a fixed DDS frequency.  If the device is the clock master this
+    // will immediately be copied to the hardware DDS register.  Otherwise
+    // it will take effect as required at the time the sampling rate is 
+    // changed or streaming is started.
+
+    // If the device is streaming, the new DDS rate must have the same
+    // multiplier as the software sample rate
+    if (hardware_is_streaming()) {
+        if (multiplier_of_freq(dds_freq) != multiplier_of_freq(m_software_freq))
+            return false;
+    }
+
+    m_dds_freq = dds_freq;
+    if (settings.clock_mode == FF_STATE_CLOCKMODE_MASTER) {
+        if (set_hardware_dds_freq(dds_freq) != 0)
+            return false;
+    }
+
+    return true;
-}
-
@@ -229 +248 @@
-    signed int i, j;
-    signed int mult[3] = {1, 2, 4};
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                ret = 0;
-                break;
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
-    if (ret == -1)
-        return false;
-
-
-
-
-
+
+
+
+
+
+
-        return false;
-
@@ -260 +316 @@
-    signed int mult[3] = {1, 2, 4};
-    signed int freq[3] = {32000, 44100, 48000};
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }

trunk/libffado/src/rme/rme_avdevice.h

@@ -65 +65 @@
-    virtual void showDevice();
-
+    bool setDDSFrequency( int dds_freq );
-    virtual bool setSamplingFrequency( int samplingFrequency );
-    virtual int getSamplingFrequency( );
@@ -92 +93 @@
-
-    signed int is_streaming;
-
-requested
+       // Optionally explicitly set hardware freq
+in use
-
-    signed int tco_present;
@@ -120 +121 @@
-
-    /* Hardware functions */
+    unsigned int multiplier_of_freq(unsigned int freq);
-    signed int init_hardware(void);
-    signed int get_hardware_status(unsigned int *stat0, unsigned int *stat1);
+    signed int get_hardware_state(FF_state_t *state);
-    signed int set_hardware_params(FF_software_settings_t *sw_settings);
+
-    signed int read_tco(quadlet_t *tco_data, signed int size);
-    signed int write_tco(quadlet_t *tco_data, signed int size);
+    signed int hardware_is_streaming(void);
-
-    signed int read_tco_state(FF_TCO_state_t *tco_state);