Changeset 1021

Timestamp:

04/24/08 10:23:02 (15 years ago)

Author:

ppalmers

Message:

Allow to disable sending payload on no-data packets though config.h.in. The DICE-II devices cannot cope with them.

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/SConstruct (modified) (1 diff)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h (modified) (2 diffs)

trunk/libffado/config.h.in

@@ -150 +150 @@
-#define AMDTP_CLIP_FLOATS                                   1
-
+// Allow that devices request that the AMDTP transmit SP adds
+// payload to the NO-DATA packets. Normally this should not be
+// necessary, and it even breaks some devices (DICE-II based).
+#define AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT                  0
+
+// Default setting for the payload setting if
+// AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT is enabled. Devices can
+// explicity override this
+#define AMDTP_SEND_PAYLOAD_IN_NODATA_XMIT_BY_DEFAULT    false
+
-// -- MOTU options -- //
-

trunk/libffado/SConstruct

@@ -25 +25 @@
-
-FFADO_API_VERSION="8"
-7
+8
-
-import os

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -782 +782 @@
-        }
-
+#if AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT
+        // the DICE-II cannot handle payload in the NO-DATA packets.
+        // the other DICE chips don't need payload. Therefore
+        // we disable it.
+        p->sendPayloadForNoDataPackets(false);
+#endif
+
-        // add audio ports to the processor
-        for (unsigned int j=0;j<nb_audio;j++) {

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -50 +50 @@
-        , m_nb_audio_ports( 0 )
-        , m_nb_midi_ports( 0 )
+#if AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT
+        , m_send_nodata_payload ( AMDTP_SEND_PAYLOAD_IN_NODATA_XMIT_BY_DEFAULT )
+#endif
-{}
-
@@ -365 +368 @@
-    struct iec61883_packet *packet, unsigned int* length )
-{
-
-    // no-data packets have syt=0xFFFF
-
+
+
-    packet->fdf = IEC61883_FDF_NODATA;
-    packet->syt = 0xffff;
-
-
-
-
-
-
+
+
+
-        *length = 2*sizeof ( quadlet_t ) + m_syt_interval * m_dimension * sizeof ( quadlet_t );
-        return m_syt_interval;
-
-
-
-
-
+
-        *length = 2*sizeof ( quadlet_t );
-        return 0;
-    }
+#else
+    // no-data packets without payload
+    *length = 2*sizeof ( quadlet_t );
+    return 0;
+#endif
-}
-

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h

@@ -100 +100 @@
-    virtual bool prepareChild();
-
+#if AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT
+public:
+    void sendPayloadForNoDataPackets(bool b) {m_send_nodata_payload = b;};
+#endif
+
-public:
-    virtual unsigned int getEventSize()
@@ -136 +141 @@
-    unsigned int m_dbc;
-
+#if AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT
+private:
+    bool m_send_nodata_payload;
+#endif
+
-private: // local port caching for performance
-    struct _MBLA_port_cache {