Changeset 42

Timestamp:

12/05/04 14:36:17 (18 years ago)

Author:

wagi

Message:

Register/unregister AvDevice? in AvDevicePool? when detected/disappeared.

Files:

• trunk/freebob/src/avdevice.cpp (modified) (12 diffs)
• trunk/freebob/src/avdevice.h (modified) (4 diffs)
• trunk/freebob/src/avdevicepool.cpp (modified) (3 diffs)
• trunk/freebob/src/avdevicepool.h (modified) (2 diffs)
• trunk/freebob/src/ieee1394service.cpp (modified) (6 diffs)
• trunk/freebob/src/ieee1394service.h (modified) (3 diffs)

trunk/freebob/src/avdevice.cpp

@@ -27 +27 @@
-#include "avdevicemusicsubunit.h"
-
-int port, int node
+octlet_t oGuid
-{
-
-
-
-
-
-
-
-
-
-
+
-}
-
-FBReturnCodes
-
-
-
-
-
+
+
+
-        if ( !m_handle ) {
-            if ( !errno ) {
@@ -161 +150 @@
-                                                        tmpAvDeviceSubunit->unReserve();
-                                                        //setDebugLevel(DEBUG_LEVEL_MODERATE);
-
+
-
-                                                } else {
@@ -208 +197 @@
-        unsigned char *request_pos;
-        unsigned int i;
-
+m_
-        if (request != NULL) {
-                debugPrint (DEBUG_LEVEL_TRANSFERS, "------- TRANSACTION START -------\n");
@@ -275 +264 @@
-        response = avcExecuteTransaction(request, 2, 2);
-        if (response != NULL) {
-
-
-
+
+
+
-}
-
@@ -292 +281 @@
-                *fdf=response[1]& 0x00FFFFFF;
-        }
-
-
+
+
+
-FBReturnCodes AvDevice::setOutputPlugSignalFormat(unsigned char plug, unsigned char fmt, quadlet_t fdf) {
-        quadlet_t request[6];
@@ -303 +293 @@
-        response = avcExecuteTransaction(request, 2, 2);
-        if (response != NULL) {
-
-
-
+
+
+
-}
-
@@ -320 +310 @@
-                *fdf=response[1]& 0x00FFFFFF;
-        }
-
+
-}
-
@@ -340 +330 @@
-        quadlet_t *response;
-                        //setDebugLevel(DEBUG_LEVEL_ALL);
-
- 
+
+
-
-        for (unsigned int i=0;i<getNbIsoSourcePlugs();i++) {
@@ -347 +337 @@
-                                                | AVC1394_COMMAND_SIGNAL_SOURCE | 0xFF;
-                request[1]=0xFFFEFF00 | ((i & 0xFF));
-
+
-                response = avcExecuteTransaction(request, 2, 2);
-
+
-                if (response != NULL) {
-                        unsigned char output_status=(response[0]&0xE0) >> 5;
-                        unsigned char conv=(response[0]&0x10) >> 4;
-                        unsigned char signal_status=(response[0]&0x0F);
-
+
-                        unsigned int signal_source=((response[1]>>16)&0xFFFF);
-
+
-                        unsigned char source_subunit_type=(signal_source>>11)&0x1F;
-                        unsigned char source_subunit_id=(signal_source>>8)&0x07;
-                        unsigned char source_plug=signal_source&0xFF;
-
+
-                        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice:   OPCR 0x%02X <- subunit: 0x%02X/0x%02X, plug: 0x%02X (0x%02X / %d / 0x%02X)\n",i, source_subunit_type,source_subunit_id,source_plug,output_status,conv,signal_status);
- 
+
-                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
-                        if(tmpSubunit) {
-                                tmpSubunit->printSourcePlugConnections(source_plug);
-                        }
-
-
-
-
-    
+
+
+
+
+
-
-        for (unsigned int i=0;i<getNbExtSourcePlugs();i++) {
@@ -377 +367 @@
-                                                | AVC1394_COMMAND_SIGNAL_SOURCE | 0xFF;
-                request[1]=0xFFFEFF00 | ((i & 0xFF)|0x80);
-
+
-                response = avcExecuteTransaction(request, 2, 2);
-
+
-                if (response != NULL) {
-                        unsigned char output_status=(response[0]&0xE0) >> 5;
-                        unsigned char conv=(response[0]&0x10) >> 4;
-                        unsigned char signal_status=(response[0]&0x0F);
-
+
-                        unsigned int signal_source=((response[1]>>16)&0xFFFF);
-
+
-                        unsigned char source_subunit_type=(signal_source>>11)&0x1F;
-                        unsigned char source_subunit_id=(signal_source>>8)&0x07;
-                        unsigned char source_plug=signal_source&0xFF;
-
-    
-
- 
+
+
+
+
-                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
-                        if(tmpSubunit) {
-                                tmpSubunit->printSourcePlugConnections(source_plug);
-                      
-
-
-
-   
+
+
+
+
+
-
-        for (unsigned int i=0;i<getNbIsoDestinationPlugs();i++) {
@@ -407 +397 @@
-                                                | AVC1394_COMMAND_SIGNAL_SOURCE | 0xFF;
-                request[1]=0xFFFEFF00 | ((i & 0xFF));
-
+
-                response = avcExecuteTransaction(request, 2, 2);
-
+
-                if (response != NULL) {
-                        unsigned char output_status=(response[0]&0xE0) >> 5;
-                        unsigned char conv=(response[0]&0x10) >> 4;
-                        unsigned char signal_status=(response[0]&0x0F);
-
+
-                        unsigned int signal_source=((response[1]>>16)&0xFFFF);
-
+
-                        unsigned char source_subunit_type=(signal_source>>11)&0x1F;
-                        unsigned char source_subunit_id=(signal_source>>8)&0x07;
-                        unsigned char source_plug=signal_source&0xFF;
-
+
-                        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice:   OPCR 0x%02X <- subunit: 0x%02X/0x%02X, plug: 0x%02X (0x%02X / %d / 0x%02X)\n",i, source_subunit_type,source_subunit_id,source_plug,output_status,conv,signal_status);
- 
+
-                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
-                        if(tmpSubunit) {
-                                //tmpSubunit->printDestinationPlugConnections(source_plug);
-                        }
-
-
-
-
-      
+
+
+
+
+
-
-        for (unsigned int i=0;i<getNbExtDestinationPlugs();i++) {
@@ -437 +427 @@
-                                                | AVC1394_COMMAND_SIGNAL_SOURCE | 0xFF;
-                request[1]=0xFFFEFF00 | ((i & 0xFF)|0x80);
-
+
-                response = avcExecuteTransaction(request, 2, 2);
-
+
-                if (response != NULL) {
-                        unsigned char output_status=(response[0]&0xE0) >> 5;
-                        unsigned char conv=(response[0]&0x10) >> 4;
-                        unsigned char signal_status=(response[0]&0x0F);
-
+
-                        unsigned int signal_source=((response[1]>>16)&0xFFFF);
-
+
-                        unsigned char source_subunit_type=(signal_source>>11)&0x1F;
-                        unsigned char source_subunit_id=(signal_source>>8)&0x07;
-                        unsigned char source_plug=signal_source&0xFF;
-
-    
-
- 
+
+
+
+
-                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
-                        if(tmpSubunit) {
-                                //tmpSubunit->printDestinationPlugConnections(source_plug);
-                      
-
-
-
-
+
+
+
+
+

trunk/freebob/src/avdevice.h

@@ -19 +19 @@
- * MA 02111-1307 USA.
- */
+#ifndef AVDEVICE_H
+#define AVDEVICE_H
-
-#include "ieee1394service.h"
@@ -25 +27 @@
-using std::vector;
-
-
-#ifndef AVDEVICE_H
-#define AVDEVICE_H
-
-class AvDeviceSubunit;
-
-class AvDevice {
- public:
-int node,int port
+ octlet_t oGuid 
-    virtual ~AvDevice();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-    bool isInitialised();
-
@@ -56 +68 @@
-    unsigned char getNbExtSourcePlugs() { return iNbExtSourcePlugs; } ;
-    unsigned char getNbExtDestinationPlugs() { return iNbExtDestinationPlugs; } ;
-    
-    int getNodeId() { return iNodeId; } ;
-
- protected:
@@ -63 +73 @@
- 
- private:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

trunk/freebob/src/avdevicepool.cpp

@@ -19 +19 @@
- */
-
+#include <queue>
+
+#include "avdevice.h"
-#include "avdevicepool.h"
+
+AvDevicePool* AvDevicePool::m_pInstance = 0;
-
-AvDevicePool::AvDevicePool()
@@ -27 +32 @@
-AvDevicePool::~AvDevicePool()
-{
+}
+
+AvDevicePool*
+AvDevicePool::instance()
+{
+    if ( !m_pInstance ) {
+        m_pInstance = new AvDevicePool;
+    }
+    return m_pInstance;
-}
-
@@ -58 +72 @@
-}
-
+AvDevice*
+AvDevicePool::getAvDevice(octlet_t oGuid)
+{
+    AvDevice* pAvDevice = 0;
+    for ( AvDeviceVector::iterator iter = m_avDevices.begin();
+          iter != m_avDevices.end();
+          ++iter )
+    {
+        if ( ( *iter )->getGuid() == oGuid ) {
+            pAvDevice = *iter;
+            break;
+        }
+    }
+    return pAvDevice;
+}
+
+FBReturnCodes
+AvDevicePool::removeObsoleteDevices( unsigned int iGeneration )
+{
+    // XXX dw: removing elements can be done more elegant.
+    std::queue< AvDevice* > deleteQueue;
+
+    for ( AvDeviceVector::iterator iter = m_avDevices.begin();
+          iter != m_avDevices.end();
+          ++iter )
+    {
+        if ( ( *iter )->getGeneration() < iGeneration ) {
+            deleteQueue.push( *iter );
+        }
+    }
+
+    while ( !deleteQueue.empty() ) {
+        AvDevice* pAvDevice = deleteQueue.front();
+        deleteQueue.pop();
+        delete pAvDevice;
+    }
+
+    return eFBRC_Success;
+}

trunk/freebob/src/avdevicepool.h

@@ -23 +23 @@
-#include "freebob.h"
-#include <vector>
+#include <libraw1394/raw1394.h> // octlet_t
-
-class AvDevice;
@@ -28 +29 @@
-class AvDevicePool {
- public:
+    static AvDevicePool* instance();
+
+    FBReturnCodes registerAvDevice( AvDevice* pAvDevice );
+    FBReturnCodes unregisterAvDevice( AvDevice* pAvDevice );
+
+    AvDevice* getAvDevice( octlet_t oGuid );
+
+    /**
+     * Remove devices in pool which where (physically) removed 
+     * from the bus.
+     *
+     * All devices which have a lower generation count smaller
+     * than iGeneration are removed from the pool
+     *
+     * @param iGeneration Current generation count.
+     * @return see FBReturnCodes.
+     */
+    FBReturnCodes removeObsoleteDevices( unsigned int iGeneration );
+ private:
-    AvDevicePool();
-    ~AvDevicePool();
-
-
-
-
-
+
+
+
-    AvDeviceVector m_avDevices;
-};

trunk/freebob/src/ieee1394service.cpp

@@ -24 +24 @@
-#include <libiec61883/iec61883.h>
-
-
-#include "ieee1394service.h"
+#include "threads.h"
-#include "debugmodule.h"
+#include "avdevicepool.h"
-
-#include "avdevice.h"
@@ -104 +105 @@
-        startRHThread();
-
-        discoveryDevices();
-        m_bInitialised = true;
+
+        asyncCall( this, &Ieee1394Service::discoveryDevices,
+                   m_iGenerationCount);
-    }
-    return eFBRC_Success;
@@ -126 +129 @@
-
-FBReturnCodes
-
+ unsigned int iGeneration 
-{
-    //scan bus
@@ -152 +155 @@
-                                             AVC1394_SUBUNIT_TYPE_AUDIO ) ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            break;
@@ -195 +194 @@
-        }
-    }
+
+    AvDevicePool::instance()->removeObsoleteDevices( iGeneration );
-    return eFBRC_Success;
-}
+
+
+void
+Ieee1394Service::avDeviceTests(octlet_t oGuid, int iPort, int iNodeId)
+{
+    // PP: just a static try, don't want to mess with the device manager yet...
+    // Remark: the AvDevice and AvDescriptor aren't debugged thouroughly yet!
+    //         the following code is the only debug I had time for... to be continued! (later this week)
+                debugPrint (DEBUG_LEVEL_INFO, "  Trying to create an AvDevice...\n");
+
+                AvDevice *test=new AvDevice(oGuid);
+                test->setNodeId( iNodeId );
+                test->setPort( iPort );
+                debugPrint (DEBUG_LEVEL_INFO, "   Created...\n");
+                test->initialize();
+                if (test->isInitialised()) {
+                        unsigned char fmt;
+                        quadlet_t fdf;
+                        test->getInputPlugSignalFormat(0,&fmt,&fdf);
+                        debugPrint (DEBUG_LEVEL_INFO, "   fmt=%02X fdf=%08X\n",fmt,fdf);
+                        test->getInputPlugSignalFormat(1,&fmt,&fdf);
+                        debugPrint (DEBUG_LEVEL_INFO, "   fmt=%02X fdf=%08X\n",fmt,fdf);
+                        test->getOutputPlugSignalFormat(0,&fmt,&fdf);
+                        debugPrint (DEBUG_LEVEL_INFO, "   fmt=%02X fdf=%08X\n",fmt,fdf);
+                        test->getOutputPlugSignalFormat(1,&fmt,&fdf);
+                        debugPrint (DEBUG_LEVEL_INFO, "   fmt=%02X fdf=%08X\n",fmt,fdf);
+                        test->printConnections();
+                }
+
+                debugPrint (DEBUG_LEVEL_INFO, "   Deleting AvDevice...\n");
+                delete test;
+}
+
-
-void
@@ -309 +343 @@
-        = (Ieee1394Service*) raw1394_get_userdata (handle);
-    pInstance->setGenerationCount( iGeneration );
+
+    // dw: let's rescan the bus.  this might not the correct order
+    // of commands.
+    asyncCall( pInstance, &Ieee1394Service::discoveryDevices, iGeneration );
-    return 0;
-}

trunk/freebob/src/ieee1394service.h

@@ -57 +57 @@
-
-    static Ieee1394Service* instance();
-
+ unsigned int iGenerationCount 
-
-    unsigned int getGenerationCount();
@@ -72 +72 @@
-    void printAvcUnitInfo( int iNodeId );
-    void printRomDirectory( int iNodeId,  rom1394_directory* pRomDir );
+
+    void avDeviceTests( octlet_t oGuid, int iPort, int iNodeId );
- private:
-    Ieee1394Service();
@@ -79 +81 @@
-    raw1394handle_t m_handle;
-    raw1394handle_t m_rhHandle;
-
+                  // XXX dw: port in 1394 service makes no sense
-    bool m_bInitialised;
-    pthread_t m_thread;