Changeset 1266

Show
Ignore:
Timestamp:
06/23/08 01:16:51 (13 years ago)
Author:
ppalmers
Message:

fix compilation issue. allow more debug output when streaming problems occur.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/src/libieee1394/IsoHandler.cpp

    r1264 r1266  
    7676 
    7777    IsoHandler *handler = static_cast<IsoHandler *>(raw1394_get_userdata(handle)); 
     78    // FIXME: we should update the generation. 
    7879    assert(handler); 
    7980    return handler->handleBusReset(generation); 
     
    289290IsoHandler::handleBusReset(unsigned int generation) 
    290291{ 
    291     debugOutput( DEBUG_LEVEL_VERBOSE, "bus reset...\n"); 
     292    debugOutput( DEBUG_LEVEL_NORMAL, "bus reset...\n"); 
    292293 
    293294    #define CSR_CYCLE_TIME            0x200 
     
    497498    // leave the offset field (for now?) 
    498499 
    499     debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE, 
    500                        "received packet: length=%d, channel=%d, cycle=%d, at %08X\n", 
    501                        length, channel, cycle, pkt_ctr); 
     500    debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, 
     501                "received packet: length=%d, channel=%d, cycle=%d, at %08X\n", 
     502                length, channel, cycle, pkt_ctr); 
     503    m_packets++; 
    502504    #ifdef DEBUG 
    503     m_packets++; 
    504505    if (length > m_max_packet_size) { 
    505506        debugWarning("(%p, %s) packet too large: len=%u max=%u\n", 
     
    588589        m_last_packet_handled_at = pkt_ctr; 
    589590    } 
    590     debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE, 
    591                        "sending packet: length=%d, cycle=%d, at %08X\n", 
    592                        *length, cycle, pkt_ctr); 
     591    debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, 
     592                "sending packet: length=%d, cycle=%d, at %08X\n", 
     593                *length, cycle, pkt_ctr); 
     594 
     595    m_packets++; 
    593596 
    594597    #ifdef DEBUG 
    595     m_packets++; 
    596598    if(m_last_cycle == -1) { 
    597599        debugOutput(DEBUG_LEVEL_VERBOSE, "Handler for %s SP %p is alive (cycle = %d)\n", getTypeString(), this, cycle); 
  • branches/libffado-2.0/src/libieee1394/IsoHandler.h

    r1263 r1266  
    201201 
    202202public: 
     203    unsigned int    m_packets; 
    203204    #ifdef DEBUG 
    204     unsigned int    m_packets; 
    205205    unsigned int    m_dropped; 
    206206    unsigned int    m_skipped; 
  • branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp

    r1263 r1266  
    18431843    PortManager::setVerboseLevel(l); 
    18441844    m_data_buffer->setVerboseLevel(l); 
     1845    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l ); 
    18451846} 
    18461847