Changeset 40 for trunk/freebob

Timestamp:

12/05/04 07:09:21 (19 years ago)

Author:

pieterpalmers

Message:

Added:
- Information retrieval functions for several infoblocks
- Status printing functions for several infoblocks
- debugPrintShort to print debug comments without leading context info
- optional ANSI colored output of debug commands (see debugmodule.h)
- optional colored HTML output of debug commands for e.g. printouts (see debugmodule.h)
- AvDeviceSubunit?->Reserve() / unReserve() / isReserved()
- AvDevice::[set|get][Input|Output]PlugSignalFormat? functions (incomplete)
- added preliminary detection of internal connections

Changed:
- removed a lot of obsolete test code from ieee1394service.cpp
- added some other test code to ieee1394service.cpp

Bugfixes:
- Corrected bug in AvClusterInfoBlock?. This originated from an error in the spec.

Files:

• trunk/freebob/src/avclusterinfoblock.cpp (modified) (2 diffs)
• trunk/freebob/src/avclusterinfoblock.h (modified) (1 diff)
• trunk/freebob/src/avdescriptor.cpp (modified) (4 diffs)
• trunk/freebob/src/avdevice.cpp (modified) (5 diffs)
• trunk/freebob/src/avdevice.h (modified) (1 diff)
• trunk/freebob/src/avdevicemusicsubunit.cpp (modified) (2 diffs)
• trunk/freebob/src/avdevicemusicsubunit.h (modified) (1 diff)
• trunk/freebob/src/avdevicesubunit.cpp (modified) (2 diffs)
• trunk/freebob/src/avdevicesubunit.h (modified) (1 diff)
• trunk/freebob/src/avmusicidentifierdescriptor.cpp (modified) (1 diff)
• trunk/freebob/src/avmusicpluginfoblock.cpp (modified) (1 diff)
• trunk/freebob/src/avmusicstatusdescriptor.cpp (modified) (2 diffs)
• trunk/freebob/src/avmusicstatusdescriptor.h (modified) (2 diffs)
• trunk/freebob/src/avpluginfoblock.cpp (modified) (1 diff)
• trunk/freebob/src/avpluginfoblock.h (modified) (1 diff)
• trunk/freebob/src/avroutingstatusinfoblock.cpp (modified) (6 diffs)
• trunk/freebob/src/avroutingstatusinfoblock.h (modified) (1 diff)
• trunk/freebob/src/debugmodule.h (modified) (1 diff)
• trunk/freebob/src/ieee1394service.cpp (modified) (2 diffs)

trunk/freebob/src/avclusterinfoblock.cpp

@@ -48 +48 @@
-
-        for(unsigned int i=0;i<nb_signals;i++) {
-A
-A
-A
+9
+9
+9
-                debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvClusterInfoBlock:   Signal %d: plug_info=0x%04X, stream_position=0x%02X, stream_location=0x%02X\n",i,plug_info,stream_position,stream_location);
-                
@@ -80 +80 @@
-}
-
+void AvClusterInfoBlock::printSignalInfo(unsigned char idx) {
+        if (idx<getNbSignals() && (0x09+idx*4<getLength())) {
+                unsigned int plug_info=readWord(0x09+idx*4);
+                unsigned char stream_position=readByte(0x09+idx*4+2);
+                unsigned char stream_location=readByte(0x09+idx*4+3);
+                debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvClusterInfoBlock:   Signal %d: plug_info=0x%04X, stream_position=0x%02X, stream_location=0x%02X\n",idx,plug_info,stream_position,stream_location);
+        } else {
+                debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvClusterInfoBlock:   Signal %d not present!\n",idx);
+        
+        }
+}
+
+void AvClusterInfoBlock::printName() {
+        unsigned int next_block_position=iBaseAddress+0x06+readWord(0x04);
+        
+        if(next_block_position<iBaseAddress+getLength()) {
+                // parse the optional name block
+                AvNameInfoBlock *tmpNameInfoBlock=new AvNameInfoBlock(cParent,next_block_position);
+                if (tmpNameInfoBlock && (tmpNameInfoBlock->isValid())) {
+                        debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvClusterInfoBlock:   Name: %s\n",tmpNameInfoBlock->getName());
+                
+                } else {
+                        debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvClusterInfoBlock:   no name block present\n");
+                }
+                if(tmpNameInfoBlock) {
+                        delete tmpNameInfoBlock;
+                        tmpNameInfoBlock=NULL;
+                }
+        }
+
+}

