Changeset 429

Timestamp:

03/05/07 21:45:11 (17 years ago)

Author:

jwoithe

Message:

Fix Ieee1394Service::freeIsoChannel() so it actually deallocates a channel
and its bandwidth. In short, unregisterIsoChannel() returns false on error
and (most importantly) one can't call unregisterIsoChannel() before
raw1394_bandwidth_modify() and raw1394_channel_modify() because it wipes the
very information one needs for these calls to succeed.

Files:

• branches/streaming-rework/src/libieee1394/ieee1394service.cpp (modified) (1 diff)

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

@@ -702 +702 @@
-        case AllocGeneric:
-            debugOutput(DEBUG_LEVEL_VERBOSE, " allocated using generic routine...\n" );
-
+
+
+
+
+
+
+
+
+
-                return false;
-
-
-
-
-
-
-
-
-
-
-
+
-            
-        case AllocCMP:
-            debugOutput(DEBUG_LEVEL_VERBOSE, " allocated using IEC61883 CMP...\n" );
-
+
+
+
+
+
+
+
+
+
+
+
+
-                return false;
-            } else {
-                debugOutput(DEBUG_LEVEL_VERBOSE, " performing IEC61883 CMP disconnect...\n" );
-                if(iec61883_cmp_disconnect(
-                        m_handle, 
-                        m_channels[c].xmit_node | 0xffc0,
-                        m_channels[c].xmit_plug,
-                        m_channels[c].recv_node | 0xffc0,
-                        m_channels[c].recv_plug,
-                        m_channels[c].channel,
-                        m_channels[c].bandwidth) != 0) {
-                    debugWarning("Could not do CMP disconnect for channel %d!\n",c);
-                }
-            }
-            return true;
-    }