Changeset 1348 for trunk/libffado/src/libieee1394

Timestamp:

09/24/08 09:45:50 (12 years ago)

Author:

ppalmers

Message:

merge 2.0 branch changes to trunk. svn merge -r 1337:HEAD svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0

Files:

• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/CycleTimerHelper.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (4 diffs)

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -654 +654 @@
-}
-
+uint64_t
+CycleTimerHelper::getSystemTimeForCycleTimerTicks(uint32_t ticks)
+{
+    uint64_t retval;
+    struct compute_vars *my_vars;
+
+    // get pointer and copy the contents
+    // no locking should be needed since we have more than one
+    // of these vars available, and our use will always be finished before
+    // m_current_shadow_idx changes since this thread's priority should
+    // be higher than the one of the writer thread. Even if not, we only have to ensure
+    // that the used dataset is consistent. We can use an older dataset if it's consistent
+    // since it will also provide a fairly decent extrapolation.
+    my_vars = m_shadow_vars + m_current_shadow_idx;
+
+    // the number of ticks the request is ahead of the current CTR position
+    int64_t ticks_diff = diffTicks(ticks, my_vars->ticks);
+    // to how much time does this correspond?
+    double x_step_in_usec = ((double)ticks_diff) / my_vars->rate;
+    int64_t x_step_in_usec_int = (int64_t)x_step_in_usec;
+    retval = my_vars->usecs + x_step_in_usec_int;
+
+    return retval;
+}
+
+uint64_t
+CycleTimerHelper::getSystemTimeForCycleTimer(uint32_t ctr)
+{
+    uint32_t ticks = CYCLE_TIMER_TO_TICKS(ctr);
+    return getSystemTimeForCycleTimerTicks(ticks);
+}
+
-#else
-
@@ -685 +717 @@
-CycleTimerHelper::getCycleTimerTicks(uint64_t now)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -701 +743 @@
-CycleTimerHelper::getCycleTimer(uint64_t now)
-{
+    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks(now));
+}
+
+uint64_t
+CycleTimerHelper::getSystemTimeForCycleTimerTicks(uint32_t ticks)
+{
-    debugWarning("not implemented!\n");
-
+
+
+
+
+
+
+
+
-}
-

trunk/libffado/src/libieee1394/CycleTimerHelper.h

@@ -98 +98 @@
-    uint32_t getCycleTimer(uint64_t now);
-
+    /**
+     * @brief get the system time for a specific cycle timer value (in ticks)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimerTicks(uint32_t ticks);
+
+    /**
+     * @brief get the system time for a specific cycle timer value (in CTR format)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimer(uint32_t ctr);
+
-    float getRate();
-    float getNominalRate();

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -401 +401 @@
-}
-
+uint64_t
+Ieee1394Service::getSystemTimeForCycleTimerTicks(uint32_t ticks) {
+    return m_pCTRHelper->getSystemTimeForCycleTimerTicks(ticks);
+}
+
+uint64_t
+Ieee1394Service::getSystemTimeForCycleTimer(uint32_t ctr) {
+    return m_pCTRHelper->getSystemTimeForCycleTimer(ctr);
+}
+
-bool
-Ieee1394Service::readCycleTimerReg(uint32_t *cycle_timer, uint64_t *local_time)

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -134 +134 @@
-     */
-    uint32_t getCycleTimer(uint64_t t);
+
+    /**
+     * @brief get the system time for a specific cycle timer value (in ticks)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimerTicks(uint32_t ticks);
+
+    /**
+     * @brief get the system time for a specific cycle timer value (in CTR format)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimer(uint32_t ctr);
-
-    /**

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -475 +475 @@
-    // leave the offset field (for now?)
-
-
+Extreme
-                "received packet: length=%d, channel=%d, cycle=%d, at %08X\n",
-                length, channel, cycle, pkt_ctr);
@@ -566 +566 @@
-        m_last_packet_handled_at = pkt_ctr;
-    }
-
+Extreme
-                "sending packet: length=%d, cycle=%d, at %08X\n",
-                *length, cycle, pkt_ctr);
@@ -670 +670 @@
-    dumpInfo();
-    if (getType() == eHT_Receive) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-        return true;

trunk/libffado/src/libieee1394/IsoHandler.h

@@ -119 +119 @@
-    unsigned int getMaxPacketSize() { return m_max_packet_size;};
-    unsigned int getNbBuffers() { return m_buf_packets;};
-PacketLatency
+IrqInterval
-
-    unsigned int getPreBuffers() {return m_prebuffers;};

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -353 +353 @@
-        #ifdef DEBUG
-        if(m_poll_fds_shadow[i].revents) {
-(DEBUG_LEVEL_ULTRA
+Extreme(DEBUG_LEVEL
-                        "(%p, %s) received events: %08X for (%d/%d, %p, %s)\n",
-                        this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"),
@@ -761 +761 @@
-        // setup the optimal parameters for the raw1394 ISO buffering
-        unsigned int packets_per_period = stream->getPacketsPerPeriod();
-;
- - 2; // for one reason or another this is necessary
+ + 8; // bufferfill takes another 8 bytes for headers
+;
-
-        // Ensure we don't request a packet size bigger than the
-        // kernel-enforced maximum which is currently 1 page.
+        // NOTE: PP: this is not really true AFAICT
-        if (max_packet_size > page_size) {
-            debugError("max packet size (%u) > page size (%u)\n", max_packet_size, page_size);
@@ -771 +772 @@
-        }
-
-
+
+
-        if(irq_interval <= 0) irq_interval=1;
-
+
-        // the receive buffer size doesn't matter for the latency,
-        // but it has a minimal value in order for libraw to operate correctly (300)
@@ -977 +979 @@
-    {
-        if((*it)->isStreamRegistered(stream)) {
-PacketLatency
+IrqInterval
-        }
-    }