Changeset 748

Timestamp:

11/29/07 14:26:52 (16 years ago)

Author:

ppalmers

Message:

try to reorganize things such that less information is duplicated

Files:

• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/cycletimer.h (moved) (moved from trunk/libffado/src/libstreaming/util/cycletimer.h)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (7 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (2 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (11 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.h (modified) (4 diffs)
• trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/util/IsoHandler.cpp (modified) (4 diffs)
• trunk/libffado/src/libstreaming/util/IsoHandler.h (modified) (1 diff)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)
• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/tests/test-timestampedbuffer.cpp (modified) (1 diff)

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -674 +674 @@
-        // construct the streamprocessor
-        Streaming::AmdtpReceiveStreamProcessor *p;
-
-
+
-                             nb_channels);
-
@@ -760 +759 @@
-        // construct the streamprocessor
-        Streaming::AmdtpTransmitStreamProcessor *p;
-
-
+
-                             nb_channels);
-

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -418 +418 @@
-        return false;
-    }
-
-
+
-                             outputPlug->getNrOfChannels());
-
@@ -442 +441 @@
-    if (snoopMode) {
-        // we are snooping, so this is receive too.
-
-
+
-                                  inputPlug->getNrOfChannels());
-    } else {
-
-
+
-                                inputPlug->getNrOfChannels());
-    }

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -25 +25 @@
-#include "ieee1394service.h"
-#include "ARMHandler.h"
+#include "cycletimer.h"
-
-#include <libavc1394/avc1394.h>
@@ -43 +44 @@
-
-Ieee1394Service::Ieee1394Service()
-
+, m_rtHandle( 0 )
-    , m_port( -1 )
-    , m_threadRunning( false )
@@ -63 +64 @@
-{
-    stopRHThread();
-
-    for ( arm_handler_vec_t::iterator it = m_armHandlers.begin();
-          it != m_armHandlers.end();
@@ -83 +83 @@
-        raw1394_destroy_handle( m_resetHandle );
-    }
+    if ( m_rtHandle ) {
+        raw1394_destroy_handle( m_rtHandle );
+    }
-}
-
@@ -122 +125 @@
-
-    m_resetHandle = raw1394_new_handle_on_port( port );
-h
+resetH
-        if ( !errno ) {
-            debugFatal("libraw1394 not compatible\n");
@@ -132 +135 @@
-        return false;
-    }
+    
+    m_rtHandle = raw1394_new_handle_on_port( port );
+    if ( !m_rtHandle ) {
+        if ( !errno ) {
+            debugFatal("libraw1394 not compatible\n");
+        } else {
+            debugFatal("Ieee1394Service::initialize: Could not get 1394 handle: %s",
+                strerror(errno) );
+            debugFatal("Is ieee1394 and raw1394 driver loaded?\n");
+        }
+        return false;
+    }
-
-    m_port = port;
@@ -169 +184 @@
-nodeid_t Ieee1394Service::getLocalNodeId() {
-    return raw1394_get_local_id(m_handle) & 0x3F;
+}
+
+/**
+ * Returns the current value of the cycle timer (in ticks)
+ *
+ * @return the current value of the cycle timer (in ticks)
+ */
+
+unsigned int
+Ieee1394Service::getCycleTimerTicks() {
+    // the new api should be realtime safe.
+    // it might cause a reschedule when turning preemption,
+    // back on but that won't hurt us if we have sufficient
+    // priority
+    int err;
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    err=raw1394_read_cycle_timer(m_rtHandle, &cycle_timer, &local_time);
+    if(err) {
+        debugWarning("raw1394_read_cycle_timer: %s\n", strerror(err));
+    }
+    return CYCLE_TIMER_TO_TICKS(cycle_timer);
+}
+
+/**
+ * Returns the current value of the cycle timer (as is)
+ *
+ * @return the current value of the cycle timer (as is)
+ */
+
+unsigned int
+Ieee1394Service::getCycleTimer() {
+    // the new api should be realtime safe.
+    // it might cause a reschedule when turning preemption,
+    // back on but that won't hurt us if we have sufficient
+    // priority
+    int err;
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    err=raw1394_read_cycle_timer(m_rtHandle, &cycle_timer, &local_time);
+    if(err) {
+        debugWarning("raw1394_read_cycle_timer: %s\n", strerror(err));
+    }
+    return cycle_timer;
-}
-

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -92 +92 @@
-    */
-    nodeid_t getLocalNodeId();
+
+    /// get the most recent cycle timer value (in ticks)
+    unsigned int getCycleTimerTicks();
+    /// get the most recent cycle timer value (as is)
+    unsigned int getCycleTimer();
+
-
-   /**
@@ -259 +265 @@
-    raw1394handle_t m_handle;
-    raw1394handle_t m_resetHandle;
+    raw1394handle_t m_rtHandle; // a handle for operations from the rt thread
-    int             m_port;
-    std::string     m_portName;

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

@@ -26 +26 @@
-#include "../StreamProcessorManager.h"
-
-../util
+libieee1394
-
-#include <netinet/in.h>
@@ -35 +35 @@
-/* --------------------- RECEIVE ----------------------- */
-
-int por
-ePT_Receive , port
+FFADODevice &paren
+parent, ePT_Receive
-    , m_dimension( dimension )
-{}
@@ -89 +89 @@
-                  (length >= 2*sizeof(quadlet_t));
-    if(ok) {
-handler->
+parent.get1394Service().
-        //=> convert the SYT to a full timestamp in ticks
-        m_last_timestamp = sytRecvToFullTicks((uint32_t)ntohs(packet->syt),

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

@@ -75 +75 @@
-     *                  (midi-muxed is only one stream)
-     */
-int por
+FFADODevice &paren
-    virtual ~AmdtpReceiveStreamProcessor() {};
-

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

@@ -26 +26 @@
-#include "../StreamProcessorManager.h"
-
-../util
+libieee1394
-
-#include <netinet/in.h>
@@ -42 +42 @@
-
-/* transmit */
- ( int port, int dimension 
- ( ePT_Transmit, port 
- 
- 
+(FFADODevice &parent, int dimension
+(parent, ePT_Transmit
+
+
-{}
-

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

@@ -77 +77 @@
-     *                  (midi-muxed is only one stream)
-     */
-int por
+FFADODevice &paren
-    virtual ~AmdtpTransmitStreamProcessor() {};
-

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -23 +23 @@
-
-#include "StreamProcessor.h"
-../util
+libieee1394
-#include "../StreamProcessorManager.h"
-
@@ -35 +35 @@
-IMPL_DEBUG_MODULE( StreamProcessor, StreamProcessor, DEBUG_LEVEL_VERBOSE );
-
-
-
+
+
+
-    , m_channel( -1 )
-    , m_port( port )
-    , m_handler( NULL )
-    , m_state( ePS_Created )
@@ -64 +64 @@
-
-uint64_t StreamProcessor::getTimeNow() {
-handler->
+parent.get1394Service().
-}
-
@@ -114 +114 @@
-    time_at_period = addTicks(time_at_period, m_manager->getSyncSource().getSyncDelay());
-
-handler->
+parent.get1394Service().
-
-    // calculate the time until the next period
@@ -423 +423 @@
-    // we the packet we are constructing will be sent out
-    // on 'cycle', not 'now'.
-handler->
+parent.get1394Service().
-    int now_cycles = (int)CYCLE_TIMER_GET_CYCLES(ctr);
-
@@ -836 +836 @@
-             m_manager->getPeriodSize(), m_manager->getNbBuffers());
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Port: %d, Channel: %d\n",
-m_port,
+getPort(), 
-
-    // initialization can be done without requesting it
@@ -873 +873 @@
-    uint64_t tx;
-    if (t < 0) {
-handler->
+parent.get1394Service().
-    } else {
-        tx = t;
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-handler->
+parent.get1394Service().
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Now                   : %011llu (%03us %04uc %04ut)\n",
-                          now,
@@ -902 +902 @@
-    uint64_t tx;
-    if (t < 0) {
-handler->
+parent.get1394Service().
-    } else {
-        tx = t;
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-handler->
+parent.get1394Service().
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Now                   : %011llu (%03us %04uc %04ut)\n",
-                          now,
@@ -924 +924 @@
-    uint64_t tx;
-    if (t < 0) {
-handler->
+parent.get1394Service().
-    } else {
-        tx = t;
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-handler->
+parent.get1394Service().
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Now                   : %011llu (%03us %04uc %04ut)\n",
-                          now,
@@ -946 +946 @@
-    uint64_t tx;
-    if (t < 0) {
-handler->
+parent.get1394Service().
-    } else {
-        tx = t;
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-handler->
+parent.get1394Service().
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Now                   : %011llu (%03us %04uc %04ut)\n",
-                          now,
@@ -1530 +1530 @@
-{
-    debugOutputShort( DEBUG_LEVEL_NORMAL, " StreamProcessor %p information\n", this);
-m_port
+getPort()
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  StreamProcessor info:\n");
-    if (m_handler) {
-handler->
+parent.get1394Service().
-        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Now                   : %011llu (%03us %04uc %04ut)\n",
-                          now,

trunk/libffado/src/libstreaming/generic/StreamProcessor.h

@@ -24 +24 @@
-#ifndef __FFADO_STREAMPROCESSOR__
-#define __FFADO_STREAMPROCESSOR__
+
+#include "ffadodevice.h"
+#include "libieee1394/ieee1394service.h"
-
-#include "PortManager.h"
@@ -130 +133 @@
-
-public: // constructor/destructor
-enum eProcessorType type, int port
+FFADODevice &parent, enum eProcessorType type
-    virtual ~StreamProcessor();
+protected:
+    FFADODevice&    m_parent;
-
-public: // the public receive/transmit functions
@@ -255 +260 @@
-    bool setChannel(int c)
-        {m_channel = c; return true;};
-ort
+arent.get1394Service().getPort()
-    virtual unsigned int getPacketsPerPeriod();
-    virtual unsigned int getMaxPacketSize() = 0;
@@ -261 +266 @@
-    void setHandler( IsoHandler * h) {m_handler = h;};
-    void clearHandler() {m_handler = NULL;};
-
-private:
-    int m_channel;
-    int m_port;
-protected:
-    IsoHandler *m_handler; // needed for local id and cycle counter

trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

@@ -27 +27 @@
-#include "../StreamProcessorManager.h"
-
-../util
+libieee1394
-
-#include <math.h>
@@ -67 +67 @@
-}
-
-int por
-ePT_Receive , port
-event_size
+FFADODevice &paren
+parent, ePT_Receive
+ event_size 
-{}
-
@@ -137 +137 @@
-        // we can just pick it straight from the packet.
-        uint32_t last_sph = ntohl(*(quadlet_t *)(data+8+(n_events-1)*event_length));
-handler->
+parent.get1394Service().
-        return eCRV_OK;
-    } else {

trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.h

@@ -56 +56 @@
-     *                  (midi-muxed is only one stream)
-     */
-int por
+FFADODevice &paren
-    virtual ~MotuReceiveStreamProcessor() {};
-

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

@@ -27 +27 @@
-#include "../StreamProcessorManager.h"
-
-../util
+libieee1394
-
-#include <netinet/in.h>
@@ -51 +51 @@
-
-/* transmit */
- ( int por
- ( ePT_Transmit, por
- 
- 
+(FFADODevice &paren
+(parent, ePT_Transmi
+
+
-{}
-

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.h

@@ -55 +55 @@
-     * Create a MOTU transmit StreamProcessor
-     */
-int por
+FFADODevice &paren
-    virtual ~MotuTransmitStreamProcessor() {};
-

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -25 +25 @@
-#include "generic/StreamProcessor.h"
-#include "generic/Port.h"
-util
+libieee1394
-
-#include <errno.h>

trunk/libffado/src/libstreaming/util/IsoHandler.cpp

@@ -23 +23 @@
-
-#include "IsoHandler.h"
-#include "cycletimer.h"
-#include "../generic/StreamProcessor.h"
-
@@ -37 +36 @@
-#include <iostream>
-using namespace std;
-
-#define CC_SLEEP_TIME_AFTER_UPDATE    1000
-#define CC_SLEEP_TIME_AFTER_FAILURE     10
-#define CC_DLL_COEFF     ((0.001)*((float)(CC_SLEEP_TIME_AFTER_UPDATE/1000.0)))
-
-#define CC_MAX_RATE_ERROR           (2.0/100.0)
-#define CC_INIT_MAX_TRIES 10
-
-
-namespace Streaming
@@ -275 +266 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "bus reset...\n");
-
+    #define CSR_CYCLE_TIME            0x200
+    #define CSR_REGISTER_BASE  0xfffff0000000ULL
-    // do a simple read on ourself in order to update the internal structures
-    // this avoids read failures after a bus reset
@@ -280 +273 @@
-    raw1394_read(m_handle, raw1394_get_local_id(m_handle),
-                 CSR_REGISTER_BASE | CSR_CYCLE_TIME, 4, &buf);
-
-    return 0;
-}
-
-/**
- * Returns the current value of the cycle timer (in ticks)
- *
- * @return the current value of the cycle timer (in ticks)
- */
-
-unsigned int IsoHandler::getCycleTimerTicks() {
-    // the new api should be realtime safe.
-    // it might cause a reschedule when turning preemption,
-    // back on but that won't hurt us if we have sufficient
-    // priority
-    int err;
-    uint32_t cycle_timer;
-    uint64_t local_time;
-    err=raw1394_read_cycle_timer(m_handle_util, &cycle_timer, &local_time);
-    if(err) {
-        debugWarning("raw1394_read_cycle_timer: %s\n", strerror(err));
-    }
-    return CYCLE_TIMER_TO_TICKS(cycle_timer);
-}
-
-/**
- * Returns the current value of the cycle timer (as is)
- *
- * @return the current value of the cycle timer (as is)
- */
-
-unsigned int IsoHandler::getCycleTimer() {
-    // the new api should be realtime safe.
-    // it might cause a reschedule when turning preemption,
-    // back on but that won't hurt us if we have sufficient
-    // priority
-    int err;
-    uint32_t cycle_timer;
-    uint64_t local_time;
-    err=raw1394_read_cycle_timer(m_handle_util, &cycle_timer, &local_time);
-    if(err) {
-        debugWarning("raw1394_read_cycle_timer: %s\n", strerror(err));
-    }
-    return cycle_timer;
-}
-
-void IsoHandler::dumpInfo()
-{
-
-    int channel=-1;
-    if (m_Client) channel=m_Client->getChannel();

trunk/libffado/src/libstreaming/util/IsoHandler.h

@@ -95 +95 @@
-        int getLocalNodeId() {return raw1394_get_local_id( m_handle );};
-        int getPort() {return m_port;};
-
-        /// get the most recent cycle timer value (in ticks)
-        unsigned int getCycleTimerTicks();
-        /// get the most recent cycle timer value (as is)
-        unsigned int getCycleTimer();
-
-    protected:

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -23 +23 @@
-
-#include "libutil/Atomic.h"
-streaming/util
+ieee1394
-
-#include "TimestampedBuffer.h"

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -519 +519 @@
-    }
-
-
-
+
-
-    // The first thing is to initialize the processor.  This creates the
@@ -589 +588 @@
-
-    // Do the same for the transmit processor
-
-
+
-
-    m_transmitProcessor->setVerboseLevel(getDebugLevel());

trunk/libffado/tests/test-timestampedbuffer.cpp

@@ -37 +37 @@
-#include <netinet/in.h>
-
-streaming/util
+ieee1394
-
-#include "src/libutil/TimestampedBuffer.h"