Changeset 412

Timestamp:

02/22/07 08:49:35 (17 years ago)

Author:

pieterpalmers

Message:

- added some documentation
- added a lock()/unlock() to IAvDevice (see header)
- reimplemented test-freebob to the new C++ api
- started with support for AddressRangeMapping?, i.e. response

to reads/writes of the 1394 memory space on the host

Files:

• branches/streaming-rework/config.h.in (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/bounce/bounce_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/dice/dice_avdevice.cpp (modified) (4 diffs)
• branches/streaming-rework/src/dice/dice_avdevice.h (modified) (2 diffs)
• branches/streaming-rework/src/dice/dice_defines.h (added)
• branches/streaming-rework/src/freebob_streaming.cpp (modified) (2 diffs)
• branches/streaming-rework/src/iavdevice.h (modified) (13 diffs)
• branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp (modified) (8 diffs)
• branches/streaming-rework/src/libfreebobavc/ieee1394service.h (modified) (3 diffs)
• branches/streaming-rework/src/maudio/maudio_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/maudio/maudio_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/metrichalo/mh_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/metrichalo/mh_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/rme/rme_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/rme/rme_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/threads.h (modified) (3 diffs)
• branches/streaming-rework/tests/Makefile.am (modified) (3 diffs)
• branches/streaming-rework/tests/test-freebob-cpp.cpp (added)
• branches/streaming-rework/tests/test-ieee1394service.cpp (added)

branches/streaming-rework/config.h.in

@@ -84 +84 @@
-#undef const
-
- int
+
-#undef size_t
-

branches/streaming-rework/src/bebob/bebob_avdevice.cpp

@@ -949 +949 @@
-    m_id=id;
-        return true;
+}
+
+bool
+AvDevice::lock() {
+
+    return true;
+}
+
+
+bool
+AvDevice::unlock() {
+
+    return true;
-}
-

branches/streaming-rework/src/bebob/bebob_avdevice.h

@@ -73 +73 @@
-
-    virtual bool prepare();
+    bool lock();
+    bool unlock();
-
-    virtual int startStreamByIndex(int i);

branches/streaming-rework/src/bounce/bounce_avdevice.cpp

@@ -185 +185 @@
-}
-
+bool
+BounceDevice::lock() {
+
+    return true;
+}
+
+
+bool
+BounceDevice::unlock() {
+
+    return true;
+}
+
-void
-BounceDevice::showDevice() const

branches/streaming-rework/src/bounce/bounce_avdevice.h

@@ -66 +66 @@
-    
-        virtual bool prepare();
+    bool lock();
+    bool unlock();
-        
-        virtual int getStreamCount();

branches/streaming-rework/src/dice/dice_avdevice.cpp

@@ -21 +21 @@
-
-#include "dice/dice_avdevice.h"
+#include "dice/dice_defines.h"
+
-#include "configrom.h"
-
-#include "libfreebobavc/ieee1394service.h"
-freebobavc/avc_definitions
+streaming/AmdtpStreamProcessor
-
-#include "debugmodule/debugmodule.h"
@@ -32 +33 @@
-#include <assert.h>
-#include <netinet/in.h>
-
-#include <libraw1394/csr.h>
-
-#include "libstreaming/AmdtpStreamProcessor.h"
-
-namespace Dice {
-
-NORMAL
+VERBOSE
-
-// to define the supported devices
@@ -59 +58 @@
-    , m_iso_recv_channel ( -1 )
-    , m_iso_send_channel ( -1 )
-    
-{
-    setDebugLevel( verboseLevel );
@@ -159 +157 @@
-}
-
+bool
+DiceAvDevice::lock() {
+
+    return true;
+}
+
+
+bool
+DiceAvDevice::unlock() {
+
+    return true;
+}
+
-int 
-DiceAvDevice::getStreamCount() {

branches/streaming-rework/src/dice/dice_avdevice.h

@@ -1 @@
-mh
+dice
- * Copyright (C) 2007 by Pieter Palmers
- *
@@ -48 +48 @@
-                  int nodeId,
-                  int verboseLevel );
-virtual 
+
-
-    static bool probe( ConfigRom& configRom );
-virtual 
-virtual 
+
+
-
-    // obsolete, will be removed soon, unused
-virtual 
+
-
-irtual v
+
-
-virtual 
-virtual 
+
+
-
-virtual 
+
-
-virtual 
-virtual 
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-    signed int getIsoRecvChannel(void);

branches/streaming-rework/src/freebob_streaming.cpp

@@ -125 +125 @@
-            assert(device);
-
+            debugOutput(DEBUG_LEVEL_VERBOSE, "Locking device (%p)\n", device);
+            
+            if (!device->lock()) {
+                debugWarning("Could not lock device, skipping device (%p)!\n", device);
+                continue;
+            }
+            
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Setting samplerate to %d for (%p)\n", 
-                        dev->options.sample_rate, device);
@@ -181 +188 @@
-
-void freebob_streaming_finish(freebob_device_t *dev) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/streaming-rework/src/iavdevice.h

