Changeset 1592

Timestamp:

07/09/09 05:42:30 (14 years ago)

Author:

jwoithe

Message:

RME: begin tidy-up of sampling rate control.
RME: start implementation of device status retrieval.

Files:

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

trunk/libffado/src/rme/fireface_def.h

@@ -36 +36 @@
-#define RME_FF800               1
-
+#define MIN_SPEED               30000
+#define MIN_DOUBLE_SPEED        56000
+#define MIN_QUAD_SPEED          112000
+#define MAX_SPEED               210000
+
-/* The Command Buffer Address (CBA) is different for the two interfaces */
-#define RME_FF400_CMD_BUFFER    0x80100500
@@ -220 +225 @@
-/* Defines for the status registers */
-// Status register 0
+#define SR0_IS_STREAMING        0x00000001
-#define SR0_ADAT1_LOCK          0x00000400
-#define SR0_ADAT2_LOCK          0x00000800
-#define SR0_ADAT1_SYNC          0x00001000
-#define SR0_ADAT2_SYNC          0x00002000
-F0      
-F1      
-F2      
-F3      
+SPDIF_F0
+SPDIF_F1
+SPDIF_F2
+SPDIF_F3
-#define SR0_SPDIF_SYNC          0x00040000
-#define SR0_OVER                0x00080000
@@ -241 +247 @@
-#define SR0_WC_LOCK             0x40000000
-
+#define SR0_ADAT1_STATUS_MASK   (SR0_ADAT1_LOCK|SR0_ADAT1_SYNC)
+#define SR0_ADAT1_STATUS_NOLOCK 0
+#define SR0_ADAT1_STATUS_LOCK   SR0_ADAT1_LOCK
+#define SR0_ADAT1_STATUS_SYNC   (SR0_ADAT1_LOCK|SR0_ADAT1_SYNC)
+#define SR0_ADAT2_STATUS_MASK   (SR0_ADAT2_LOCK|SR0_ADAT2_SYNC)
+#define SR0_ADAT2_STATUS_NOLOCK 0
+#define SR0_ADAT2_STATUS_LOCK   SR0_ADAT2_LOCK
+#define SR0_ADAT2_STATUS_SYNC   (SR0_ADAT2_LOCK|SR0_ADAT2_SYNC)
+#define SR0_SPDIF_STATUS_MASK   (SR0_SPDIF_LOCK|SR0_SPDIF_SYNC)
+#define SR0_SPDIF_STATUS_NOLOCK 0
+#define SR0_SPDIF_STATUS_LOCK   SR0_SPDIF_LOCK
+#define SR0_SPDIF_STATUS_SYNC   (SR0_SPDIF_LOCK|SR0_SPDIF_SYNC)
+#define SR0_WCLK_STATUS_MASK    (SR0_WCLK_LOCK|SR0_WCLK_SYNC)
+#define SR0_WCLK_STATUS_NOLOCK  0
+#define SR0_WCLK_STATUS_LOCK    SR0_WCLK_LOCK
+#define SR0_WCLK_STATUS_SYNC    (SR0_WCLK_LOCK|SR0_WCLK_SYNC)
+
+#define SR0_AUTOSYNC_SRC_MASK   (SR0_SEL_SYNC_REF0|SR0_SEL_SYNC_REF1|SR0_SEL_SYNC_REF2)
+#define SR0_AUTOSYNC_SRC_ADAT1  0
+#define SR0_AUTOSYNC_SRC_ADAT2  SR0_SEL_SYNC_REF0
+#define SR0_AUTOSYNC_SRC_SPDIF  (SR0_SEL_SYNC_REF0|SR0_SEL_SYNC_REF1)
+#define SR0_AUTOSYNC_SRC_WCLK   SR0_SEL_SYNC_REF2
+#define SR0_AUTOSYNC_SRC_TCO    (SR0_SEL_SYNC_REF0|SR0_SEL_SYNC_REF2)
+
+#define SR0_AUTOSYNC_FREQ_MASK  (SR0_INP_FREQ0|SR0_INP_FREQ1|SR0_INP_FREQ2|SR0_INP_FREQ3)
+#define SR0_AUTOSYNC_FREQ_32k   SR0_INP_FREQ0
+#define SR0_AUTOSYNC_FREQ_44k1  SR0_INP_FREQ1
+#define SR0_AUTOSYNC_FREQ_48k   (SR0_INP_FREQ0|SR0_INP_FREQ1)
+#define SR0_AUTOSYNC_FREQ_64k   SR0_INP_FREQ2
+#define SR0_AUTOSYNC_FREQ_88k2  (SR0_INP_FREQ0|SR0_INP_FREQ2)
+#define SR0_AUTOSYNC_FREQ_96k   (SR0_INP_FREQ1|SR0_INP_FREQ2)
+#define SR0_AUTOSYNC_FREQ_128k  (SR0_INP_FREQ0|SR0_INP_FREQ1|SR0_INP_FREQ2)
+#define SR0_AUTOSYNC_FREQ_176k4 SR0_INP_FREQ3
+#define SR0_AUTOSYNC_FREQ_192k  (SR0_INP_FREQ0|SR0_INP_FREQ3)
+
-// Status register 1
-#define SR1_TCO_LOCK            0x00800000
-#define SR1_TCO_SYNC            0x00400000
+
+#define SR0_TCO_STATUS_MASK    (SR0_TCO_LOCK|SR0_TCO_SYNC)
+#define SR0_TCO_STATUS_NOLOCK  0
+#define SR0_TCO_STATUS_LOCK    SR0_TCO_LOCK
+#define SR0_TCO_STATUS_SYNC    (SR0_TCO_LOCK|SR0_TCO_SYNC)
-
-/* Structure used to store device settings in the device flash RAM.  This
@@ -401 +447 @@
-#define FF_SWPARAM_FF800_INPUT_OPT_REAR        FF_SWPARAM_INPUT_OPT_B
-
+// The general Fireface state
+typedef struct {
+    uint32_t clock_mode;
+    uint32_t autosync_source;
+    uint32_t autosync_freq;
+    uint32_t spdif_freq;
+    uint32_t adat1_sync_status, adat2_sync_status;
+    uint32_t spdif_sync_status;
+    uint32_t wclk_sync_status, tco_sync_status;
+} FF_state_t;
+
+#define FF_STATE_CLOCKMODE_MASTER              0
+#define FF_STATE_CLOCKMODE_AUTOSYNC            1
+#define FF_STATE_AUTOSYNC_SRC_ADAT1            0x01
+#define FF_STATE_AUTOSYNC_SRC_ADAT2            0x02
+#define FF_STATE_AUTOSYNC_SRC_SPDIF            0x03
+#define FF_STATE_AUTOSYNC_SRC_WCLK             0x04
+#define FF_STATE_AUTOSYNC_SRC_TCO              0x15
+#define FF_STATE_SYNC_LOCKED                   1
+#define FF_STATE_SYNC_SYNCED                   2
+
-// Data structure for the TCO (Time Code Option) state
-typedef struct {

trunk/libffado/src/rme/fireface_hw.cpp

@@ -28 +28 @@
-
-#include "debugmodule/debugmodule.h"
+
+unsigned int multiplier(unsigned int freq) {
+  if (freq > MIN_QUAD_SPEED)
+    return 4;
+  if (freq > MIN_DOUBLE_SPEED)
+    return 2;
+  return 1;
+}
-
-namespace Rme {
@@ -52 +60 @@
-}
-
+signed int
+Device::get_hardware_status(unsigned int *stat0, unsigned int *stat1)
+{
+    unsigned int buf[2];
+    if (readBlock(RME_FF_STATUS_REG0, buf, 2) != 0)
+        return -1;
+    *stat0 = buf[0];
+    *stat1 = buf[1];
+    return 0;
+}
+
-signed int 
-Device::set_hardware_params(FF_software_settings_t *sw_settings)
@@ -400 +419 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -96 +96 @@
-    : FFADODevice( d, configRom )
-    , m_rme_model( RME_MODEL_NONE )
-
-
+
+
+
-    , tco_present( 0 )
-{
@@ -200 +201 @@
- * (the default value of m_ddsFreq).
- */
-treaming
+oftware
-}
-
@@ -212 +213 @@
-Device::setSamplingFrequency( int samplingFrequency )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Work out whether the requested rate is supported */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        return false;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    return true;
-}
-
-#define RME_CHECK_AND_ADD_SR(v, x) \
-    { \
-    if (((x >= 32000*0.96 && x <= 32000*1.04) || \
-        (x >= 44100*0.96 && x <= 44100*1.04) || \
-        (x >= 48000*0.96 && x <= 48000*1.04) || \
-        (x >= 64000*0.96 && x <= 64000*1.04) || \
-        (x >= 88200*0.96 && x <= 88200*1.04) || \
-        (x >= 96000*0.96 && x <= 96000*1.04) || \
-        (x >= 128000*0.96 && x <= 128000*1.04) || \
-        (x >= 176000*0.96 && x <= 176000*1.04) || \
-        (x >= 192000*0.96 && x <= 192000*1.04))) { \
-        v.push_back(x); \
-    };};
-
-std::vector<int>
@@ -269 +257 @@
-{
-    std::vector<int> frequencies;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    return frequencies;
-}

trunk/libffado/src/rme/rme_avdevice.h

@@ -91 +91 @@
-    enum ERmeModel m_rme_model;
-
-
-
+
+
+
-
-    signed int tco_present;
@@ -120 +121 @@
-    /* Hardware functions */
-    signed int init_hardware(void);
+    signed int get_hardware_status(unsigned int *stat0, unsigned int *stat1);
-    signed int set_hardware_params(FF_software_settings_t *sw_settings);
-    signed int read_tco(quadlet_t *tco_data, signed int size);
@@ -126 +128 @@
-    signed int read_tco_state(FF_TCO_state_t *tco_state);
-    signed int write_tco_settings(FF_TCO_settings_t *tco_settings);
-
+
+
-};
-