Changeset 1372 for branches

Timestamp:

10/23/08 10:02:34 (12 years ago)

Author:

ppalmers

Message:

Host controller reliability changes:

• make receive DMA mode selectable (but still hardcoded ATM). Some controllers seem to work better in bufferfill mode.
  
• introduce a maximum number of ISO buffers for receive, lower the max nb of ISO buffers for xmit
  
• make the number of buffers for receive and transmit a power of two
  
• ensure at least two hardware interrupts per complete ISO buffer wraparound
  

Files:

• branches/libffado-2.0/config.h.in (modified) (1 diff)
• branches/libffado-2.0/src/libieee1394/ieee1394service.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandler.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandler.h (modified) (2 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp (modified) (5 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.h (modified) (2 diffs)

branches/libffado-2.0/config.h.in

@@ -133 +133 @@
-// due to weirdness in the kernel layer
-#define MAX_XMIT_PACKET_SIZE                         (2048-16)
-
+
+
-
-// should be PAGE_SIZE (4096) for unpatched kernels

branches/libffado-2.0/src/libieee1394/ieee1394service.cpp

@@ -292 +292 @@
-        }
-    }
-
-check state
+
+init helpers
-    if(!m_pCTRHelper) {
-        debugFatal("No CycleTimerHelper available, bad!\n");
@@ -309 +309 @@
-    }
-    m_pIsoManager->setVerboseLevel(getDebugLevel());
+
+    m_pIsoManager->setReceiveMode(RAW1394_DMA_PACKET_PER_BUFFER);
+
-    if(!m_pIsoManager->init()) {
-        debugFatal("Could not initialize IsoHandlerManager\n");

branches/libffado-2.0/src/libieee1394/IsoHandler.cpp

@@ -81 +81 @@
-   , m_last_now( 0xFFFFFFFF )
-   , m_last_packet_handled_at( 0xFFFFFFFF )
+   , m_receive_mode ( RAW1394_DMA_PACKET_PER_BUFFER )
-   , m_Client( 0 )
-   , m_speed( RAW1394_ISO_SPEED_400 )
@@ -106 +107 @@
-   , m_last_now( 0xFFFFFFFF )
-   , m_last_packet_handled_at( 0xFFFFFFFF )
+   , m_receive_mode ( RAW1394_DMA_PACKET_PER_BUFFER )
-   , m_Client( 0 )
-   , m_speed( RAW1394_ISO_SPEED_400 )
@@ -131 +133 @@
-   , m_last_now( 0xFFFFFFFF )
-   , m_last_packet_handled_at( 0xFFFFFFFF )
+   , m_receive_mode ( RAW1394_DMA_PACKET_PER_BUFFER )
-   , m_Client( 0 )
-   , m_speed( speed )
@@ -675 +678 @@
-                                m_max_packet_size,
-                                m_Client->getChannel(),
-RAW1394_DMA_PACKET_PER_BUFFER
+m_receive_mode
-                                m_irq_interval)) {
- (DMA_BUFFERFILL)
+
-            debugFatal("  %s\n",strerror(errno));
-            return false;

branches/libffado-2.0/src/libieee1394/IsoHandler.h

@@ -168 +168 @@
-    uint32_t getLastPacketTime() {return m_last_packet_handled_at;};
-
+    /**
+     * @brief set iso receive mode. doesn't have any effect if the stream is running
+     * @param m receive mode
+     */
+    void setReceiveMode(enum raw1394_iso_dma_recv_mode m)
+        {m_receive_mode = m;}
+
-    void notifyOfDeath();
-    bool handleBusReset();
@@ -181 +188 @@
-    uint32_t        m_last_now;
-    uint32_t        m_last_packet_handled_at;
+    enum raw1394_iso_dma_recv_mode m_receive_mode;
-
-    Streaming::StreamProcessor *m_Client; // FIXME: implement with functors

branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp

@@ -459 +459 @@
-   , m_IsoThreadReceive ( NULL )
-   , m_IsoTaskReceive ( NULL )
+   , m_receive_mode( RAW1394_DMA_PACKET_PER_BUFFER )
-{
-}
@@ -470 +471 @@
-   , m_IsoThreadReceive ( NULL )
-   , m_IsoTaskReceive ( NULL )
+   , m_receive_mode( RAW1394_DMA_PACKET_PER_BUFFER )
-{
-}
@@ -777 +779 @@
-        // the receive buffer size doesn't matter for the latency,
-        // but it has a minimal value in order for libraw to operate correctly (300)
-
+
+
+
+
+
+
+
+
+
-
-        // create the actual handler
+        debugOutput( DEBUG_LEVEL_VERBOSE, " creating IsoRecvHandler\n");
-        h = new IsoHandler(*this, IsoHandler::eHT_Receive,
-                           buffers, max_packet_size, irq_interval);
-
-        debugOutput( DEBUG_LEVEL_VERBOSE, " creating IsoRecvHandler\n");
-
-        if(!h) {
@@ -790 +799 @@
-        }
-
+        h->setReceiveMode(m_receive_mode);
+
-    } else if (stream->getType()==StreamProcessor::ePT_Transmit) {
-        // setup the optimal parameters for the raw1394 ISO buffering
-//        unsigned int packets_per_period = stream->getPacketsPerPeriod();
-        unsigned int max_packet_size = stream->getMaxPacketSize();
-
-
-
-
-
-
-
-
+
-        if (max_packet_size > MAX_XMIT_PACKET_SIZE) {
-            debugError("max packet size (%u) > MAX_XMIT_PACKET_SIZE (%u)\n",
@@ -809 +812 @@
-
-        // the SP specifies how many packets to ISO-buffer
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        debugOutput( DEBUG_LEVEL_VERBOSE, " creating IsoXmitHandler\n");

branches/libffado-2.0/src/libieee1394/IsoHandlerManager.h

@@ -197 +197 @@
-         */
-        bool handleBusReset();
+
+        /**
+         * @brief set iso receive mode. doesn't have any effect if the stream is running
+         * @param m receive mode
+         */
+        void setReceiveMode(enum raw1394_iso_dma_recv_mode m)
+            {m_receive_mode = m;}
+
-    // the state machine
-    private:
@@ -236 +244 @@
-        Util::Thread *  m_IsoThreadReceive;
-        IsoTask *       m_IsoTaskReceive;
+        enum raw1394_iso_dma_recv_mode m_receive_mode;
-
-        // debug stuff