trunk/freebob/src/avclusterinfoblock.h

@@ -44 +44 @@
-        AvClusterInfoBlock(AvDescriptor *parent, int address); // read an infoblock from a parent starting from a specific position
-        virtual ~AvClusterInfoBlock();
+        unsigned char getStreamFormat() {return readByte(0x06);};
+        unsigned char getPortType() {return readByte(0x07);};
+        unsigned char getNbSignals() {return readByte(0x08);};
-
+        void printSignalInfo(unsigned char idx);
+        void printName();
-        
-protected:

trunk/freebob/src/avdescriptor.cpp

@@ -164 +164 @@
-        iLength=response[2] & 0xFFFF;
-        
-\n
+ 
-
-        // now get the rest of the descriptor
@@ -183 +183 @@
-        // first read
-        if(bytes_read<iLength) {
-
+Short
-                // apparently the lib modifies the request, so redefine it completely
-                request[0] = AVC1394_CTYPE_CONTROL | qTarget
@@ -208 +208 @@
-        // now do the remaining reads
-        while(bytes_read<iLength) {
-
+Short
-                // apparently the lib modifies the request, so redefine it completely
-                request[0] = AVC1394_CTYPE_CONTROL | qTarget
@@ -229 +229 @@
-                
-        }
-
+Short
-        
-        

trunk/freebob/src/avdevice.cpp

@@ -43 +43 @@
-FBReturnCodes
-AvDevice::Initialize() {
-
+
+
-
-        m_handle = raw1394_new_handle();
@@ -154 +155 @@
-                                                if(tmpAvDeviceSubunit && tmpAvDeviceSubunit->isValid()) {
-                                                        cSubUnits.push_back(tmpAvDeviceSubunit);
-
+
+
+
+
+
+
+
-
-                                                } else {
@@ -203 +210 @@
-        response = avc1394_transaction_block(m_handle, iNodeId, request, request_len, 2);
-        if (request != NULL) {
-\n
+
-                debugPrint (DEBUG_LEVEL_TRANSFERS,"  REQUEST:     ");
-                /* request is in machine byte order. this function is for intel architecure */
-                for (i=0;i<request_len;i++) {
-                        request_pos=(unsigned char *)(request+i);
-
-
-
+Short
+
+Short
-                debugPrint (DEBUG_LEVEL_TRANSFERS,"      => ");
-
+Short
-                request_pos=(unsigned char *)(request);
-
-
+Short
+Short
-        }
-        if (response != NULL) {
@@ -221 +228 @@
-                debugPrint (DEBUG_LEVEL_TRANSFERS,"  -> RESPONSE: ");
-                for (i=0;i<response_len;i++) {
-
-
-
+Short
+
+Short
-                debugPrint (DEBUG_LEVEL_TRANSFERS,"      => ");
-                switch (response[0]&0xFF000000) {
-                        case AVC1394_RESPONSE_NOT_IMPLEMENTED:
-
+Short
-                        break;
-                        case AVC1394_RESPONSE_ACCEPTED:
-
+Short
-                        break;
-                        case AVC1394_RESPONSE_REJECTED:
-
+Short
-                        break;
-                        case AVC1394_RESPONSE_IN_TRANSITION:
-
+Short
-                        break;
-                        case AVC1394_RESPONSE_IMPLEMENTED:
-
+Short
-                        break;
-                        case AVC1394_RESPONSE_CHANGED:
-
+Short
-                        break;
-                        case AVC1394_RESPONSE_INTERIM:
-
+Short
-                        break;
-                        default:
-
-
-
-
-
+Short
+
+
+Short
+Short
-        }
-        debugPrint (DEBUG_LEVEL_TRANSFERS, "------- TRANSACTION END -------\n");
@@ -258 +265 @@
-
-}
+
+FBReturnCodes AvDevice::setInputPlugSignalFormat(unsigned char plug, unsigned char fmt, quadlet_t fdf) {
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        request[0] = AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                        | AVC1394_COMMAND_INPUT_PLUG_SIGNAL_FORMAT | plug;
+        request[1] = (0x80000000) | ((fmt & 0x3F)<<24) | (fdf & 0x00FFFFFF);
+        response = avcExecuteTransaction(request, 2, 2);
+        if (response != NULL) {
+        
+        }
+
+}
+
+FBReturnCodes AvDevice::getInputPlugSignalFormat(unsigned char plug, unsigned char *fmt, quadlet_t *fdf) {
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        request[0] = AVC1394_CTYPE_STATUS | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                        | AVC1394_COMMAND_INPUT_PLUG_SIGNAL_FORMAT | plug;
+        request[1] = 0xFFFFFFFF;
+        response = avcExecuteTransaction(request, 2, 2);
+        if (response != NULL) {
+                *fmt=((response[1] >> 24) & 0x3F);
+                *fdf=response[1]& 0x00FFFFFF;
+        }
+
+}
+FBReturnCodes AvDevice::setOutputPlugSignalFormat(unsigned char plug, unsigned char fmt, quadlet_t fdf) {
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        request[0] = AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                        | AVC1394_COMMAND_OUTPUT_PLUG_SIGNAL_FORMAT | plug;
+        request[1] = (0x80000000) | ((fmt & 0x3F)<<24) | (fdf & 0x00FFFFFF);
+        response = avcExecuteTransaction(request, 2, 2);
+        if (response != NULL) {
+        
+        }
+
+}
+
+FBReturnCodes AvDevice::getOutputPlugSignalFormat(unsigned char plug, unsigned char *fmt, quadlet_t *fdf) {
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        request[0] = AVC1394_CTYPE_STATUS | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                        | AVC1394_COMMAND_OUTPUT_PLUG_SIGNAL_FORMAT | plug;
+        request[1] = 0xFFFFFFFF;
+        response = avcExecuteTransaction(request, 2, 2);
+        if (response != NULL) {
+                *fmt=((response[1] >> 24) & 0x3F);
+                *fdf=response[1]& 0x00FFFFFF;
+        }
+
+}
+
+AvDeviceSubunit *AvDevice::getSubunit(unsigned char type, unsigned char id) {
+        vector<AvDeviceSubunit *>::iterator it;
+        for( it = cSubUnits.begin(); it != cSubUnits.end(); it++ ) {
+                if ((*it) && ((*it)->getType()==type) && ((*it)->getId()==id)) {
+                        return *it;
+                }
+        }
+        return NULL;
+
+}
+
+#define AVC1394_COMMAND_SIGNAL_SOURCE 0x00001A00
+
+void AvDevice::printConnections() {
+        quadlet_t request[6];
+        quadlet_t *response;
+                        //setDebugLevel(DEBUG_LEVEL_ALL);
+                        
+        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice: ISO source connections:\n");  
+
+        for (unsigned int i=0;i<getNbIsoSourcePlugs();i++) {
+                request[0] = AVC1394_CTYPE_STATUS | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                                | 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);
+                        // find the subunit this plug is connected to 
+                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
+                        if(tmpSubunit) {
+                                tmpSubunit->printSourcePlugConnections(source_plug);
+                        }
+                        
+                }
+        }
+        
+        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice: External source connections:\n");     
+
+        for (unsigned int i=0;i<getNbExtSourcePlugs();i++) {
+                request[0] = AVC1394_CTYPE_STATUS | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                                | 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;
+                        
+                        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice:   EXTOUT 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);     
+                        
+                        // find the subunit this plug is connected to 
+                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
+                        if(tmpSubunit) {
+                                tmpSubunit->printSourcePlugConnections(source_plug);
+                        }                       
+                }
+        }
+
+        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice: ISO sink connections:\n");    
+
+        for (unsigned int i=0;i<getNbIsoDestinationPlugs();i++) {
+                request[0] = AVC1394_CTYPE_STATUS | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                                | 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);
+                        // find the subunit this plug is connected to 
+                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
+                        if(tmpSubunit) {
+                                //tmpSubunit->printDestinationPlugConnections(source_plug);
+                        }
+                        
+                }
+        }
+        
+        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice: External sink connections:\n");       
+
+        for (unsigned int i=0;i<getNbExtDestinationPlugs();i++) {
+                request[0] = AVC1394_CTYPE_STATUS | AVC1394_SUBUNIT_TYPE_UNIT | AVC1394_SUBUNIT_ID_IGNORE
+                                                | 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;
+                        
+                        debugPrint (DEBUG_LEVEL_DEVICE,"AvDevice:   EXTOUT 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);     
+                        
+                        // find the subunit this plug is connected to 
+                        AvDeviceSubunit *tmpSubunit=getSubunit(source_subunit_type,source_subunit_id);
+                        if(tmpSubunit) {
+                                //tmpSubunit->printDestinationPlugConnections(source_plug);
+                        }                       
+                }
+        }
+        
+}

