Changeset 35

Timestamp:

11/28/04 14:57:48 (18 years ago)

Author:

pieterpalmers

Message:

- code merge
- some more experiments

Files:

• trunk/freebob/src/avdevice.cpp (modified) (2 diffs)
• trunk/freebob/src/avdevicemusicsubunit.cpp (modified) (1 diff)
• trunk/freebob/src/avdevicesubunit.cpp (modified) (1 diff)
• trunk/freebob/src/avdevicesubunit.h (modified) (1 diff)
• trunk/freebob/src/debugmodule.h (modified) (2 diffs)

trunk/freebob/src/avdevice.cpp

@@ -132 +132 @@
-                                                        case 0x01: // audio subunit
-                                                                tmpAvDeviceSubunit=new AvDeviceAudioSubunit(this,subunit_id);
+                                                                if (tmpAvDeviceSubunit) { // test code
+                                                                        //tmpAvDeviceSubunit->printOutputPlugConnections();
+                                                                }
-                                                        break;
-                                                        case 0x0C: // music subunit
@@ -139 +142 @@
-                                                                tmpAvDeviceSubunit2.printMusicPlugInfo();
-                                                                tmpAvDeviceSubunit2.printMusicPlugConfigurations();
+                                                                tmpAvDeviceSubunit2.printOutputPlugConnections();
-                                                                tmpAvDeviceSubunit2.test();
-                                                                }

trunk/freebob/src/avdevicemusicsubunit.cpp

@@ -35 +35 @@
-        quadlet_t *response;
-        
-o
-
-Serial bus iso output plug connections
-opcr=0;opcr<0x1E;o
+i
+
+Input Select status (iso channels)
+ipcr=0;ipcr<0x1E;i
-                request[0] = AVC1394_CTYPE_STATUS | ((iTarget & 0x1F) << 19) | ((iId & 0x07) << 16)
-A
+B
-                //request[1] = ((iTarget & 0x1F) << 27) | ((iId & 0x07) << 24) | 0x00FF7F;
-
-
+
+
+
+
-                if ((response != NULL) && ((response[0]&0xFF000000)==0x0C000000)) {
-0]&0xE0) >> 5
-conv=(response[0]&0x10) >> 4
-signal_status=(response[0]&0x0
+1]&0xF0000000) >> 28
+output_plug=(response[1]&0xFF)
+input_plug=((response[2]>>24)&0xF
-                        
-signal_source=((response[1]>>16
-1]
-oPCR %d: output_status=%d,conv=%d,signal_status=%d,signal_source=0x%04X,signal_destination=0x%04X\n",opcr,output_status,conv,signal_status,signal_source
+node_id=((response[1]>>8
+2]>>8
+iPCR %d: output_status=0x%01X,node_id=%02d,output_plug=0x%02X,input_plug=0x%02X,signal_destination=0x%04X\n",ipcr,output_status,node_id,output_plug,input_plug
-                }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-void AvDeviceMusicSubunit::printMusicPlugConfigurations() {
-        unsigned char byte;

trunk/freebob/src/avdevicesubunit.cpp

@@ -30 +30 @@
-}
-
+void AvDeviceSubunit::printOutputPlugConnections() {
+        unsigned char byte;
+        quadlet_t request[6];
+        quadlet_t *response;
+        
+        unsigned char opcr=0;
+        
+        debugPrint(DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: Serial bus iso output plug connections:\n");
+        for(opcr=0;opcr<0x1E;opcr++) {  
+                request[0] = AVC1394_CTYPE_STATUS | ((iTarget & 0x1F) << 19) | ((iId & 0x07) << 16)
+                                                | (0x1A << 8) | 0xFF;
+                //request[1] = ((iTarget & 0x1F) << 27) | ((iId & 0x07) << 24) | 0x00FF7F;
+                request[1]=0xFFFEFF00 | opcr;
+                response = cParent->avcExecuteTransaction(request, 2, 4);
+                if ((response != NULL) && ((response[0]&0xFF000000)==0x0C000000)) {
+                        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 int signal_destination=((response[1])&0xFFFF);
+                        debugPrint(DEBUG_LEVEL_SUBUNIT,"  oPCR %d: output_status=%d,conv=%d,signal_status=%d,signal_source=0x%04X,signal_destination=0x%04X\n",opcr,output_status,conv,signal_status,signal_source,signal_destination);
+                }
+        }
+        debugPrint(DEBUG_LEVEL_SUBUNIT,"AvDeviceSubunit: Serial bus external output plug connections:\n");
+        for(opcr=0x80;opcr<0x9E;opcr++) {       
+                request[0] = AVC1394_CTYPE_STATUS | ((iTarget & 0x1F) << 19) | ((iId & 0x07) << 16)
+                                                | (0x1A << 8) | 0xFF;
+                //request[1] = ((iTarget & 0x1F) << 27) | ((iId & 0x07) << 24) | 0x00FF7F;
+                request[1]=0xFFFEFF00 | opcr;
+                response = cParent->avcExecuteTransaction(request, 2, 4);
+                if ((response != NULL) && ((response[0]&0xFF000000)==0x0C000000)) {
+                        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 int signal_destination=((response[1])&0xFFFF);
+                        debugPrint(DEBUG_LEVEL_SUBUNIT,"  oPCR %02X: output_status=%d,conv=%d,signal_status=%d,signal_source=0x%04X,signal_destination=0x%04X\n",opcr,output_status,conv,signal_status,signal_source,signal_destination);
+                }
+        }
+
+}
-
-AvDeviceSubunit::AvDeviceSubunit(AvDevice *parent, unsigned char target, unsigned char  id)

trunk/freebob/src/avdevicesubunit.h

@@ -34 +34 @@
-
-    virtual void test();
+    void printOutputPlugConnections();
-    
- protected:

trunk/freebob/src/debugmodule.h

@@ -37 +37 @@
-#define DEBUG_LEVEL_MODERATE (DEBUG_LEVEL_INFO | DEBUG_LEVEL_DEVICE | DEBUG_LEVEL_SUBUNIT)
-
-
+ 
-
-#define DEBUG
@@ -44 +44 @@
-        #define debugError(format, args...) fprintf( stderr, "%s %s %d: " format,  __FILE__, __FUNCTION__, __LINE__, ##args )
-//      #define debugPrint(Level, format, args...) if(DEBUG_LEVEL & Level) { int idebug=Level; while(idebug) {printf(" "); idebug=idebug>>1;} printf( format, ##args ); }
->=
+ & 
-
-#else