@@ -34 +34 @@
-\brief Interface that is to be implemented to support a device.
-
-
+
+
-
-*/
@@ -45 +46 @@
-        
-        /**
-
-
+
-         * 
-         * @return true if the device was discovered successfully
@@ -53 +53 @@
-        
-        /**
-
+@brief 
-         * @param samplingFrequency 
-         * @return true if successfull
@@ -59 +59 @@
-        virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ) = 0;
-        /**
-
+@brief 
-         * @return the sampling frequency as integer
-         */
@@ -65 +65 @@
-        
-    /**
-
-
+
-     *
-     * The purpose of this is to allow for unique port naming
@@ -96 +95 @@
-        
-        /**
-
+@brief 
-         *
-         * this is a leftover from v1.0 and isn't used
@@ -108 +107 @@
-        
-        /**
-
+@brief 
-         *
-         * This function prints out a (detailed) description of the 
@@ -114 +113 @@
-         */
-        virtual void showDevice() const = 0;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         */
-        virtual bool prepare() = 0;
-        
-
-
-
+
+
-         *
-         * Most likely this is 2 streams, i.e. one transmit stream and one
@@ -135 +166 @@
-         *       getStreamProcessorByIndex(i) should return a valid StreamProcessor
-         *       for i=0 to i=getStreamCount()-1
-         * \note
-         *
-         * @return 
@@ -142 +172 @@
-        
-        /** 
-
+
+
-         * \note a streamprocessor returned by getStreamProcessorByIndex(i)
-         *       cannot be the same object as one returned by
-         *       getStreamProcessorByIndex(j) if i isn't equal to j
-
-
+
+
+
-         * \param i : Stream index
-         * \pre \ref i smaller than getStreamCount()
@@ -155 +187 @@
-        
-        /** 
-
+@brief 
-         *
-         * This function is called by the streaming layer when this stream should
@@ -162 +194 @@
-         *
-         * It returns the channel number that was assigned for this stream.
-
-
-
-
-
-
-
-
-
-
-
+
+
-         *
-         * \param i : Stream index
@@ -181 +204 @@
-        
-        /** 
-
+@brief 
-         *
-         * \param i : Stream index

branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp

@@ -28 +28 @@
-#include <netinet/in.h>
-
-"string.h"
+<string.h>
-
-#include <iostream>
@@ -57 +57 @@
-    stopRHThread();
-
+    for ( arm_mapping_vec_t::iterator it = m_arm_mappings.begin();
+          it != m_arm_mappings.end();
+          ++it )
+    {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler for 0x%016llX\n", (*it)->start);
+        int err=raw1394_arm_unregister(m_resetHandle, (*it)->start);
+        if (err) {
+            debugError(" Failed to unregister ARM handler for 0x%016llX\n", (*it)->start);
+            debugError(" Error: %s\n", strerror(errno));
+        } else {
+            delete *it;
+        }
+    }
+
-    if ( m_handle ) {
-        raw1394_destroy_handle( m_handle );
-    }
+    
-    if ( m_resetHandle ) {
-        raw1394_destroy_handle( m_resetHandle );
@@ -75 +90 @@
-            debugFatal("libraw1394 not compatible\n");
-        } else {
-
+\n
-                strerror(errno) );
-            debugFatal("Is ieee1394 and raw1394 driver loaded?\n");
@@ -100 +115 @@
-    raw1394_set_bus_reset_handler( m_resetHandle,
-                                   this->resetHandlerLowLevel );
+
+    m_default_arm_handler = raw1394_set_arm_tag_handler( m_resetHandle,
+                                   this->armHandlerLowLevel );
-    startRHThread();
-
@@ -296 +314 @@
-}
-
+bool Ieee1394Service::registerARMrange(nodeaddr_t start,
+                     size_t length, byte_t *initial_value,
+                     arm_options_t access_rights,
+                     arm_options_t notification_options,
+                     arm_options_t client_transactions,
+                     Functor* functor) {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Registering ARM handler for 0x%016llX, length %u\n", start,length);
+                     
+    arm_mapping_t *new_mapping=NULL;
+    new_mapping = new arm_mapping_t;
+    
+    new_mapping->start=start;
+    new_mapping->length=length;
+    new_mapping->access_rights=access_rights;
+    new_mapping->notification_options=notification_options;
+    new_mapping->client_transactions=client_transactions;
+    new_mapping->functor=functor;
+    
+    int err=raw1394_arm_register(m_resetHandle, start, 
+                         length, initial_value, (octlet_t)new_mapping,
+                         access_rights,
+                         notification_options,
+                         client_transactions);
+    if (err) {
+        debugError("Failed to register ARM handler for 0x%016llX\n", start);
+        debugError(" Error: %s\n", strerror(errno));
+        delete new_mapping;
+        return false;
+    }
+    
+    m_arm_mappings.push_back( new_mapping );
+
+    return true;
+}
+
+bool Ieee1394Service::unregisterARMrange( nodeaddr_t start ) {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler for 0x%016llX\n", start);
+    
+    for ( arm_mapping_vec_t::iterator it = m_arm_mappings.begin();
+          it != m_arm_mappings.end();
+          ++it )
+    {
+        if((*it)->start == start) {
+            int err=raw1394_arm_unregister(m_resetHandle, start);
+            if (err) {
+                debugError("Failed to unregister ARM handler for 0x%016llX\n", start);
+                debugError(" Error: %s\n", strerror(errno));
+            } else {
+                m_arm_mappings.erase(it);
+                delete *it;
+                return true;
+            }
+        }
+    }
+    debugOutput(DEBUG_LEVEL_VERBOSE, " no handler found!\n");
+    
+    return false;
+}
+    
+int 
+Ieee1394Service::armHandlerLowLevel(raw1394handle_t handle, 
+                     unsigned long arm_tag,
+                     byte_t request_type, unsigned int requested_length,
+                     void *data)
+{
+    Ieee1394Service* instance
+        = (Ieee1394Service*) raw1394_get_userdata( handle );
+    instance->armHandler( arm_tag, request_type, requested_length, data );
+
+    return 0;
+}
+
+bool
+Ieee1394Service::armHandler(  unsigned long arm_tag,
+                     byte_t request_type, unsigned int requested_length,
+                     void *data)
+{
+    for ( arm_mapping_vec_t::iterator it = m_arm_mappings.begin();
+          it != m_arm_mappings.end();
+          ++it )
+    {
+        if((*it) == (arm_mapping_t *)arm_tag) {
+            debugOutput(DEBUG_LEVEL_VERBOSE,"ARM handler for address 0x%016llX called\n", (*it)->start);
+            Functor* func = (*it)->functor;
+            ( *func )();
+            return true;
+        }
+    }
+
+    debugOutput(DEBUG_LEVEL_VERBOSE,"default ARM handler called\n");
+
+    m_default_arm_handler(m_resetHandle, arm_tag, request_type, requested_length, data );
+    return true;
+}
+
-bool
-Ieee1394Service::startRHThread()
@@ -344 +457 @@
-Ieee1394Service::addBusResetHandler( Functor* functor )
-{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Adding busreset handler (%p)\n", functor);
-    m_busResetHandlers.push_back( functor );
-    return true;
@@ -351 +465 @@
-Ieee1394Service::remBusResetHandler( Functor* functor )
-{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Removing busreset handler (%p)\n", functor);
+    
-    for ( reset_handler_vec_t::iterator it = m_busResetHandlers.begin();
-          it != m_busResetHandlers.end();
@@ -356 +472 @@
-    {
-        if ( *it == functor ) {
+            debugOutput(DEBUG_LEVEL_VERBOSE, " found\n");
-            m_busResetHandlers.erase( it );
-            return true;
-        }
-    }
+    debugOutput(DEBUG_LEVEL_VERBOSE, " not found\n");
-    return false;
-}

branches/streaming-rework/src/libfreebobavc/ieee1394service.h

@@ -125 +125 @@
-    bool addBusResetHandler( Functor* functor );
-    bool remBusResetHandler( Functor* functor );
+    
+    /**
+     * @brief register an AddressRangeMapping
+     *
+     * @param start          identifies addressrange
+     * @param length         identifies addressrange length
+     * @param initial_value  pointer to buffer containing (if necessary) initial value
+     *                    NULL means undefined
+     * @param access_rights access-rights for registered addressrange handled 
+     *                    by kernel-part. Value is one or more binary or of the 
+     *                    following flags - ARM_READ, ARM_WRITE, ARM_LOCK
+     * @param notification_options identifies for which type of request you want
+     *                    to be notified. Value is one or more binary or of the 
+     *                    following flags - ARM_READ, ARM_WRITE, ARM_LOCK
+     * @param client_transactions identifies for which type of request you want
+     *                    to handle the request by the client application.
+     *                    for those requests no response will be generated, but
+     *                    has to be generated by the application.
+     *                    Value is one or more binary or of the 
+     *                    following flags - ARM_READ, ARM_WRITE, ARM_LOCK
+     *                    For each bit set here, notification_options and
+     *                    access_rights will be ignored.
+     * @param functor the function to call when this range is written to
+     *
+     * @return true on success or false on failure
+     **/
+
+    bool registerARMrange(nodeaddr_t start,
+                         size_t length, byte_t *initial_value,
+                         arm_options_t access_rights,
+                         arm_options_t notification_options,
+                         arm_options_t client_transactions,
+                         Functor* functor);
+
+    /**
+     * @brief unregister ARM range
+     * @param start identifies addressrange
+     * @return true if successful, false otherwise
+     */
+    bool unregisterARMrange( nodeaddr_t start );
-
-// ISO channel stuff
@@ -166 +206 @@
-
-    static int resetHandlerLowLevel( raw1394handle_t handle,
-                               
+               
-    bool resetHandler( unsigned int generation );
+    
+    static int armHandlerLowLevel(raw1394handle_t handle, unsigned long arm_tag,
+                     byte_t request_type, unsigned int requested_length,
+                     void *data); 
+    bool armHandler(  unsigned long arm_tag,
+                     byte_t request_type, unsigned int requested_length,
+                     void *data);
-
-    raw1394handle_t m_handle;
@@ -181 +228 @@
-    reset_handler_vec_t m_busResetHandlers;
-    
+    // ARM stuff
+    arm_tag_handler_t m_default_arm_handler;
+    
+    typedef struct arm_mapping {
+        nodeaddr_t start;
+        size_t length;
+        arm_options_t access_rights;
+        arm_options_t notification_options;
+        arm_options_t client_transactions;
+        Functor* functor;
+    } arm_mapping_t;
+    
+    typedef std::vector< arm_mapping_t* > arm_mapping_vec_t;
+    arm_mapping_vec_t m_arm_mappings;
+    
-    DECLARE_DEBUG_MODULE;
-};