trunk/freebob/src/avdevice.h

@@ -38 +38 @@
-    quadlet_t * avcExecuteTransaction(quadlet_t *request, unsigned int request_len, unsigned int response_len);
-
-AvDevice::
+
-
-AvDevice::
+
-
+    FBReturnCodes setInputPlugSignalFormat(unsigned char plug, unsigned char fmt, quadlet_t fdf);
+    FBReturnCodes getInputPlugSignalFormat(unsigned char plug, unsigned char *fmt, quadlet_t *fdf);  
+    FBReturnCodes setOutputPlugSignalFormat(unsigned char plug, unsigned char fmt, quadlet_t fdf);
+    FBReturnCodes getOutputPlugSignalFormat(unsigned char plug, unsigned char *fmt, quadlet_t *fdf);  
+    
+//      getSourcePlugConnection();
+        void printConnections();
+            
+        unsigned char getNbAsyncSourcePlugs() { return iNbAsyncSourcePlugs; } ;
+    unsigned char getNbAsyncDestinationPlugs() { return iNbAsyncDestinationPlugs; } ;
+    unsigned char getNbIsoSourcePlugs() { return iNbIsoSourcePlugs; } ; // oPCR
+    unsigned char getNbIsoDestinationPlugs() { return iNbIsoDestinationPlugs; } ; // iPCR
+    unsigned char getNbExtSourcePlugs() { return iNbExtSourcePlugs; } ;
+    unsigned char getNbExtDestinationPlugs() { return iNbExtDestinationPlugs; } ;
+    
+    int getNodeId() { return iNodeId; } ;
+
+ protected:
+        AvDeviceSubunit *getSubunit(unsigned char type, unsigned char id);
+ 
- private:
-        int iNodeId;

