Changeset 754

Timestamp:

12/03/07 14:26:22 (16 years ago)

Author:

ppalmers

Message:

- simplify IsoHandler?
- fix some small issues

Files:

• trunk/libffado/SConstruct (modified) (1 diff)
• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (13 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.h (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/util/cip.c (modified) (2 diffs)

trunk/libffado/SConstruct

@@ -176 +176 @@
-        print "Doing a DEBUG build"
-        # -Werror could be added to, which would force the devs to really remove all the warnings :-)
-
+ # HACK!!
-else:
-        env.AppendUnique( CCFLAGS=["-O2","-DNDEBUG"] )

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -106 +106 @@
-bool
-CycleTimerHelper::setThreadParameters(bool rt, int priority) {
-
+switch to: 
-    if (priority > 98) priority = 98; // cap the priority
-    m_realtime = rt;
@@ -135 +135 @@
-    return rate;
-}
+
+//#define OLD_STYLE
+#ifdef OLD_STYLE
+
+bool
+CycleTimerHelper::Execute()
+{
+    usleep(m_usecs_per_update);
+    return true;
+}
+uint32_t
+CycleTimerHelper::getCycleTimerTicks()
+{
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    if(!m_Parent.readCycleTimerReg(&cycle_timer, &local_time)) {
+        debugError("Could not read cycle timer register\n");
+        return false;
+    }
+    return CYCLE_TIMER_TO_TICKS(cycle_timer);
+}
+
+uint32_t
+CycleTimerHelper::getCycleTimerTicks(uint64_t now)
+{
+    return getCycleTimerTicks();
+}
+
+#else
-
-bool
@@ -246 +275 @@
-    return retval;
-}
+#endif
-
-uint32_t

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -45 +45 @@
-#define FFADO_MAX_FIREWIRE_PORTS 16
-
-0
+1
-#define CYCLETIMER_HELPER_PRIO_INCREASE  10
-
@@ -274 +274 @@
-bool
-Ieee1394Service::setThreadParameters(bool rt, int priority) {
+    bool result = true;
-    if (priority > 98) priority = 98;
-    m_base_priority = priority;
-    m_realtime = rt;
-    if (m_pIsoManager) {
-return m_pIsoManager->setThreadParameters(rt, priority + ISOMANAGER_PRIO_INCREASE);
-} else {
-turn true
+debugOutput(DEBUG_LEVEL_VERBOSE, "Switching IsoManager to (rt=%d, prio=%d)\n",
+                                     rt, priority + ISOMANAGER_PRIO_INCREASE);
+sult &= m_pIsoManager->setThreadParameters(rt, priority + ISOMANAGER_PRIO_INCREASE)
-    }
-    if (m_pCTRHelper) {
-
-
-
-
+
+
+
+
+
-}
-
@@ -315 +317 @@
- * @return the current value of the cycle timer (as is)
- */
-
-uint32_t
-Ieee1394Service::getCycleTimer() {
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -42 +42 @@
-/* the C callbacks */
-enum raw1394_iso_disposition
-Xmit
+
-        unsigned char *data, unsigned int *length,
-        unsigned char *tag, unsigned char *sy,
-        int cycle, unsigned int dropped) {
-
-XmitHandler *xmitHandler=static_cast<IsoXmit
+Handler *xmitHandler = static_cast<Iso
-    assert(xmitHandler);
-
@@ -54 +54 @@
-
-enum raw1394_iso_disposition
-Recv
+
-                        unsigned int length, unsigned char channel,
-                        unsigned char tag, unsigned char sy, unsigned int cycle,
-                        unsigned int dropped) {
-
-RecvHandler *recvHandler=static_cast<IsoRecv
+Handler *recvHandler = static_cast<Iso
-    assert(recvHandler);
-
@@ -69 +69 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Busreset happened, generation %d...\n", generation);
-
-=
+ = 
-    assert(handler);
-    return handler->handleBusReset(generation);
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-   , m_poll_timeout( 100 )
-   , m_realtime ( false )
-   , m_priority ( 0 )
-   , m_Thread ( NULL )
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   , m_poll_timeout( 100 )
-   , m_realtime ( false )
-   , m_priority ( 0 )
-   , m_Thread ( NULL )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-}
@@ -162 +189 @@
-        return false;
-    }
-
-    if (m_poll_fd.revents & POLLERR) {
-        debugWarning("error on fd for %p\n", this);
-    }
-
-    if (m_poll_fd.revents & POLLHUP) {
-        debugWarning("hangup on fd for %p\n",this);
-    }
-
-    if(m_poll_fd.revents & (POLLIN)) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return true;
-}
@@ -180 +209 @@
-bool
-IsoHandler::setThreadParameters(bool rt, int priority) {
-
+switch to: 
-    if (priority > 98) priority = 98; // cap the priority
-    m_realtime = rt;
@@ -193 +222 @@
-    }
-    return true;
-}
-
-bool
-IsoHandler::iterate() {
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "IsoHandler (%p) iterate...\n",this);
-    if(raw1394_loop_iterate(m_handle)) {
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-                     "IsoHandler (%p): Failed to iterate handler: %s\n",
-                     this,strerror(errno));
-        return false;
-    } else {
-        return true;
-    }
-}
-
@@ -259 +275 @@
-}
-
-bool IsoHandler::prepare()
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "IsoHandler (%p) prepare...\n", this);
-    // check the state
-    if(m_State != E_Initialized) {
-        debugError("Incorrect state, expected E_Initialized, got %d\n",(int)m_State);
-        return false;
-    }
-    // Don't call until libraw1394's raw1394_new_handle() function has been
-    // fixed to correctly initialise the iso_packet_infos field.  Bug is
-    // confirmed present in libraw1394 1.2.1.
-//     raw1394_iso_shutdown(m_handle);
-    m_State = E_Prepared;
-    return true;
-}
-
-bool IsoHandler::enable(int cycle)
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-    m_poll_fd.events = POLLIN;
-    m_State = E_Running;
-    return true;
-}
-
-bool IsoHandler::disable()
-{
@@ -311 +303 @@
- */
-
-
+
+
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "bus reset...\n");
-
@@ -330 +324 @@
-
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Handler type................: %s\n",
-==E
+ == e
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Port, Channel...............: %2d, %2d\n",
-            m_manager.get1394Service().getPort(), channel);
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Buffer, MaxPacketSize, IRQ..: %4d, %4d, %4d\n",
-            m_buf_packets, m_max_packet_size, m_irq_interval);
+    if (this->getType() == eHT_Transmit) {
+        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Speed, PreBuffers...........: %2d, %2d\n",
+                                            m_speed, m_prebuffers);
+    }
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Packet count................: %10d (%5d dropped)\n",
-            this->getPacketCount(), this->getDroppedCount());
@@ -371 +369 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                    unsigned char *data, unsigned int length,
-                    unsigned char channel, unsigned char tag, unsigned char sy,
@@ -415 +388 @@
-                 length, channel, cycle );
-    m_packetcount++;
-+=
+ += 
-
-    if(m_Client) {
@@ -424 +397 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                m_buf_packets,
-                                m_max_packet_size,
-                                m_Client->getChannel(),
-RAW1394_DMA_BUFFERFILL
+m_speed
-                                m_irq_interval)) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "start on cycle %d\n", cycle);
@@ -475 +479 @@
-    if(m_State != E_Prepared) {
-        if(!prepare()) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/src/libieee1394/IsoHandler.h

@@ -49 +49 @@
-public:
-    enum EHandlerType {
-E
-E
+e
+e
-    };
-
-
-
+
+
+
+
+
+
-
+private: // the ISO callback interface
+    static enum raw1394_iso_disposition
+    iso_receive_handler(raw1394handle_t handle, unsigned char *data,
+                        unsigned int length, unsigned char channel,
+                        unsigned char tag, unsigned char sy, unsigned int cycle,
+                        unsigned int dropped);
+
+    enum raw1394_iso_disposition
+            putPacket(unsigned char *data, unsigned int length,
+                        unsigned char channel, unsigned char tag, unsigned char sy,
+                        unsigned int cycle, unsigned int dropped);
+
+    static enum raw1394_iso_disposition iso_transmit_handler(raw1394handle_t handle,
+                    unsigned char *data, unsigned int *length,
+                    unsigned char *tag, unsigned char *sy,
+                    int cycle, unsigned int dropped);
+    enum raw1394_iso_disposition
+            getPacket(unsigned char *data, unsigned int *length,
+                    unsigned char *tag, unsigned char *sy,
+                    int cycle, unsigned int dropped);
+
+public:
-    // runnable interface
-virtual 
-virtual 
+
+
-    int getFileDescriptor() { return raw1394_get_fd(m_handle);};
-    bool setThreadParameters(bool rt, int priority);
-
-virtual 
-virtual 
+
+
-
-    bool iterate();
-    void setVerboseLevel(int l);
-
-virtual 
-virtual 
-virtual 
+
+
+
-
-
+
+
-
-    bool isEnabled()
@@ -88 +114 @@
-    void resetDroppedCount() {m_dropped=0;};
-
-
+
+
-
-irtual v
+
-
-    bool inUse() {return (m_Client != 0) ;};
-virtual 
+
-
-virtual 
-virtual 
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    
-    
-    
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    // the state machine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-};
-

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -56 +56 @@
-bool
-IsoHandlerManager::setThreadParameters(bool rt, int priority) {
+    debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) switch to: (rt=%d, prio=%d)...\n", this, rt, priority);
-    if (priority > 98) priority = 98; // cap the priority
-    m_realtime = rt;
@@ -252 +253 @@
-        //irq_interval=2; // HACK
-        // create the actual handler
-RecvHandler(*this, buffers
-                   
+Handler(*this, IsoHandler::eHT_Receive
+buffers,
-        if(!h) {
-            debugFatal("Could not create IsoRecvHandler\n");
@@ -299 +300 @@
-
-        // create the actual handler
-XmitHandler(*this, buffers
-                   
+Handler(*this, IsoHandler::eHT_Transmit
+buffers,
-
-        debugOutput( DEBUG_LEVEL_VERBOSE, " registering IsoXmitHandler\n");

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -52 +52 @@
-    , m_period( 0 )
-    , m_nominal_framerate ( 0 )
+    , m_xrun_happened( false )
-    , m_xruns(0)
-    , m_xrun_happened( false )
-    , m_nbperiods(0)
-{
@@ -476 +476 @@
-
-            diff_between_streams[i] /= NB_PERIODS_FOR_ALIGN_AVERAGE;
-
+(int)
-            debugOutput( DEBUG_LEVEL_VERBOSE, "   avg offset between SyncSP %p and SP %p is %lld ticks, %d frames...\n", 
-                m_SyncSource, s, diff_between_streams[i], diff_between_streams_frames[i]);

trunk/libffado/src/libstreaming/util/cip.c

@@ -213 +213 @@
-                struct iec61883_packet *packet)
-{
-  int nevents;
-
-  packet->eoh0 = 0;
-
@@ -235 +233 @@
-  ptz->dbc += ptz->syt_interval;
-
-nevents
-
+0
+