Changeset 1720
- Timestamp:
- 11/22/09 06:40:08 (14 years ago)
- Files:
-
- branches/libffado-2.0/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
- branches/libffado-2.0/src/bebob/bebob_avplug.cpp (modified) (1 diff)
- branches/libffado-2.0/src/bebob/bebob_dl_bcd.cpp (modified) (4 diffs)
- branches/libffado-2.0/src/bebob/focusrite/focusrite_generic.cpp (modified) (12 diffs)
- branches/libffado-2.0/src/bebob/focusrite/focusrite_saffire.cpp (modified) (1 diff)
- branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (4 diffs)
- branches/libffado-2.0/src/debugmodule/debugmodule.cpp (modified) (1 diff)
- branches/libffado-2.0/src/debugmodule/debugmodule.h (modified) (2 diffs)
- branches/libffado-2.0/src/DeviceStringParser.cpp (modified) (2 diffs)
- branches/libffado-2.0/src/fireworks/efc/efc_cmds_flash.cpp (modified) (4 diffs)
- branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware.cpp (modified) (2 diffs)
- branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp (modified) (2 diffs)
- branches/libffado-2.0/src/fireworks/efc/efc_cmds_ioconfig.cpp (modified) (1 diff)
- branches/libffado-2.0/src/fireworks/efc/efc_cmds_mixer.cpp (modified) (1 diff)
- branches/libffado-2.0/src/fireworks/efc/efc_cmds_monitor.cpp (modified) (1 diff)
- branches/libffado-2.0/src/fireworks/fireworks_control.cpp (modified) (4 diffs)
- branches/libffado-2.0/src/fireworks/fireworks_device.cpp (modified) (3 diffs)
- branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp (modified) (3 diffs)
- branches/libffado-2.0/src/fireworks/fireworks_session_block.cpp (modified) (1 diff)
- branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp (modified) (1 diff)
- branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp (modified) (1 diff)
- branches/libffado-2.0/src/libcontrol/Element.cpp (modified) (1 diff)
- branches/libffado-2.0/src/libieee1394/configrom.cpp (modified) (7 diffs)
- branches/libffado-2.0/src/libieee1394/cycletimer.h (modified) (9 diffs)
- branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp (modified) (15 diffs)
- branches/libffado-2.0/src/motu/motu_controls.cpp (modified) (6 diffs)
- branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libffado-2.0/src/bebob/bebob_avdevice.cpp
r1407 r1720 724 724 725 725 char* configId; 726 asprintf(&configId, "%016l lx", getConfigurationId() );726 asprintf(&configId, "%016lx", getConfigurationId() ); 727 727 if ( !configId ) { 728 728 debugError( "could not create id string\n" ); … … 800 800 // come up with an unique file name for the current settings 801 801 char* configId; 802 asprintf(&configId, "%016l lx", BeBoB::AvDevice::getConfigurationId() );802 asprintf(&configId, "%016lx", BeBoB::AvDevice::getConfigurationId() ); 803 803 if ( !configId ) { 804 804 debugError( "Could not create id string\n" ); branches/libffado-2.0/src/bebob/bebob_avplug.cpp
r1241 r1720 583 583 { 584 584 debugError( "number of output plugs (%d) disagree with " 585 "number of elements in plug address vector (% d)\n",585 "number of elements in plug address vector (%lu)\n", 586 586 infoType->m_plugOutput->m_nrOfOutputPlugs, 587 587 infoType->m_plugOutput->m_outputPlugAddresses.size()); branches/libffado-2.0/src/bebob/bebob_dl_bcd.cpp
r864 r1720 154 154 bytes_read = fread( &m_bcd_version, 1, sizeof( fb_quadlet_t ), m_file ); 155 155 if ( bytes_read != sizeof( fb_quadlet_t ) ) { 156 debugError( "parse: % dbytes read at position %d failed\n",156 debugError( "parse: %lu bytes read at position %d failed\n", 157 157 sizeof( fb_quadlet_t ), 158 158 BCDFileVersionOffset ); … … 245 245 size_t bytes_read = std::fread( q, 1, sizeof( *q ), m_file ); 246 246 if ( bytes_read != sizeof( *q ) ) { 247 debugError( "read: % dbyte read failed at position 0x%08x\n",247 debugError( "read: %lu byte read failed at position 0x%08x\n", 248 248 sizeof( *q ), addr ); 249 249 return false; … … 263 263 size_t bytes_read = std::fread( o, 1, sizeof( *o ), m_file ); 264 264 if ( bytes_read != sizeof( *o ) ) { 265 debugError( "read: % dbyte read failed at position 0x%08x\n",265 debugError( "read: %lu byte read failed at position 0x%08x\n", 266 266 sizeof( *o ), addr ); 267 267 return false; … … 281 281 size_t bytes_read = std::fread( b, 1, len, m_file ); 282 282 if ( bytes_read != len ) { 283 debugError( "read: % dbyte read failed at position 0x%08x\n",283 debugError( "read: %lu byte read failed at position 0x%08x\n", 284 284 len, addr ); 285 285 return false; branches/libffado-2.0/src/bebob/focusrite/focusrite_generic.cpp
r1524 r1720 58 58 FocusriteDevice::setSpecificValue(uint32_t id, uint32_t v) 59 59 { 60 debugOutput(DEBUG_LEVEL_VERBOSE, "Writing parameter address space id 0x%08 lX (%u), data: 0x%08lX\n",60 debugOutput(DEBUG_LEVEL_VERBOSE, "Writing parameter address space id 0x%08X (%u), data: 0x%08X\n", 61 61 id, id, v); 62 62 bool use_avc = false; … … 69 69 if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) { 70 70 ffado_microsecs_t wait = m_earliest_next_cmd_time - now; 71 debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %l lu\n", wait );71 debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %lu\n", wait ); 72 72 Util::SystemTimeSource::SleepUsecRelative(wait); 73 73 } … … 94 94 if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) { 95 95 ffado_microsecs_t wait = m_earliest_next_cmd_time - now; 96 debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %l lu\n", wait );96 debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %lu\n", wait ); 97 97 Util::SystemTimeSource::SleepUsecRelative(wait); 98 98 } … … 105 105 retval = getSpecificValueARM(id, v); 106 106 } 107 debugOutput(DEBUG_LEVEL_VERBOSE,"Read parameter address space id 0x%08 lX (%u): %08lX\n", id, id, *v);107 debugOutput(DEBUG_LEVEL_VERBOSE,"Read parameter address space id 0x%08X (%u): %08X\n", id, id, *v); 108 108 return retval; 109 109 } … … 161 161 FocusriteDevice::setSpecificValueARM(uint32_t id, uint32_t v) 162 162 { 163 fb_quadlet_t data =v;164 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing parameter address space id 0x%08 lX (%u), data: 0x%08lX\n",163 fb_quadlet_t data = v; 164 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing parameter address space id 0x%08X (%u), data: 0x%08X\n", 165 165 id, id, data); 166 166 … … 169 169 170 170 if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) { 171 debugError("Could not write to node 0x%04X addr 0x%012 X\n", nodeId, addr);171 debugError("Could not write to node 0x%04X addr 0x%012lX\n", nodeId, addr); 172 172 return false; 173 173 } … … 179 179 { 180 180 fb_quadlet_t result; 181 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading parameter address space id 0x%08 lX\n", id);181 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading parameter address space id 0x%08X\n", id); 182 182 183 183 fb_nodeaddr_t addr = FR_PARAM_SPACE_START + (id * 4); … … 185 185 186 186 if(!get1394Service().read_quadlet( nodeId, addr, &result ) ) { 187 debugError("Could not read from node 0x%04 llX addr 0x%012llX\n", nodeId, addr);188 return false; 189 } 190 191 result =CondSwapFromBus32(result);192 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08 llX\n", result);187 debugError("Could not read from node 0x%04X addr 0x%012lX\n", nodeId, addr); 188 return false; 189 } 190 191 result = CondSwapFromBus32(result); 192 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", result); 193 193 194 194 *v = result; … … 385 385 RegisterControl::setValue(uint64_t addr, uint64_t v) 386 386 { 387 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for addr %l lu to %llu\n",387 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for addr %lu to %lu\n", 388 388 addr, v); 389 389 … … 403 403 return 0; 404 404 } else { 405 debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for %l lu = %lu\n",405 debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for %lu = %u\n", 406 406 addr, val); 407 407 return val; … … 576 576 struct sCellInfo c = m_CellInfo.at(row).at(col); 577 577 578 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d row %d col %d to %lf (% ld)\n",578 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d row %d col %d to %lf (%d)\n", 579 579 c.address, row, col, val, v); 580 580 … … 597 597 return 0; 598 598 } else { 599 debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for id %d row %d col %d = % lu\n",599 debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for id %d row %d col %d = %u\n", 600 600 c.address, row, col, val); 601 601 return val; branches/libffado-2.0/src/bebob/focusrite/focusrite_saffire.cpp
r1618 r1720 48 48 if(config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "cmd_interval_time", delaytime)) { 49 49 m_cmd_time_interval = delaytime; 50 debugOutput( DEBUG_LEVEL_VERBOSE, "Setting command interval time to %l lu\n",50 debugOutput( DEBUG_LEVEL_VERBOSE, "Setting command interval time to %lu\n", 51 51 m_cmd_time_interval ); 52 52 } else { 53 53 m_cmd_time_interval = 10000; 54 debugOutput( DEBUG_LEVEL_VERBOSE, "No command interval time setting found, defaulting to %l lu\n",54 debugOutput( DEBUG_LEVEL_VERBOSE, "No command interval time setting found, defaulting to %lu\n", 55 55 m_cmd_time_interval ); 56 56 } branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp
r1618 r1720 423 423 return; 424 424 } 425 debugOutput(DEBUG_LEVEL_VERBOSE, "SYNC_CONFIG field value: %08 lX\n", sync );425 debugOutput(DEBUG_LEVEL_VERBOSE, "SYNC_CONFIG field value: %08X\n", sync ); 426 426 427 427 switch(sync & FR_SAFFIREPRO_CMD_ID_SYNC_CONFIG_MASK) { 428 428 default: 429 debugWarning( "Unexpected SYNC_CONFIG field value: %08 lX\n", sync );429 debugWarning( "Unexpected SYNC_CONFIG field value: %08X\n", sync ); 430 430 case FR_SAFFIREPRO_CMD_SYNC_CONFIG_INTERNAL: 431 431 m_internal_clocksource.active=true; … … 466 466 break; 467 467 default: 468 debugWarning( "Unexpected SYNC_CONFIG_STATE field value: %08 lX\n", sync );468 debugWarning( "Unexpected SYNC_CONFIG_STATE field value: %08X\n", sync ); 469 469 } 470 470 } … … 772 772 break; 773 773 } 774 debugOutput( DEBUG_LEVEL_VERBOSE, "setSampleRate (try %d) failed. Try again...\n" 774 debugOutput( DEBUG_LEVEL_VERBOSE, "setSampleRate (try %d) failed. Try again...\n", ntries); 775 775 } 776 776 … … 872 872 } 873 873 874 debugOutput( DEBUG_LEVEL_VERBOSE, 875 "getCount32: %08lX\n", v ); 874 debugOutput( DEBUG_LEVEL_VERBOSE, "getCount32: %08X\n", v ); 876 875 return v; 877 876 } branches/libffado-2.0/src/debugmodule/debugmodule.cpp
r1235 r1720 186 186 int chars_written=0; 187 187 int retval=0; 188 retval = snprintf(msg, MB_BUFFERSIZE, "%011l lu: %s (%s)[%4d] %s: ",188 retval = snprintf(msg, MB_BUFFERSIZE, "%011lu: %s (%s)[%4d] %s: ", 189 189 ts_usec, getPreSequence( level ), 190 190 fname, line, function ); branches/libffado-2.0/src/debugmodule/debugmodule.h
r1567 r1720 290 290 void printShort( debug_level_t level, 291 291 const char* format, 292 ... ) const; 292 ... ) const 293 #ifdef __GNUC__ 294 __attribute__((format(printf, 3, 4))) 295 #endif 296 ; 293 297 294 298 void print( debug_level_t level, … … 297 301 unsigned int line, 298 302 const char* format, 299 ... ) const; 303 ... ) const 304 #ifdef __GNUC__ 305 __attribute__((format(printf, 6, 7))) 306 #endif 307 ; 300 308 301 309 bool setLevel( debug_level_t level ) branches/libffado-2.0/src/DeviceStringParser.cpp
r1545 r1720 203 203 case eGUID: 204 204 retval = m_guid && (m_guid == x.m_guid); 205 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "eGUID 0x%016 X == 0x%016X? %d\n",205 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "eGUID 0x%016lX == 0x%016lX? %d\n", 206 206 m_guid, x.m_guid, retval); 207 207 return retval; … … 225 225 case eGUID: 226 226 debugOutput(DEBUG_LEVEL_INFO, "type: eGUID\n"); 227 debugOutput(DEBUG_LEVEL_INFO, " GUID: %016 LLX\n", m_guid);227 debugOutput(DEBUG_LEVEL_INFO, " GUID: %016lX\n", m_guid); 228 228 break; 229 229 case eInvalid: branches/libffado-2.0/src/fireworks/efc/efc_cmds_flash.cpp
r1136 r1720 68 68 EfcCmd::showEfcCmd(); 69 69 debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Erase:\n"); 70 debugOutput(DEBUG_LEVEL_NORMAL, " Address : % lu\n", m_address);70 debugOutput(DEBUG_LEVEL_NORMAL, " Address : %u\n", m_address); 71 71 } 72 72 … … 120 120 EfcCmd::showEfcCmd(); 121 121 debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Read:\n"); 122 debugOutput(DEBUG_LEVEL_NORMAL, " Address : % lu\n", m_address);123 debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : % lu\n", m_nb_quadlets);122 debugOutput(DEBUG_LEVEL_NORMAL, " Address : %u\n", m_address); 123 debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : %u\n", m_nb_quadlets); 124 124 debugOutput(DEBUG_LEVEL_NORMAL, " Data : \n"); 125 125 for (unsigned int i=0; i < m_nb_quadlets; i++) { … … 174 174 EfcCmd::showEfcCmd(); 175 175 debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Write:\n"); 176 debugOutput(DEBUG_LEVEL_NORMAL, " Address : % lu\n", m_address);177 debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : % lu\n", m_nb_quadlets);176 debugOutput(DEBUG_LEVEL_NORMAL, " Address : %u\n", m_address); 177 debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : %u\n", m_nb_quadlets); 178 178 debugOutput(DEBUG_LEVEL_NORMAL, " Data : \n"); 179 179 for (unsigned int i=0; i < m_nb_quadlets; i++) { … … 292 292 EfcCmd::showEfcCmd(); 293 293 debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Get Session Base:\n"); 294 debugOutput(DEBUG_LEVEL_NORMAL, " Address : % lu\n", m_address);294 debugOutput(DEBUG_LEVEL_NORMAL, " Address : %u\n", m_address); 295 295 } 296 296 branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware.cpp
r1135 r1720 127 127 debugOutput(DEBUG_LEVEL_NORMAL, "EFC HW CAPS info:\n"); 128 128 debugOutput(DEBUG_LEVEL_NORMAL, " Flags : 0x%08X\n", m_flags); 129 debugOutput(DEBUG_LEVEL_NORMAL, " GUID : %016l lX\n", m_guid);129 debugOutput(DEBUG_LEVEL_NORMAL, " GUID : %016lX\n", m_guid); 130 130 debugOutput(DEBUG_LEVEL_NORMAL, " HwType : 0x%08X\n", m_type); 131 debugOutput(DEBUG_LEVEL_NORMAL, " Version : % lu\n", m_version);131 debugOutput(DEBUG_LEVEL_NORMAL, " Version : %u\n", m_version); 132 132 debugOutput(DEBUG_LEVEL_NORMAL, " Vendor : %s\n", m_vendor_name); 133 133 debugOutput(DEBUG_LEVEL_NORMAL, " Model : %s\n", m_model_name); … … 232 232 debugOutput(DEBUG_LEVEL_NORMAL, " # Output Meters : %d\n", m_nb_output_meters); 233 233 for (i=0;i<m_nb_output_meters;i++) { 234 debugOutput(DEBUG_LEVEL_NORMAL, " Meter %d: % ld\n", i, m_meters[i]);234 debugOutput(DEBUG_LEVEL_NORMAL, " Meter %d: %d\n", i, m_meters[i]); 235 235 } 236 236 237 237 debugOutput(DEBUG_LEVEL_NORMAL, " # Input Meters : %d\n", m_nb_input_meters); 238 238 for (;i<m_nb_output_meters+m_nb_input_meters;i++) { 239 debugOutput(DEBUG_LEVEL_NORMAL, " Meter %d: % ld\n", i, m_meters[i]);239 debugOutput(DEBUG_LEVEL_NORMAL, " Meter %d: %d\n", i, m_meters[i]); 240 240 } 241 241 } branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp
r1284 r1720 73 73 EfcCmd::showEfcCmd(); 74 74 debugOutput(DEBUG_LEVEL_NORMAL, "EFC Get Clock:\n"); 75 debugOutput(DEBUG_LEVEL_NORMAL, " Clock : % lu\n", m_clock);76 debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate : % lu\n", m_samplerate);77 debugOutput(DEBUG_LEVEL_NORMAL, " Index : % lu\n", m_index);75 debugOutput(DEBUG_LEVEL_NORMAL, " Clock : %u\n", m_clock); 76 debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate : %u\n", m_samplerate); 77 debugOutput(DEBUG_LEVEL_NORMAL, " Index : %u\n", m_index); 78 78 } 79 79 … … 124 124 EfcCmd::showEfcCmd(); 125 125 debugOutput(DEBUG_LEVEL_NORMAL, "EFC Set Clock:\n"); 126 debugOutput(DEBUG_LEVEL_NORMAL, " Clock : % lu\n", m_clock);127 debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate : % lu\n", m_samplerate);128 debugOutput(DEBUG_LEVEL_NORMAL, " Index : % lu\n", m_index);126 debugOutput(DEBUG_LEVEL_NORMAL, " Clock : %u\n", m_clock); 127 debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate : %u\n", m_samplerate); 128 debugOutput(DEBUG_LEVEL_NORMAL, " Index : %u\n", m_index); 129 129 } 130 130 branches/libffado-2.0/src/fireworks/efc/efc_cmds_ioconfig.cpp
r1260 r1720 162 162 (m_type==eCT_Get?"GET":"SET"), 163 163 eIOConfigRegisterToString(m_reg)); 164 debugOutput(DEBUG_LEVEL_NORMAL, " Value : % lu\n", m_value);164 debugOutput(DEBUG_LEVEL_NORMAL, " Value : %u\n", m_value); 165 165 } 166 166 branches/libffado-2.0/src/fireworks/efc/efc_cmds_mixer.cpp
r1136 r1720 245 245 eMixerTargetToString(m_target), 246 246 eMixerCommandToString(m_command)); 247 debugOutput(DEBUG_LEVEL_NORMAL, " Channel : % ld\n", m_channel);248 debugOutput(DEBUG_LEVEL_NORMAL, " Value : % lu\n", m_value);247 debugOutput(DEBUG_LEVEL_NORMAL, " Channel : %d\n", m_channel); 248 debugOutput(DEBUG_LEVEL_NORMAL, " Value : %u\n", m_value); 249 249 } 250 250 branches/libffado-2.0/src/fireworks/efc/efc_cmds_monitor.cpp
r1136 r1720 150 150 (m_type==eCT_Get?"GET":"SET"), 151 151 eMonitorCommandToString(m_command)); 152 debugOutput(DEBUG_LEVEL_NORMAL, " Input : % ld\n", m_input);153 debugOutput(DEBUG_LEVEL_NORMAL, " Output : % ld\n", m_output);154 debugOutput(DEBUG_LEVEL_NORMAL, " Value : % lu\n", m_value);152 debugOutput(DEBUG_LEVEL_NORMAL, " Input : %d\n", m_input); 153 debugOutput(DEBUG_LEVEL_NORMAL, " Output : %d\n", m_output); 154 debugOutput(DEBUG_LEVEL_NORMAL, " Value : %u\n", m_value); 155 155 } 156 156 branches/libffado-2.0/src/fireworks/fireworks_control.cpp
r1285 r1720 321 321 break; 322 322 } 323 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %lf = % lf\n",323 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %lf = %u\n", 324 324 m_Slave->m_channel, val, m_Slave->m_value); 325 325 return true; … … 339 339 return 0.0; 340 340 } 341 debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for channel %d = % lf\n",341 debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for channel %d = %u\n", 342 342 m_Slave->m_channel, m_Slave->m_value); 343 343 return m_Slave->m_value; … … 451 451 } 452 452 453 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to % ld (reg: 0x%08X => 0x%08X)\n",453 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %d (reg: 0x%08X => 0x%08X)\n", 454 454 m_Slave->m_channel, val, old_reg, reg); 455 455 return true; … … 583 583 return 0; 584 584 } 585 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue to % ld \n", val);585 debugOutput(DEBUG_LEVEL_VERBOSE, "setValue to %d \n", val); 586 586 return true; 587 587 } else { branches/libffado-2.0/src/fireworks/fireworks_device.cpp
r1560 r1720 560 560 Device::clockIdToClockSource(uint32_t clockid) { 561 561 ClockSource s; 562 debugOutput(DEBUG_LEVEL_VERBOSE, "clock id: % lu\n", clockid);562 debugOutput(DEBUG_LEVEL_VERBOSE, "clock id: %u\n", clockid); 563 563 564 564 // the polled values are used to detect … … 624 624 return EFC_CMD_HW_CLOCK_UNSPECIFIED; 625 625 } 626 debugOutput(DEBUG_LEVEL_VERBOSE, "Active clock: 0x%08 lX\n",gccmd.m_clock);626 debugOutput(DEBUG_LEVEL_VERBOSE, "Active clock: 0x%08X\n",gccmd.m_clock); 627 627 gccmd.showEfcCmd(); 628 628 … … 637 637 return false; 638 638 } 639 debugOutput(DEBUG_LEVEL_VERBOSE, "Set clock: 0x%08 lX\n", id);639 debugOutput(DEBUG_LEVEL_VERBOSE, "Set clock: 0x%08X\n", id); 640 640 641 641 EfcSetClockCmd sccmd; branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp
r1280 r1720 172 172 unsigned int version_minor = (m_version & 0x00FF0000) >> 16; 173 173 unsigned int version_build = (m_version & 0x0000FFFF); 174 debugOutput(DEBUG_LEVEL_NORMAL, " Address Offset : 0x%08 lX\n", m_flash_offset_address);175 debugOutput(DEBUG_LEVEL_NORMAL, " Length (Quadlets) : 0x%08 lX\n", m_length_quads);176 debugOutput(DEBUG_LEVEL_NORMAL, " CRC 32 : 0x%08 lX\n", m_CRC32);177 debugOutput(DEBUG_LEVEL_NORMAL, " Checksum : 0x%08 lX\n", m_checksum);174 debugOutput(DEBUG_LEVEL_NORMAL, " Address Offset : 0x%08X\n", m_flash_offset_address); 175 debugOutput(DEBUG_LEVEL_NORMAL, " Length (Quadlets) : 0x%08X\n", m_length_quads); 176 debugOutput(DEBUG_LEVEL_NORMAL, " CRC 32 : 0x%08X\n", m_CRC32); 177 debugOutput(DEBUG_LEVEL_NORMAL, " Checksum : 0x%08X\n", m_checksum); 178 178 debugOutput(DEBUG_LEVEL_NORMAL, " Firmware version : %02u.%02u.%02u (0x%08X)\n", 179 179 version_major, version_minor, version_build, m_version); 180 180 debugOutput(DEBUG_LEVEL_NORMAL, " Append CRC : %s\n", (m_append_crc?"Yes":"No")); 181 debugOutput(DEBUG_LEVEL_NORMAL, " Footprint (Quadlets) : 0x%08 lX\n", m_footprint_quads);181 debugOutput(DEBUG_LEVEL_NORMAL, " Footprint (Quadlets) : 0x%08X\n", m_footprint_quads); 182 182 #endif 183 183 } … … 298 298 } 299 299 300 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " Header %02d: %08 lX\n",300 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " Header %02d: %08X\n", 301 301 i, m_header[i]); 302 302 } … … 337 337 } 338 338 339 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " Data %02d: %08 lX\n",339 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " Data %02d: %08X\n", 340 340 i, m_data[i]); 341 341 } branches/libffado-2.0/src/fireworks/fireworks_session_block.cpp
r1290 r1720 255 255 256 256 if (len != h.size_quads*4) { 257 debugWarning("size not correct: got % d, should be %d according to data\n", len, h.size_quads*4);257 debugWarning("size not correct: got %lu, should be %d according to data\n", len, h.size_quads*4); 258 258 } 259 259 branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp
r1235 r1720 254 254 } 255 255 256 debugOutput(DEBUG_LEVEL_VERBOSE, " copying %u bytes to internal buffer offset % u\n",readDescCmd.m_data_length, bytes_read);256 debugOutput(DEBUG_LEVEL_VERBOSE, " copying %u bytes to internal buffer offset %lu\n",readDescCmd.m_data_length, bytes_read); 257 257 258 258 memcpy(m_data+bytes_read,readDescCmd.m_data, readDescCmd.m_data_length); branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp
r1235 r1720 120 120 break; 121 121 default: 122 debugError("Can't handle command type % s\n", getCommandType());122 debugError("Can't handle command type %d\n", getCommandType()); 123 123 return false; 124 124 } branches/libffado-2.0/src/libcontrol/Element.cpp
r1412 r1720 302 302 { 303 303 Util::MutexLockHelper lock(getLock()); 304 debugOutput( DEBUG_LEVEL_NORMAL, "Container %s (% dElements)\n",304 debugOutput( DEBUG_LEVEL_NORMAL, "Container %s (%lu Elements)\n", 305 305 getName().c_str(), m_Children.size()); 306 306 branches/libffado-2.0/src/libieee1394/configrom.cpp
r1292 r1720 484 484 { 485 485 debugOutput( DEBUG_LEVEL_VERBOSE, 486 "Checking for updated node id for device with GUID 0x%016l lX...\n",486 "Checking for updated node id for device with GUID 0x%016lX...\n", 487 487 getGuid()); 488 488 … … 515 515 516 516 debugOutput( DEBUG_LEVEL_VERBOSE, 517 " Node has GUID 0x%016l lX\n",517 " Node has GUID 0x%016lX\n", 518 518 guid); 519 519 … … 522 522 if ( nodeId != getNodeId() ) { 523 523 debugOutput( DEBUG_LEVEL_VERBOSE, 524 "Device with GUID 0x%016l lX changed node id "524 "Device with GUID 0x%016lX changed node id " 525 525 "from %d to %d\n", 526 526 getGuid(), … … 530 530 } else { 531 531 debugOutput( DEBUG_LEVEL_VERBOSE, 532 "Device with GUID 0x%016l lX kept node id %d\n",532 "Device with GUID 0x%016lX kept node id %d\n", 533 533 getGuid(), 534 534 getNodeId()); … … 547 547 548 548 debugOutput( DEBUG_LEVEL_VERBOSE, 549 "Device with GUID 0x%016l lX could not be found on "549 "Device with GUID 0x%016lX could not be found on " 550 550 "the bus anymore (removed?)\n", 551 551 getGuid() ); … … 560 560 debugOutput(DEBUG_LEVEL_NORMAL, "Config ROM\n" ); 561 561 debugOutput(DEBUG_LEVEL_NORMAL, "\tCurrent Node Id:\t%d\n", getNodeId() ); 562 debugOutput(DEBUG_LEVEL_NORMAL, "\tGUID:\t\t\t0x%016l lX\n", getGuid());562 debugOutput(DEBUG_LEVEL_NORMAL, "\tGUID:\t\t\t0x%016lX\n", getGuid()); 563 563 debugOutput(DEBUG_LEVEL_NORMAL, "\tVendor Name:\t\t%s\n", getVendorName().c_str() ); 564 564 debugOutput(DEBUG_LEVEL_NORMAL, "\tModel Name:\t\t%s\n", getModelName().c_str() ); … … 581 581 printMessage("Config ROM\n" ); 582 582 printMessage("\tCurrent Node Id:\t%d\n", getNodeId() ); 583 printMessage("\tGUID:\t\t\t0x%016l lX\n", getGuid());583 printMessage("\tGUID:\t\t\t0x%016lX\n", getGuid()); 584 584 printMessage("\tVendor Name:\t\t%s\n", getVendorName().c_str() ); 585 585 printMessage("\tModel Name:\t\t%s\n", getModelName().c_str() ); branches/libffado-2.0/src/libieee1394/cycletimer.h
r1528 r1720 95 95 #ifdef DEBUG 96 96 if (x >= TICKS_PER_SECOND * 128L) { 97 debugWarning("insufficient wrapping: %l lu\n",x);97 debugWarning("insufficient wrapping: %lu\n",x); 98 98 } 99 99 #endif … … 118 118 #ifdef DEBUG 119 119 if (x < 0) { 120 debugWarning("insufficient wrapping: %l ld\n",x);120 debugWarning("insufficient wrapping: %ld\n",x); 121 121 } 122 122 #endif … … 145 145 #ifdef DEBUG 146 146 if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 147 debugWarning("insufficient wrapping (max): %l lu\n",x);147 debugWarning("insufficient wrapping (max): %lu\n",x); 148 148 } 149 149 if (x < 0) { 150 debugWarning("insufficient wrapping (min): %l ld\n",x);150 debugWarning("insufficient wrapping (min): %ld\n",x); 151 151 } 152 152 #endif … … 249 249 if(diff > max || diff < -max) { 250 250 debugWarning("difference does not make any sense\n"); 251 debugWarning("diff=%l ld max=%lld\n", diff, max);251 debugWarning("diff=%ld max=%ld\n", diff, max); 252 252 253 253 } … … 313 313 int diff_cycles = diffCycles(cc_cycles, rcv_cycle); 314 314 if (diff_cycles<0) { 315 debugWarning("current cycle timer not ahead of receive cycle: rcv: %u / cc: %l lu (%d)\n",315 debugWarning("current cycle timer not ahead of receive cycle: rcv: %u / cc: %lu (%d)\n", 316 316 rcv_cycle, cc_cycles, diff_cycles); 317 317 } … … 372 372 if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 373 373 debugWarning("back-converted timestamp not equal to SYT\n"); 374 debugWarning("TS=%011l lu TSC=%08lX SYT=%04X\n",374 debugWarning("TS=%011lu TSC=%08lX SYT=%04lX\n", 375 375 timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 376 376 } … … 433 433 if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 434 434 debugWarning("back-converted timestamp not equal to SYT\n"); 435 debugWarning("TS=%011l lu TSC=%08lX SYT=%04X\n",435 debugWarning("TS=%011lu TSC=%08lX SYT=%04lX\n", 436 436 timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 437 437 } … … 467 467 int diff_cycles = diffCycles(xmt_cycle, cc_cycles); 468 468 if (diff_cycles<0) { 469 debugWarning("xmit cycle not ahead of current cycle: xmt: %u / cc: %l lu (%d)\n",469 debugWarning("xmit cycle not ahead of current cycle: xmt: %u / cc: %lu (%d)\n", 470 470 xmt_cycle, cc_cycles, diff_cycles); 471 471 } … … 526 526 if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 527 527 debugWarning("back-converted timestamp not equal to SYT\n"); 528 debugWarning("TS=%011l lu TSC=%08lX SYT=%04X\n",528 debugWarning("TS=%011lu TSC=%08lX SYT=%04lX\n", 529 529 timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 530 530 } branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp
r1544 r1720 164 164 m_cycle_timer_prev, maxtries2); 165 165 } 166 debugOutput( DEBUG_LEVEL_VERBOSE, " read : CTR: %11 lu, local: %17llu\n",166 debugOutput( DEBUG_LEVEL_VERBOSE, " read : CTR: %11u, local: %17lu\n", 167 167 m_cycle_timer_prev, local_time); 168 168 debugOutput(DEBUG_LEVEL_VERBOSE, 169 " ctr : 0x%08X %11l lu (%03us %04ucy %04uticks)\n",169 " ctr : 0x%08X %11lu (%03us %04ucy %04uticks)\n", 170 170 (uint32_t)m_cycle_timer_prev, (uint64_t)CYCLE_TIMER_TO_TICKS(m_cycle_timer_prev), 171 171 (unsigned int)CYCLE_TIMER_GET_SECS( m_cycle_timer_prev ), … … 310 310 bw_abs, bw_rel); 311 311 debugOutput(DEBUG_LEVEL_VERBOSE, 312 " usecs/update: % lu, ticks/update: %lu, m_dll_e2: %f\n",312 " usecs/update: %u, ticks/update: %u, m_dll_e2: %f\n", 313 313 m_usecs_per_update, m_ticks_per_update, m_dll_e2); 314 314 debugOutput(DEBUG_LEVEL_VERBOSE, … … 351 351 ffado_microsecs_t now = Util::SystemTimeSource::getCurrentTimeAsUsecs(); 352 352 int sleep_time = m_sleep_until - now; 353 debugOutput( DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) Sleep until %l ld/%f (now: %lld, diff=%d) ...\n",353 debugOutput( DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) Sleep until %ld/%f (now: %ld, diff=%d) ...\n", 354 354 this, m_sleep_until, m_next_time_usecs, now, sleep_time); 355 355 #endif … … 390 390 if(not_good) { 391 391 debugOutput(DEBUG_LEVEL_VERBOSE, 392 "(%p) have to retry CTR read, diff unrealistic: diff: %l ld, max: +/- %u (try: %d) %lld\n",392 "(%p) have to retry CTR read, diff unrealistic: diff: %ld, max: +/- %u (try: %d) %ld\n", 393 393 this, err_ticks, 1*TICKS_PER_CYCLE, ntries, expected_ticks); 394 394 // sleep half a cycle to make sure the hardware moved on … … 409 409 // // simulate a random scheduling delay between (0-10ms) 410 410 // ffado_microsecs_t tmp = Util::SystemTimeSource::SleepUsecRandom(10000); 411 // debugOutput( DEBUG_LEVEL_VERBOSE, " (%p) random sleep of %l lu usecs...\n", this, tmp);411 // debugOutput( DEBUG_LEVEL_VERBOSE, " (%p) random sleep of %lu usecs...\n", this, tmp); 412 412 413 413 if(m_unhandled_busreset) { … … 436 436 } else if (diff_ticks > m_ticks_per_update * 20) { 437 437 debugOutput(DEBUG_LEVEL_VERBOSE, 438 "re-init dll due to too large tick diff: %l ld >> %f\n",438 "re-init dll due to too large tick diff: %ld >> %f\n", 439 439 diff_ticks, (float)(m_ticks_per_update * 20)); 440 440 if(!initDLL()) { … … 462 462 diff_ticks_corr = diff_ticks - ticks_late; 463 463 debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE, 464 "diff_ticks_corr=%l ld, diff_ticks = %lld, ticks_late = %lld\n",464 "diff_ticks_corr=%ld, diff_ticks = %ld, ticks_late = %ld\n", 465 465 diff_ticks_corr, diff_ticks, ticks_late); 466 466 } else { … … 473 473 // makes no sense if not running realtime 474 474 if(m_realtime && usecs_late > 1000) { 475 debugOutput(DEBUG_LEVEL_VERBOSE, "Rather late wakeup: %l ld usecs\n", usecs_late);475 debugOutput(DEBUG_LEVEL_VERBOSE, "Rather late wakeup: %ld usecs\n", usecs_late); 476 476 } 477 477 #endif … … 526 526 527 527 debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 528 " usecs: current: %f next: %f usecs_late=%l ld ticks_late=%lld\n",528 " usecs: current: %f next: %f usecs_late=%ld ticks_late=%ld\n", 529 529 m_current_time_usecs, m_next_time_usecs, usecs_late, ticks_late); 530 530 debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 531 " ticks: current: %f next: %f diff=%l ld\n",531 " ticks: current: %f next: %f diff=%ld\n", 532 532 m_current_time_ticks, m_next_time_ticks, diff_ticks); 533 533 debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, … … 589 589 } 590 590 int32_t ctr_diff = cycle_timer_ticks-dll_time; 591 debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) CTR DIFF: HW %010l lu - DLL %010lu = %010ld (%s)\n",591 debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) CTR DIFF: HW %010lu - DLL %010u = %010d (%s)\n", 592 592 this, cycle_timer_ticks, dll_time, ctr_diff, (ctr_diff>0?"lag":"lead")); 593 593 #endif … … 625 625 if (y_step_in_ticks_int > 0) { 626 626 retval = addTicks(offset_in_ticks_int, y_step_in_ticks_int); 627 /* debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int > 0: %l ld, time_diff: %f, rate: %f, retval: %lu\n",627 /* debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int > 0: %ld, time_diff: %f, rate: %f, retval: %lu\n", 628 628 y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/ 629 629 } else { … … 631 631 632 632 // this can happen if the update thread was woken up earlier than it should have been 633 /* debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int <= 0: %l ld, time_diff: %f, rate: %f, retval: %lu\n",633 /* debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int <= 0: %ld, time_diff: %f, rate: %f, retval: %lu\n", 634 634 y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/ 635 635 } … … 792 792 if (diffTicks(cycle_timer_ticks, m_cycle_timer_ticks_prev) < 0) { 793 793 debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 794 "non-monotonic CTR (try %02d): %l lu -> %llu\n",794 "non-monotonic CTR (try %02d): %lu -> %lu\n", 795 795 maxtries, m_cycle_timer_ticks_prev, cycle_timer_ticks); 796 796 debugOutput( DEBUG_LEVEL_VERY_VERBOSE, … … 798 798 m_cycle_timer_prev, *cycle_timer); 799 799 debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 800 " current: %011l lu (%03us %04ucy %04uticks)\n",800 " current: %011lu (%03us %04ucy %04uticks)\n", 801 801 cycle_timer_ticks, 802 802 (unsigned int)TICKS_TO_SECS( cycle_timer_ticks ), … … 804 804 (unsigned int)TICKS_TO_OFFSET( cycle_timer_ticks ) ); 805 805 debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 806 " prev : %011l lu (%03us %04ucy %04uticks)\n",806 " prev : %011lu (%03us %04ucy %04uticks)\n", 807 807 m_cycle_timer_ticks_prev, 808 808 (unsigned int)TICKS_TO_SECS( m_cycle_timer_ticks_prev ), branches/libffado-2.0/src/motu/motu_controls.cpp
r1520 r1720 301 301 if (v > 0x80) 302 302 v = 0x80; 303 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader setValue for row %d col %d to %lf (% ld)\n",303 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader setValue for row %d col %d to %lf (%d)\n", 304 304 row, col, val, v); 305 305 reg = getCellRegister(row,col); … … 331 331 val = m_parent.ReadRegister(reg) & 0xff; 332 332 333 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader getValue for row %d col %d = % lu\n",333 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader getValue for row %d col %d = %u\n", 334 334 row, col, val); 335 335 return val; … … 353 353 v = 0x80; 354 354 355 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan setValue for row %d col %d to %lf (% ld)\n",355 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan setValue for row %d col %d to %lf (%d)\n", 356 356 row, col, val, v); 357 357 reg = getCellRegister(row,col); … … 387 387 val = ((val >> 8) & 0xff) - 0x40; 388 388 389 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan getValue for row %d col %d = % lu\n",389 debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan getValue for row %d col %d = %u\n", 390 390 row, col, val); 391 391 return val; … … 414 414 uint32_t v, reg; 415 415 416 debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw setValue for row %d col %d to %lf (% ld)\n",416 debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw setValue for row %d col %d to %lf (%d)\n", 417 417 row, col, val, val==0?0:1); 418 418 reg = getCellRegister(row,col); … … 460 460 val = (val & m_value_mask) != 0; 461 461 462 debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw getValue for row %d col %d = % lu\n",462 debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw getValue for row %d col %d = %u\n", 463 463 row, col, val); 464 464 return val; branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp
r1235 r1720 188 188 } 189 189 190 debugOutput(DEBUG_LEVEL_INFO, "Select 1394 port % d...\n", arguments.port);190 debugOutput(DEBUG_LEVEL_INFO, "Select 1394 port %ld...\n", arguments.port); 191 191 do 192 192 { … … 225 225 } 226 226 227 debugOutput(DEBUG_LEVEL_INFO, "Setting RT priority (% d)...\n", arguments.rtprio);227 debugOutput(DEBUG_LEVEL_INFO, "Setting RT priority (%ld)...\n", arguments.rtprio); 228 228 set_realtime_priority(arguments.rtprio); 229 229