Changeset 790
- Timestamp:
- 12/31/07 05:50:33 (16 years ago)
- Files:
-
- trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp (modified) (2 diffs)
- trunk/libffado/src/debugmodule/debugmodule.h (modified) (1 diff)
- trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (1 diff)
- trunk/libffado/src/libieee1394/test-cyclecalc.cpp (added)
- trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (2 diffs)
- trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (2 diffs)
- trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
- trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)
- trunk/libffado/src/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp
r750 r790 34 34 getConfigRom().getNodeId() ); 35 35 36 // the saffire prodoesn't seem to like it if the commands are too fast36 // the saffire doesn't seem to like it if the commands are too fast 37 37 if (AVC::AVCCommand::getSleepAfterAVCCommand() < 1000) { 38 38 AVC::AVCCommand::setSleepAfterAVCCommand( 1000 ); … … 46 46 bool result=true; 47 47 debugOutput(DEBUG_LEVEL_VERBOSE, "Building a Focusrite Saffire mixer...\n"); 48 48 49 49 destroyMixer(); 50 50 51 51 // create the mixer object container 52 52 m_MixerContainer = new Control::Container("Mixer"); trunk/libffado/src/debugmodule/debugmodule.h
r777 r790 142 142 #ifdef IMPLEMENT_BACKLOG 143 143 144 #define debugShowBackLog() DebugModuleManager::instance()->showBackLog() 145 #define debugShowBackLogLines(x) DebugModuleManager::instance()->showBackLog(x) 144 #define debugShowBackLog() \ 145 { \ 146 m_debugModule.print( DebugModule::eDL_Warning, \ 147 __FILE__, \ 148 __FUNCTION__, \ 149 __LINE__, \ 150 "Backlog print requested\n"); \ 151 DebugModuleManager::instance()->showBackLog(); \ 152 } 153 #define debugShowBackLogLines(x) \ 154 { \ 155 m_debugModule.print( DebugModule::eDL_Warning, \ 156 __FILE__, \ 157 __FUNCTION__, \ 158 __LINE__, \ 159 "Backlog print requested\n"); \ 160 DebugModuleManager::instance()->showBackLog(x); \ 161 } 146 162 147 163 #else trunk/libffado/src/libieee1394/IsoHandler.cpp
r777 r790 435 435 int cycle, unsigned int dropped) { 436 436 437 debugOutput( DEBUG_LEVEL_ VERY_VERBOSE,437 debugOutput( DEBUG_LEVEL_ULTRA_VERBOSE, 438 438 "sending packet: length=%d, cycle=%d\n", 439 439 *length, cycle ); trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp
r779 r790 86 86 unsigned int cycle, unsigned int dropped) 87 87 { 88 #ifdef DEBUG 89 static uint32_t now_prev=0; 90 static uint64_t now_prev_ticks=0; 91 #endif 92 88 93 struct iec61883_packet *packet = (struct iec61883_packet *) data; 89 94 assert(packet); … … 94 99 (length >= 2*sizeof(quadlet_t)); 95 100 if(ok) { 96 uint64_t now = m_1394service.getCycleTimer(); 101 uint32_t now = m_1394service.getCycleTimer(); 102 103 #ifdef DEBUG 104 uint64_t now_ticks = CYCLE_TIMER_TO_TICKS(now); 105 106 if (diffTicks(now_ticks, now_prev_ticks) < 0) { 107 debugWarning("non-monotonic CTR on cycle %04u: %llu -> %llu\n", cycle, now_prev_ticks, now_ticks); 108 debugWarning(" : %08X -> %08X\n", now_prev, now); 109 debugOutput ( DEBUG_LEVEL_VERBOSE, 110 " current: %011llu (%03us %04ucy %04uticks)\n", 111 now, 112 (unsigned int)TICKS_TO_SECS( now ), 113 (unsigned int)TICKS_TO_CYCLES( now ), 114 (unsigned int)TICKS_TO_OFFSET( now ) ); 115 debugOutput ( DEBUG_LEVEL_VERBOSE, 116 " prev : %011llu (%03us %04ucy %04uticks)\n", 117 now_prev, 118 (unsigned int)TICKS_TO_SECS( now_prev ), 119 (unsigned int)TICKS_TO_CYCLES( now_prev ), 120 (unsigned int)TICKS_TO_OFFSET( now_prev ) ); 121 } 122 now_prev = now; 123 now_prev_ticks=now_ticks; 124 #endif 125 97 126 //=> convert the SYT to a full timestamp in ticks 98 127 m_last_timestamp = sytRecvToFullTicks((uint32_t)ntohs(packet->syt), trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp
r783 r790 282 282 debugWarning ( "Problem encoding Packet Ports\n" ); 283 283 } 284 debugOutput ( DEBUG_LEVEL_ VERY_VERBOSE, "XMIT DATA: TSP=%011llu (%04u)\n",284 debugOutput ( DEBUG_LEVEL_ULTRA_VERBOSE, "XMIT DATA (cy %04d): TSP=%011llu (%04u)\n", 285 285 cycle, m_last_timestamp, ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) ); 286 286 return eCRV_OK; … … 297 297 { 298 298 struct iec61883_packet *packet = ( struct iec61883_packet * ) data; 299 debugOutput ( DEBUG_LEVEL_ VERY_VERBOSE, "XMIT NONE: CY=%04u, TSP=%011llu (%04u)\n",299 debugOutput ( DEBUG_LEVEL_ULTRA_VERBOSE, "XMIT NONE (cy %04d): CY=%04u, TSP=%011llu (%04u)\n", 300 300 cycle, m_last_timestamp, ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) ); 301 301 trunk/libffado/src/libstreaming/StreamProcessorManager.cpp
r784 r790 753 753 int d = m_SyncSource->getSyncDelay() + TICKS_PER_CYCLE; 754 754 m_SyncSource->setSyncDelay(d); 755 d = m_SyncSource->getSyncDelay(); 756 debugOutput(DEBUG_LEVEL_VERBOSE, "Increased the Sync delay to: %d\n", d); 755 757 756 758 #ifdef DEBUG trunk/libffado/src/libutil/TimestampedBuffer.cpp
r765 r790 1151 1151 ffado_timestamp_t max_abs_diff = one_update_step * (1.0 + max_deviation); 1152 1152 1153 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " nbframes: %d, m_update_period: %d \n", nbframes, m_update_period); 1154 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " tail TS: "TIMESTAMP_FORMAT_SPEC", next tail TS: "TIMESTAMP_FORMAT_SPEC"\n", 1155 m_buffer_tail_timestamp, m_buffer_next_tail_timestamp); 1156 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " new TS: "TIMESTAMP_FORMAT_SPEC", wrapped new TS: "TIMESTAMP_FORMAT_SPEC"\n", 1157 new_timestamp, ts); 1158 1153 1159 if (diff > max_abs_diff) { 1160 debugShowBackLogLines(100); 1154 1161 debugWarning("(%p) difference rather large (+): diff="TIMESTAMP_FORMAT_SPEC", max="TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC"\n", 1155 1162 this, diff, max_abs_diff, ts, pred_buffer_next_tail_timestamp); 1156 // debugShowBackLogLines(40);1157 1163 } else if (diff < -max_abs_diff) { 1164 debugShowBackLogLines(100); 1158 1165 debugWarning("(%p) difference rather large (-): diff="TIMESTAMP_FORMAT_SPEC", max="TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC"\n", 1159 1166 this, diff, -max_abs_diff, ts, pred_buffer_next_tail_timestamp); 1160 // debugShowBackLogLines(40);1161 1167 } 1162 1168 trunk/libffado/src/SConscript
r787 r790 265 265 "test-dll" : "libutil/test-dll.cpp", \ 266 266 "test-unittests-util" : "libutil/unittests.cpp", \ 267 "test-cyclecalc" : "libieee1394/test-cyclecalc.cpp", \ 267 268 } 268 269