Changeset 515

Show
Ignore:
Timestamp:
08/09/07 16:19:26 (14 years ago)
Author:
jwoithe
Message:

Cosmetic cleanups of MOTU driver source. No functional changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp

    r512 r515  
    120120                  int cycle, unsigned int dropped, unsigned int max_length) { 
    121121 
    122 // FIXME: the actual delays in the system need to be worked out so 
    123 // we can get this thing synchronised.  For now this seems to work. 
    124122    int fc; 
    125123    int64_t ts_head; 
     
    146144    // packet is intended for and 'now' 
    147145    int cycle_diff = diffCycles(cycle, now_cycles); 
    148  
    149 //debugOutput(DEBUG_LEVEL_VERBOSE,"tx: enabled=%d, cycle=%d, now_cycles=%d, diff=%d\n", 
    150 //  !m_is_disabled,cycle, now_cycles, cycle_diff); 
    151146 
    152147    // Signal that streaming is still active 
     
    240235    int64_t timestamp = ts_head; 
    241236 
    242 //debugOutput(DEBUG_LEVEL_VERBOSE,"tx cycle %d, base timestamp %lld\n",cycle, ts_head); 
    243  
    244237    // we send a packet some cycles in advance, to avoid the 
    245238    // following situation: 
     
    258251    ticks_to_advance += (int64_t)cycle_diff * TICKS_PER_CYCLE; 
    259252 
    260     // determine the 'now' time in ticks 
    261 //    uint64_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr); 
    262253 
    263254    // time until the packet is to be sent (if <= 0: send packet) 
    264255    // For Amdtp this looked like 
     256    //   // determine the 'now' time in ticks 
     257    //   uint64_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr); 
    265258    //   int32_t until_next=diffTicks(timestamp, cycle_timer + ticks_to_advance); 
    266259    // However, this didn't seem to work well with the MOTU's buffer structure. 
     
    10111004            m_data_buffer->setBufferTailTimestamp(m_last_timestamp); 
    10121005 
    1013 debugOutput(DEBUG_LEVEL_VERBOSE,"On enable: last ts=%lld, ts2=%lld = %lld (%p)\n", 
    1014   m_last_timestamp, m_last_timestamp2, m_last_timestamp-m_last_timestamp2, 
    1015   m_data_buffer); 
    1016  
    10171006        } else { 
    10181007            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, 
     
    10831072 
    10841073        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "put packet...\n"); 
    1085 //debugOutput(DEBUG_LEVEL_VERBOSE,"rx cycle=%d, last ts=%lld\n",cycle, m_last_timestamp); 
    10861074 
    10871075        //=> process the packet