branches/streaming-rework/src/maudio/maudio_avdevice.cpp

@@ -136 +136 @@
-}
-
+bool
+AvDevice::lock() {
+
+    return true;
+}
+
+
+bool
+AvDevice::unlock() {
+
+    return true;
+}
-
-void

branches/streaming-rework/src/maudio/maudio_avdevice.h

@@ -61 +61 @@
-
-    virtual bool prepare();
+    bool lock();
+    bool unlock();
+    
-
-    virtual int startStreamByIndex(int i);

branches/streaming-rework/src/metrichalo/mh_avdevice.cpp

@@ -144 +144 @@
-}
-
+bool
+MHAvDevice::lock() {
+
+    return true;
+}
+
+
+bool
+MHAvDevice::unlock() {
+
+    return true;
+}
+
-void
-MHAvDevice::showDevice() const

branches/streaming-rework/src/metrichalo/mh_avdevice.h

@@ -69 +69 @@
-
-    virtual bool prepare();
+    bool lock();
+    bool unlock();
-
-    virtual int startStreamByIndex(int i);

branches/streaming-rework/src/motu/motu_avdevice.cpp

@@ -308 +308 @@
-}
-
+bool
+MotuDevice::lock() {
+
+    return true;
+}
+
+
+bool
+MotuDevice::unlock() {
+
+    return true;
+}
+
-void
-MotuDevice::showDevice() const