trunk/freebob/src/avdevicemusicsubunit.cpp

@@ -27 +27 @@
-#include "avmusicstatusdescriptor.h"
-#include "avmusicidentifierdescriptor.h"
+#include "avpluginfoblock.h"
+#include "avclusterinfoblock.h"
-
-#define CORRECT_INTEGER_ENDIANNESS(value) (((((value)>>8) & 0xFF)) | ((((value)) & 0xFF)<<8))
@@ -156 +158 @@
-}
-
+void AvDeviceMusicSubunit::printSourcePlugConnections(unsigned char plug) {
+        if(cStatusDescriptor) {
+                AvPlugInfoBlock *plugInfo=cStatusDescriptor->getSourcePlugInfoBlock(plug);
+                
+                if(plugInfo) {
+                        plugInfo->printConnections();
+                } else {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceMusicSubunit: could not find source plug 0x%02X in the descriptor.\n",plug);
+                }
+                
+                        
+        } else {
+                debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceMusicSubunit: no Status Descriptor present!\n");
+        }
+        
+}
+
+
-
-AvDeviceMusicSubunit::AvDeviceMusicSubunit(AvDevice *parent, unsigned char  id) : AvDeviceSubunit(parent,0x0C,id)

trunk/freebob/src/avdevicemusicsubunit.h

@@ -40 +40 @@
-    void printMusicPlugInfo();
-    void printMusicPlugConfigurations();
+        
+        virtual void printSourcePlugConnections(unsigned char plug);
+        
+ protected:
+        
-    
- private:

trunk/freebob/src/avdevicesubunit.cpp

