Changeset 1584

Timestamp:

06/22/09 05:31:17 (14 years ago)

Author:

jwoithe

Message:

RME: Fill out TCO definitions. Start work on TCO interface methods.

Files:

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

trunk/libffado/src/rme/fireface_def.h

@@ -407 +407 @@
-// Defines used to configure selected quadlets of the TCO write space.  The
-// byte indices referenced in the define names are 0-based.
+
+// TCO quadlet 0
+#define FF_TCO0_MTC                           0x80000000
+
+// TCO quadlet 1
-#define FF_TCO1_TCO_lock                      0x00000001
+#define FF_TCO1_WORD_CLOCK_INPUT_RATE0        0x00000002
+#define FF_TCO1_WORD_CLOCK_INPUT_RATE1        0x00000004
+#define FF_TCO1_LTC_INPUT_VALID               0x00000008
+#define FF_TCO1_WORD_CLOCK_INPUT_VALID        0x00000010
+#define FF_TCO1_VIDEO_INPUT_NTSC              0x00000020
+#define FF_TCO1_VIDEO_INPUT_PAL               0x00000040
+#define FF_TCO1_SET_TC                        0x00000100
+#define FF_TCO1_SET_DROPFRAME                 0x00000200
+#define FF_TCO1_LTC_FORMAT0                   0x00000400
+#define FF_TCO1_LTC_FORMAT1                   0x00000800
+
+#define FF_TCO1_WORD_CLOCK_INPUT_1x           0
+#define FF_TCO1_WORD_CLOCK_INPUT_2x           FF_TCO1_WORD_CLOCK_INPUT_RATE0
+#define FF_TCO1_WORD_CLOCK_INPUT_4x           FF_TCO1_WORD_CLOCK_INPUT_RATE1
+#define FF_TC01_LTC_FORMAT_24fps              0
+#define FF_TCO1_LTC_FORMAT_25fps              FF_TCO1_LTC_FORMAT0
+#define FF_TC01_LTC_FORMAT_29_97fps           FF_TCO1_LTC_FORMAT1
+#define FF_TCO1_LTC_FORMAT_29_97dpfs          (FF_TCO1_LTC_FORMAT1|FF_TCO1_SET_DROPFRAME)
+#define FF_TCO1_LTC_FORMAT_30fps              (FF_TCO1_LTC_FORMAT0|FF_TCO1_LTC_FORMAT1)
+#define FF_TCO1_LTC_FORMAT_30dfps             (FF_TCO1_LTC_FORMAT0|FF_TCO1_LTC_FORMAT1|FF_TCO1_SET_DROPFRAME)
+
+// TCO quadlet 2
+#define FF_TCO2_TC_RUN                        0x00010000
+#define FF_TCO2_WORD_CLOCK_CONV0              0x00020000
+#define FF_TCO2_WORD_CLOCK_CONV1              0x00040000
+#define FF_TCO2_NUM_DROPFRAMES0               0x00080000 // Unused
+#define FF_TCO2_NUM_DROPFRAMES1               0x00100000 // Unused
+#define FF_TCO2_SET_JAM_SYNC                  0x00200000
+#define FF_TCO2_SET_FLYWHEEL                  0x00400000
+#define FF_TCO2_SET_01_4                      0x01000000
+#define FF_TCO2_SET_PULLDOWN                  0x02000000
+#define FF_TCO2_SET_PULLUP                    0x04000000
+#define FF_TCO2_SET_FREQ                      0x08000000
+#define FF_TCO2_SET_TERMINATION               0x10000000
+#define FF_TCO2_SET_INPUT0                    0x20000000
+#define FF_TCO2_SET_INPUT1                    0x40000000
+#define FF_TCO2_SET_FREQ_FROM_APP             0x80000000
+
+#define FF_TCO2_WORD_CLOCK_CONV_1_1           0
+#define FF_TCO2_WORD_CLOCK_CONV_44_48         FF_TCO2_WORD_CLOCK_CONV0
+#define FF_TCO2_WORD_CLOCK_CONV_48_44         FF_TCO2_WORD_CLOCK_CONV1
+#define FF_TCO2_PULL_0                        0
+#define FF_TCO2_PULL_UP_01                    FF_TCO2_SET_PULLUP
+#define FF_TCO2_PULL_DOWN_01                  FF_TCO2_SET_PULLDOWN
+#define FF_TCO2_PULL_UP_40                    (FF_TCO2_SET_PULLUP|FF_TCO2_SET_01_4)
+#define FF_TCO2_PULL_DOWN_40                  (FF_TCO2_SET_PULLDOWN|FF_TCO2_SET_01_4)
+#define FF_TCO2_INPUT_LTC                     FF_TCO2_SET_INPUT1
+#define FF_TCO2_INPUT_VIDEO                   FF_TCO2_SET_INPUT0
+#define FF_TCO2_INPUT_WORD_CLOCK              0
-
-#endif

trunk/libffado/src/rme/fireface_hw.cpp

@@ -257 +257 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -97 +97 @@
-    , m_rme_model( RME_MODEL_NONE )
-    , m_ddsFreq( -1 )
+    , tco_present( 0 )
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Rme::Device (NodeID %d)\n",
@@ -170 +171 @@
-        debugError("Unsupported model\n");
-        return false;
+    }
+
+    // If device is FF800, check to see if the TCO is fitted
+    if (m_rme_model == RME_MODEL_FIREFACE800) {
+        tco_present = (read_tco(NULL, 0) == 0);
-    }
-

trunk/libffado/src/rme/rme_avdevice.h

@@ -93 +93 @@
-    signed int m_ddsFreq;
-
+    signed int tco_present;
-    FF_software_settings_t settings;
-
@@ -118 +119 @@
-    signed int read_tco(quadlet_t *tco_data, signed int size);
-    signed int write_tco(quadlet_t *tco_data, signed int size);
+
+    signed int write_tco_settings(FF_TCO_settings_t tco_settings);
-    
-};