Changeset 1586

Timestamp:

06/26/09 05:43:09 (14 years ago)

Author:

jwoithe

Message:

RME: obtain and interpret TCO status from device.

Files:

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

trunk/libffado/src/rme/fireface_def.h

@@ -427 +427 @@
-#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_TCO1_WORD_CLOCK_INPUT_MASK         (FF_TCO1_WORD_CLOCK_INPUT_RATE0|FF_TCO1_WORD_CLOCK_INPUT_RATE1)
+#define FF_TCO1_VIDEO_INPUT_MASK              (FF_TCO1_VIDEO_INPUT_NTSC|FF_TCO1_VIDEO_INPUT_PAL)
-#define FF_TC01_LTC_FORMAT_24fps              0
-#define FF_TCO1_LTC_FORMAT_25fps              FF_TCO1_LTC_FORMAT0
@@ -433 +435 @@
-#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)
+#define FF_TCO1_LTC_FORMAT_MASK               (FF_TCO1_LTC_FORMAT0|FF_TCO1_LTC_FORMAT1)
-
-// TCO quadlet 2
@@ -489 +492 @@
-#define FF_TCOPARAM_TERMINATION_ON            1
-
+// The state of the TCO
+typedef struct {
+  unsigned int locked, ltc_valid;
+  unsigned int hours, minutes, seconds, frames;
+  unsigned int frame_rate;
+  unsigned int drop_frame;
+  unsigned int video_input;
+  unsigned int word_clock_state;
+  float sample_rate;
+} FF_TCO_state_t;
+
+// TCO state field defines
+#define FF_TCOSTATE_FRAMERATE_24fps           1
+#define FF_TCOSTATE_FRAMERATE_25fps           2
+#define FF_TCOSTATE_FRAMERATE_29_97fps        3
+#define FF_TCOSTATE_FRAMERATE_30fps           4
+#define FF_TCOSTATE_VIDEO_NONE                0
+#define FF_TCOSTATE_VIDEO_PAL                 1
+#define FF_TCOSTATE_VIDEO_NTSC                2
+#define FF_TCOSTATE_WORDCLOCK_NONE            0
+#define FF_TCOSTATE_WORDCLOCK_1x              1
+#define FF_TCOSTATE_WORDCLOCK_2x              2
+#define FF_TCOSTATE_WORDCLOCK_4x              3
+
-#endif

trunk/libffado/src/rme/fireface_hw.cpp

@@ -258 +258 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    // Writes the supplied application-level settings to the device's TCO
@@ -270 +330 @@
-    }
-
-.
+->
-        tc[0] |= FF_TCO0_MTC;
-
-.
+->
-        case FF_TCOPARAM_INPUT_LTC:
-            tc[2] |= FF_TCO2_INPUT_LTC; break;
@@ -282 +342 @@
-    }
-
-.
+->
-        case FF_TCOPARAM_FRAMERATE_24fps:
-            tc[1] |= FF_TC01_LTC_FORMAT_24fps; break;
@@ -297 +357 @@
-    }
-
-.
+->
-        case FF_TCOPARAM_WORD_CLOCK_CONV_1_1:
-            tc[2] |= FF_TCO2_WORD_CLOCK_CONV_1_1; break;
@@ -306 +366 @@
-    }
-
-.
+->
-        case FF_TCOPARAM_SRATE_44_1:
-            tc[2] |= FF_TCO2_SRATE_44_1; break;
@@ -315 +375 @@
-    }
-
-.
+->
-        case FF_TCPPARAM_PULL_NONE:
-            tc[2] |= FF_TCO2_PULL_0; break;
@@ -328 +388 @@
-    }
-
-.
+->
-        tc[2] |= FF_TCO2_SET_TERMINATION;
-

trunk/libffado/src/rme/rme_avdevice.h

@@ -120 +120 @@
-    signed int write_tco(quadlet_t *tco_data, signed int size);
-
-
+
+
-    
-};