Changeset 1660 for trunk

Timestamp:

09/07/09 04:41:57 (14 years ago)

Author:

jwoithe

Message:

ieee1394Service: new method allocateFixedIsoChannelGeneric() to allocate a specific channel number instead of scanning for the next available channel number. This functionality is needed for the RME devices.
RME: assign/detect iso channels to use and allocate required bandwidth.

Files:

• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (1 diff)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (4 diffs)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (1 diff)

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -1302 +1302 @@
-
-/**
+ * Allocates a specific fixed iso channel for use by the interface.  Returns 
+ * -1 on error (due to the requested channel not being free) or the fixed iso
+ * channel number.
+ *
+ * Does not perform anything other than registering the channel and the
+ * bandwidth at the IRM
+ *
+ * Also allocates the necessary bandwidth (in ISO allocation units).
+ *
+ * FIXME: As in libiec61883, channel 63 is not requested; this is either a
+ * bug or it's omitted since that's the channel preferred by video devices.
+ *
+ * @chan the channel number being requested
+ * @param bandwidth the bandwidth to allocate for this channel
+ * @return the channel number
+ */
+signed int Ieee1394Service::allocateFixedIsoChannelGeneric(
+    unsigned int chan, unsigned int bandwidth
+    ) {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Allocating ISO channel %d using generic method...\n", chan );
+
+    Util::MutexLockHelper lock(*m_handle_lock);
+    struct ChannelInfo cinfo;
+
+    if (raw1394_channel_modify (m_handle, chan, RAW1394_MODIFY_ALLOC) == 0) {
+        if (raw1394_bandwidth_modify(m_handle, bandwidth, RAW1394_MODIFY_ALLOC) < 0) {
+            debugFatal("Could not allocate bandwidth of %d\n", bandwidth);
+
+            raw1394_channel_modify (m_handle, chan, RAW1394_MODIFY_FREE);
+            return -1;
+        } else {
+            cinfo.channel=chan;
+            cinfo.bandwidth=bandwidth;
+            cinfo.alloctype=AllocGeneric;
+
+            cinfo.xmit_node=-1;
+            cinfo.xmit_plug=-1;
+            cinfo.recv_node=-1;
+            cinfo.recv_plug=-1;
+
+            if (registerIsoChannel(chan, cinfo)) {
+                return chan;
+            } else {
+                raw1394_bandwidth_modify(m_handle, bandwidth, RAW1394_MODIFY_FREE);
+                raw1394_channel_modify (m_handle, chan, RAW1394_MODIFY_FREE);
+                return -1;
+            }
+        }
+    }
+    return -1;
+}
+
+/**
- * Allocates an iso channel for use by the interface in a similar way to
- * libiec61883.  Returns -1 on error (due to there being no free channels)

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -360 +360 @@
-    signed int getAvailableBandwidth();
-    signed int allocateIsoChannelGeneric(unsigned int bandwidth);
+    signed int allocateFixedIsoChannelGeneric(
+        unsigned int chan, unsigned int bandwidth);
-    signed int allocateIsoChannelCMP(nodeid_t xmit_node, int xmit_plug,
-                                     nodeid_t recv_node, int recv_plug);

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -85 +85 @@
-    , frames_per_packet( 0 )
-    , speed800( 0 )
+    , iso_tx_channel( -1 )
+    , iso_rx_channel( -1 )
-    , m_MixerContainer( NULL )
-    , m_ControlContainer( NULL )
@@ -94 +96 @@
-Device::~Device()
-{
+    if (iso_tx_channel>=0 && !get1394Service().freeIsoChannel(iso_tx_channel)) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Could not free tx iso channel %d\n", iso_tx_channel);
+    }
+    if (iso_rx_channel>=0 && !get1394Service().freeIsoChannel(iso_rx_channel)) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Could not free rx iso channel %d\n", iso_rx_channel);
+    }
+
-    destroyMixer();
-
@@ -506 +515 @@
-Device::prepare() {
-
-
+, bandwidth
-
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing Device...\n" );
@@ -537 +546 @@
-        num_channels += (mult==4?0:(mult==2?4:8));
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return true;

trunk/libffado/src/rme/rme_avdevice.h

@@ -126 +126 @@
-    signed int speed800;
-
+    signed int iso_tx_channel, iso_rx_channel;
+
-private:
-    unsigned long long int cmd_buffer_addr();