branches/streaming-rework/src/motu/motu_avdevice.h

@@ -116 +116 @@
-
-    virtual bool prepare();
-
+
+
+
-    virtual int startStreamByIndex(int i);
-    virtual int stopStreamByIndex(int i);

branches/streaming-rework/src/rme/rme_avdevice.cpp

@@ -169 +169 @@
-}
-
+bool
+RmeDevice::lock() {
+
+    return true;
+}
+
+
+bool
+RmeDevice::unlock() {
+
+    return true;
+}
+
-void
-RmeDevice::showDevice() const

branches/streaming-rework/src/rme/rme_avdevice.h

@@ -70 +70 @@
-
-    virtual bool prepare();
+    bool lock();
+    bool unlock();
-
-    virtual int startStreamByIndex(int i);

branches/streaming-rework/src/threads.h

@@ -41 +41 @@
-public:
-    MemberFunctor0( const CalleePtr& pCallee, 
-               
-               
+        
+        
-        : m_pCallee( pCallee )
-        , m_pMemFun( pMemFun )
-       
-       
+        
+        
-        {}
-
-    MemberFunctor0( const CalleePtr& pCallee, 
-               
-               
-               
+        
+        
+        
-        : m_pCallee( pCallee )
-        , m_pMemFun( pMemFun )
-       
-       
+        
+        
-        {}
-
@@ -63 +63 @@
-
-    virtual void operator() ()
- 
-       
-       
-               
-       
-       
-               
-       
-       
+
+        
+        
+                
+        
+        
+            
+    
+    
-
-private:
@@ -86 +86 @@
-public:
-    MemberFunctor1( const CalleePtr& pCallee, 
-               
-               
-               
+        
+        
+        
-        : m_pCallee( pCallee )
-        , m_pMemFun( pMemFun )
-       
-       
-       
+        
+        
+        
-        {}
-
-    MemberFunctor1( const CalleePtr& pCallee, 
-               
-               
-               
-               
+        
+        
+        
+        
-        : m_pCallee( pCallee )
-        , m_pMemFun( pMemFun )
-       
-       
-       
+        
+        
+        
-        {}
-    virtual ~MemberFunctor1()
-    
+
-
-    virtual void operator() ()
-    { 
-       
-       
-               
-       
-       
-               
-       
-       
+{
+        
+        
+                
+        
+        
+                
+        
+    
-
-private:

branches/streaming-rework/tests/Makefile.am

@@ -19 +19 @@
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(LIBXML_CFLAGS) \
-
+ $(LIBXMLCPP_CFLAGS)
-        
-noinst_PROGRAMS =
-
-if BUILD_TESTS
-
+freebob-cpp test-
-                test-volume test-mixer test-cycletimer test-sytmonitor \
-
+ test-ieee1394service
-endif
-
@@ -33 +33 @@
-test_freebob_SOURCES = test-freebob.c
-test_freebob_LDADD   = $(top_builddir)/src/libfreebob.la \
+        $(LIBXML_LIBS) $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
+        
+test_freebob_cpp_SOURCES = test-freebob-cpp.cpp
+test_freebob_cpp_LDADD   = $(top_builddir)/src/libfreebob.la \
-        $(LIBXML_LIBS) $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
-
@@ -49 +53 @@
-test_fw410_SOURCES = test-fw410.cpp
-test_fw410_LDADD   = $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) -lrom1394
+
+test_ieee1394service_SOURCES = test-ieee1394service.cpp
+test_ieee1394service_LDADD   = $(top_builddir)/src/libfreebob.la \
+                               $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) -lrom1394
-
-freebob_server_SOURCES = freebob-server.c