@@ -74 +74 @@
-}
-
+void AvDeviceSubunit::printSourcePlugConnections(unsigned char plug) {
+                        debugPrint(DEBUG_LEVEL_SUBUNIT," No internal connection information available.\n");
+        
+}
+
+
-AvDeviceSubunit::AvDeviceSubunit(AvDevice *parent, unsigned char target, unsigned char  id)
-{
@@ -128 +134 @@
-        return iNbSourcePlugs;
-}
+
+int AvDeviceSubunit::reserve(unsigned char priority) {
+        unsigned char byte;
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        if (!cParent) {
+                debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: parent == NULL!\n");
+                bValid=false;
+                return -1;
+        }
+
+        request[0] = AVC1394_CTYPE_CONTROL | ((iTarget & 0x1F) << 19) | ((iId & 0x07) << 16)
+                                        | AVC1394_COMMAND_RESERVE | priority;
+        request[1] = 0xFFFFFFFF;
+        request[2] = 0xFFFFFFFF;
+        request[3] = 0xFFFFFFFF;
+        response = cParent->avcExecuteTransaction(request, 4, 4);
+        if (response != NULL) {
+                if((AVC1394_MASK_RESPONSE(response[0]) == AVC1394_RESPONSE_ACCEPTED) || (AVC1394_MASK_RESPONSE(response[0]) == AVC1394_RESPONSE_IMPLEMENTED))  {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: subunit reserve successfull.\n");
+                        return priority;
+                } else {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: subunit reserve not successfull.\n");
+                        return -1;
+                }
+        }
+
+}
+ 
+int AvDeviceSubunit::isReserved() {
+        unsigned char byte;
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        if (!cParent) {
+                debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: parent == NULL!\n");
+                bValid=false;
+                return -1; // the device isn't usable, not due to reservation, but anyway...
+        }
+
+        request[0] = AVC1394_CTYPE_STATUS | ((iTarget & 0x1F) << 19) | ((iId & 0x07) << 16)
+                                        | AVC1394_COMMAND_RESERVE | 0xFF;
+        request[1] = 0xFFFFFFFF;
+        request[2] = 0xFFFFFFFF;
+        request[3] = 0xFFFFFFFF;
+        response = cParent->avcExecuteTransaction(request, 4, 4);
+        if (response != NULL) {
+                if((AVC1394_MASK_RESPONSE(response[0]) == AVC1394_RESPONSE_ACCEPTED) || (AVC1394_MASK_RESPONSE(response[0]) == AVC1394_RESPONSE_IMPLEMENTED))  {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: subunit reserve check successfull.\n");
+                        return (response[0]&0x000000FF);
+                } else {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: subunit reserve check not successfull.\n");
+                        
+                        return -1;
+                }
+        }
+
+}
+
+int AvDeviceSubunit::unReserve() {
+        unsigned char byte;
+        quadlet_t request[6];
+        quadlet_t *response;
+
+        if (!cParent) {
+                debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: parent == NULL!\n");
+                bValid=false;
+                return -1;
+        }
+
+        request[0] = AVC1394_CTYPE_CONTROL | ((iTarget & 0x1F) << 19) | ((iId & 0x07) << 16)
+                                        | AVC1394_COMMAND_RESERVE | 0x00;
+        request[1] = 0xFFFFFFFF;
+        request[2] = 0xFFFFFFFF;
+        request[3] = 0xFFFFFFFF;
+        response = cParent->avcExecuteTransaction(request, 4, 4);
+        if (response != NULL) {
+                if((AVC1394_MASK_RESPONSE(response[0]) == AVC1394_RESPONSE_ACCEPTED) || (AVC1394_MASK_RESPONSE(response[0]) == AVC1394_RESPONSE_IMPLEMENTED))  {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: subunit unreserve successfull.\n");
+                        return 0;
+                } else {
+                        debugPrint (DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: subunit unreserve not successfull.\n");
+                        return -1;
+                }
+        }
+
+}
+ 
+
+

trunk/freebob/src/avdevicesubunit.h

@@ -33 +33 @@
-    unsigned char getNbSourcePlugs();
-
+    int reserve(unsigned char priority);
+    int unReserve();
+    int isReserved();
+    
+        unsigned char getType() {return iTarget;} ;
+        unsigned char getId() {return iId;} ;
+        
-    virtual void test();
-
+irtual v
-    
+        virtual void printSourcePlugConnections(unsigned char plug);
+        
- protected:
-        bool bValid;    

trunk/freebob/src/avmusicidentifierdescriptor.cpp

@@ -75 +75 @@
-        debugPrint(DEBUG_LEVEL_DESCRIPTOR,"\t   -> capabilities: ");
-        if ((capability_attributes & AVC1394_SUBUNIT_MUSIC_CAPABILITY_GENERAL)) {
-
+Short
-        }
-        if ((capability_attributes & AVC1394_SUBUNIT_MUSIC_CAPABILITY_AUDIO)) {
-
+Short
-        }
-        if ((capability_attributes & AVC1394_SUBUNIT_MUSIC_CAPABILITY_MIDI)) {
-
+Short
-        }
-        if ((capability_attributes & AVC1394_SUBUNIT_MUSIC_CAPABILITY_SMPTE)) {
-
+Short
-        }
-        if ((capability_attributes & AVC1394_SUBUNIT_MUSIC_CAPABILITY_SAMPLECOUNT)) {
-
+Short
-        }
-        if ((capability_attributes & AVC1394_SUBUNIT_MUSIC_CAPABILITY_AUDIOSYNC)) {
-
+Short
-        }
-
+Short
-        
-        // start parsing the optional capability stuff

trunk/freebob/src/avmusicpluginfoblock.cpp

@@ -54 +54 @@
-
-        debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvMusicPlugInfoBlock: Creating... length=0x%04X\n",getLength());
-2
+4
-        debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvMusicPlugInfoBlock:   Plug type=0x%02X\n",plug_type);
-        debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvMusicPlugInfoBlock:   routing support=0x%02X\n",routing_support);

trunk/freebob/src/avmusicstatusdescriptor.cpp

@@ -32 +32 @@
-#include "avoutputplugstatusinfoblock.h"
-#include "avroutingstatusinfoblock.h"
+#include "avpluginfoblock.h"
-
-AvMusicStatusDescriptor::AvMusicStatusDescriptor(AvDevice *parent, unsigned char id) : AvDescriptor(parent, AVC1394_SUBUNIT_TYPE_MUSIC | (id << 16),0x80) {
@@ -121 +122 @@
-
-}
+        
+AvPlugInfoBlock *AvMusicStatusDescriptor::getSourcePlugInfoBlock(unsigned char plug) {
+        if (cRoutingStatusInfoBlock) {
+                return cRoutingStatusInfoBlock->getSourcePlugInfoBlock(plug);
+        } else return NULL;
+}
+
+AvPlugInfoBlock *AvMusicStatusDescriptor::getDestinationPlugInfoBlock(unsigned char plug) {
+        if (cRoutingStatusInfoBlock) {
+                return cRoutingStatusInfoBlock->getDestinationPlugInfoBlock(plug);
+        } else return NULL;
+
+}
-
-AvMusicStatusDescriptor::~AvMusicStatusDescriptor()  {

trunk/freebob/src/avmusicstatusdescriptor.h

@@ -34 +34 @@
-class AvOutputPlugStatusInfoBlock;
-class AvRoutingStatusInfoBlock;
+class AvPlugInfoBlock;
-
-class AvMusicStatusDescriptor : public AvDescriptor {
@@ -42 +43 @@
-    void printCapabilities();
-
+        AvPlugInfoBlock *getSourcePlugInfoBlock(unsigned char plug);
+        AvPlugInfoBlock *getDestinationPlugInfoBlock(unsigned char plug);
+        
- protected:
-       AvGeneralMusicInfoBlock          *cGeneralMusicInfoBlock;

trunk/freebob/src/avpluginfoblock.cpp

@@ -113 +113 @@
-
-}
+        
+AvClusterInfoBlock *AvPlugInfoBlock::getCluster(unsigned int idx) {
+        if ((idx < getNbClusters()) && (idx < cClusterInfoBlocks.size())) {
+                return cClusterInfoBlocks.at(idx);
+        } else return NULL;
+}
-
+void AvPlugInfoBlock::printConnections() {
+        for (unsigned int i=0; i<getNbClusters();i++) {
+                AvClusterInfoBlock *tmpCluster=getCluster(i);
+                if (tmpCluster) {
+                        tmpCluster->printName();
+                }
+        }
+}

trunk/freebob/src/avpluginfoblock.h

@@ -47 +47 @@
-        virtual ~AvPlugInfoBlock();
-
+        unsigned char getPlugId() { return readByte(0x06); };
+        unsigned int getSignalFormat() { return readWord(0x07); };
+        unsigned char getPlugType() { return readByte(0x09); };
+        unsigned int getNbClusters() { return readWord(0x0A); };
+        unsigned int getNbChannels() { return readWord(0x0C); };
+        
+        AvClusterInfoBlock *getCluster(unsigned int idx);
+        
+        void printConnections();
-        
-protected:

trunk/freebob/src/avroutingstatusinfoblock.cpp

@@ -40 +40 @@
-
-        unsigned int next_block_position=address+0x0A;
-source_plugs=readByte(
-dest_plugs=readByte(
-
+dest_plugs=readByte(0x0
+source_plugs=readByte(0x0
+0x0
-        AvPlugInfoBlock *tmpAvPlugInfoBlock=NULL;
-        AvMusicPlugInfoBlock *tmpAvMusicPlugInfoBlock=NULL;
@@ -51 +51 @@
-        debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvRoutingStatusInfoBlock:   Number of music plugs=%d\n",nb_music_plugs);
-
-
-
-
-
+
+
+
-                        tmpAvPlugInfoBlock=new AvPlugInfoBlock(parent, next_block_position);
-                        
@@ -62 +61 @@
-                                
-                                // add to child list
-Source
+Destination
-                                
-                                //tmpAvPlugInfoBlock->printContents();
@@ -78 +77 @@
-                }
-        }
-
-dest
-dest
-destination
+
+source
+source
+source
-                        tmpAvPlugInfoBlock=new AvPlugInfoBlock(parent, next_block_position);
-                        
@@ -89 +88 @@
-                                
-                                // add to child list
-Destination
+Source
-                                
-                                //tmpAvPlugInfoBlock->printContents();
@@ -153 +152 @@
-}
-
+AvPlugInfoBlock * AvRoutingStatusInfoBlock::getSourcePlugInfoBlock(unsigned char plug) {
+        vector<AvPlugInfoBlock *>::iterator it;
+        for( it = cSourcePlugInfoBlocks.begin(); it != cSourcePlugInfoBlocks.end(); it++ ) {
+                if((*it) && ((*it)->getPlugId() == plug)) {
+                        return *it;
+                }
+        }
+        return NULL;
+
+}
+
+AvPlugInfoBlock * AvRoutingStatusInfoBlock::getDestinationPlugInfoBlock(unsigned char plug) {
+        vector<AvPlugInfoBlock *>::iterator it;
+        for( it = cDestinationPlugInfoBlocks.begin(); it != cDestinationPlugInfoBlocks.end(); it++ ) {
+                if((*it) && ((*it)->getPlugId() == plug)) {
+                        return *it;
+                }
+        }
+        return NULL;
+
+}

trunk/freebob/src/avroutingstatusinfoblock.h

@@ -43 +43 @@
-        virtual ~AvRoutingStatusInfoBlock();
-
+        unsigned char getNbDestinationPlugs() {return readByte(0x06);};
+        unsigned char getNbSourcePlugs() {return readByte(0x07);};
+        unsigned int getNbMusicPlugs() {return readWord(0x08);};
+        
+        AvPlugInfoBlock *getSourcePlugInfoBlock(unsigned char plug);
+        AvPlugInfoBlock *getDestinationPlugInfoBlock(unsigned char plug);
-        
-protected:

trunk/freebob/src/debugmodule.h

@@ -25 +25 @@
-#include "ieee1394service.h"
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-#define DEBUG_LEVEL_MODERATE (DEBUG_LEVEL_INFO | DEBUG_LEVEL_DEVICE | DEBUG_LEVEL_SUBUNIT)
-#define DEBUG_LEVEL_HIGH     (DEBUG_LEVEL_MODERATE | DEBUG_LEVEL_DESCRIPTOR | DEBUG_LEVEL_INFOBLOCK)
-
-
-
-
+
+
+
+
+
+
-
-#ifdef DEBUG
-
-
-
+
+
+
+
+
-
+                #define debugError(format, args...) fprintf( stderr, "\033[37m\033[41m" "ERROR: %s %s %d: " format "\033[0m\033[49m ",  __FILE__, __FUNCTION__, __LINE__, ##args )
+                        
+                #define debugPrint(Level, format, args...) if(DEBUG_LEVEL & Level) printf("\033[37m" "DEBUG %s %s %d:" "%s " format "\033[0m", __FILE__, __FUNCTION__, __LINE__, getLevelColor(Level), ##args );
+                #define debugPrintShort(Level, format, args...) if(DEBUG_LEVEL & Level) printf("%s" format "\033[0m",getLevelColor(Level), ##args );
+
+                inline char *getLevelColor(unsigned int Level) {
+                        switch(Level) {
+                                case DEBUG_LEVEL_INFO:
+                                        return "\033[31m";
+                                break;
+                                case DEBUG_LEVEL_DEVICE:
+                                        return "\033[32m";
+                                break;
+                                case DEBUG_LEVEL_SUBUNIT:
+                                        return "\033[33m";
+                                break;
+                                case DEBUG_LEVEL_DESCRIPTOR:
+                                        return "\033[34m"; // blue
+                                break;
+                                case DEBUG_LEVEL_INFOBLOCK: // purple
+                                        return "\033[35m";
+                                break;
+                                case DEBUG_LEVEL_TRANSFERS:
+                                        return "\033[36m";
+                                break;
+                                default:
+                                        return "\033[0m";
+                                break;
+                                                
+                        }
+                }
+
+        #endif
+        
+        #ifdef DEBUG_OUTPUT_HTML
+                #define debugError(format, args...) fprintf( stdout, "<P style='background: red;'><FONT color='white'>" "ERROR: %s %s %d: " format "</FONT></P>",  __FILE__, __FUNCTION__, __LINE__, ##args )
+                #define debugPrint(Level, format, args...) if(DEBUG_LEVEL & Level) printf("<FONT color='darkGray'>" "DEBUG %s %s %d:" "%s " format "</FONT></FONT>", __FILE__, __FUNCTION__, __LINE__, getLevelColor(Level), ##args );
+                #define debugPrintShort(Level, format, args...) if(DEBUG_LEVEL & Level) printf("%s" format "</FONT>",getLevelColor(Level), ##args );
+                inline char *getLevelColor(unsigned int Level) {
+                        switch(Level) {
+                                case DEBUG_LEVEL_INFO:
+                                        return "<FONT color='darkRed'>";
+                                break;
+                                case DEBUG_LEVEL_DEVICE:
+                                        return "<FONT color='darkGreen'>";
+                                break;
+                                case DEBUG_LEVEL_SUBUNIT:
+                                        return "<FONT color='darkYellow'>";
+                                break;
+                                case DEBUG_LEVEL_DESCRIPTOR:
+                                        return "<FONT color='darkBlue'>"; // blue
+                                break;
+                                case DEBUG_LEVEL_INFOBLOCK: // purple
+                                        return "<FONT color='darkMagenta'>";
+                                break;
+                                case DEBUG_LEVEL_TRANSFERS:
+                                        return "<FONT color='darkCyan'>";
+                                break;
+                                default:
+                                        return "<FONT color='black'>";
+                                break;
+                                                
+                        }
+                }
+        #endif  
+        
+        #ifdef DEBUG_OUTPUT_STANDARD
+                #define debugError(format, args...) fprintf( stderr, "ERROR: %s %s %d: " format,  __FILE__, __FUNCTION__, __LINE__, ##args )
+                #define debugPrint(Level, format, args...) if(DEBUG_LEVEL & Level) printf("DEBUG %s %s %d :"  format, __FILE__, __FUNCTION__, __LINE__, ##args );
+                #define debugPrintShort(Level, format, args...) if(DEBUG_LEVEL & Level) printf(format, ##args );
+        #endif
+        
-#else
+        #define DEBUG_LEVEL
+        #define setDebugLevel(x)
-        #define debugError(format, args...) 
-        #define debugPrint(Level, format, args...) 

trunk/freebob/src/ieee1394service.cpp

@@ -22 +22 @@
-#include <libavc1394/avc1394.h>
-#include <libavc1394/avc1394_vcr.h>
+#include <libiec61883/iec61883.h>
+
+
-#include "ieee1394service.h"
-#include "debugmodule.h"
@@ -161 +164 @@
-                test->Initialize();
-                if (test->isInitialised()) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                delete test;
-