Changeset 2651 for trunk/libffado/src/libieee1394/ieee1394service.cpp
- Timestamp:
- 11/11/16 02:53:52 (7 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libieee1394/ieee1394service.cpp
r2419 r2651 137 137 ++it ) 138 138 { 139 debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler for 0x%016" PRIX64"\n", (*it)->getStart());139 debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler for 0x%016" PRIX64 "\n", (*it)->getStart()); 140 140 if(m_armHelperNormal) { 141 141 int err = raw1394_arm_unregister(m_armHelperNormal->get1394Handle(), (*it)->getStart()); 142 142 if (err) { 143 debugError(" Failed to unregister ARM handler for 0x%016" PRIX64"\n", (*it)->getStart());143 debugError(" Failed to unregister ARM handler for 0x%016" PRIX64 "\n", (*it)->getStart()); 144 144 debugError(" Error: %s\n", strerror(errno)); 145 145 } … … 604 604 #ifdef DEBUG 605 605 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, 606 "read: node 0x%hX, addr = 0x%016" PRIX64", length = %zd\n",606 "read: node 0x%hX, addr = 0x%016" PRIX64 ", length = %zd\n", 607 607 nodeId, addr, length); 608 608 printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, buffer ); … … 613 613 #ifdef DEBUG 614 614 debugOutput(DEBUG_LEVEL_VERBOSE, 615 "raw1394_read failed: node 0x%hX, addr = 0x%016" PRIX64", length = %zd\n",615 "raw1394_read failed: node 0x%hX, addr = 0x%016" PRIX64 ", length = %zd\n", 616 616 nodeId, addr, length); 617 617 #endif … … 659 659 660 660 #ifdef DEBUG 661 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"write: node 0x%hX, addr = 0x%016" PRIX64", length = %zd\n",661 debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"write: node 0x%hX, addr = 0x%016" PRIX64 ", length = %zd\n", 662 662 nodeId, addr, length); 663 663 printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, data ); … … 696 696 } 697 697 #ifdef DEBUG 698 debugOutput(DEBUG_LEVEL_VERBOSE,"lockCompareSwap64: node 0x%X, addr = 0x%016" PRIX64"\n",698 debugOutput(DEBUG_LEVEL_VERBOSE,"lockCompareSwap64: node 0x%X, addr = 0x%016" PRIX64 "\n", 699 699 nodeId, addr); 700 debugOutput(DEBUG_LEVEL_VERBOSE," if (*(addr)==0x%016" PRIX64") *(addr)=0x%016"PRIX64"\n",700 debugOutput(DEBUG_LEVEL_VERBOSE," if (*(addr)==0x%016" PRIX64 ") *(addr)=0x%016" PRIX64 "\n", 701 701 compare_value, swap_value); 702 702 fb_octlet_t buffer; … … 704 704 debugWarning("Could not read register\n"); 705 705 } else { 706 debugOutput(DEBUG_LEVEL_VERBOSE,"before = 0x%016" PRIX64"\n", buffer);706 debugOutput(DEBUG_LEVEL_VERBOSE,"before = 0x%016" PRIX64 "\n", buffer); 707 707 } 708 708 #endif … … 728 728 debugWarning("Could not read register\n"); 729 729 } else { 730 debugOutput(DEBUG_LEVEL_VERBOSE,"after = 0x%016" PRIX64"\n", buffer);730 debugOutput(DEBUG_LEVEL_VERBOSE,"after = 0x%016" PRIX64 "\n", buffer); 731 731 } 732 732 #endif … … 1122 1122 bool Ieee1394Service::registerARMHandler(ARMHandler *h) { 1123 1123 debugOutput(DEBUG_LEVEL_VERBOSE, 1124 "Registering ARM handler (%p) for 0x%016" PRIX64", length %zu\n",1124 "Registering ARM handler (%p) for 0x%016" PRIX64 ", length %zu\n", 1125 1125 h, h->getStart(), h->getLength()); 1126 1126 … … 1132 1132 h->getClientTransactions()); 1133 1133 if (err) { 1134 debugError("Failed to register ARM handler for 0x%016" PRIX64"\n", h->getStart());1134 debugError("Failed to register ARM handler for 0x%016" PRIX64 "\n", h->getStart()); 1135 1135 debugError(" Error: %s\n", strerror(errno)); 1136 1136 return false; … … 1141 1141 1142 1142 bool Ieee1394Service::unregisterARMHandler( ARMHandler *h ) { 1143 debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler (%p) for 0x%016" PRIX64"\n",1143 debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler (%p) for 0x%016" PRIX64 "\n", 1144 1144 h, h->getStart()); 1145 1145 … … 1173 1173 nodeaddr_t Ieee1394Service::findFreeARMBlock( nodeaddr_t start, size_t length, size_t step ) { 1174 1174 debugOutput(DEBUG_LEVEL_VERBOSE, 1175 "Finding free ARM block of %zd bytes, from 0x%016" PRIX64" in steps of %zd bytes\n",1175 "Finding free ARM block of %zd bytes, from 0x%016" PRIX64 " in steps of %zd bytes\n", 1176 1176 length, start, step); 1177 1177 … … 1185 1185 1186 1186 if (err) { 1187 debugOutput(DEBUG_LEVEL_VERBOSE, " -> cannot use 0x%016" PRIX64"\n", start);1187 debugOutput(DEBUG_LEVEL_VERBOSE, " -> cannot use 0x%016" PRIX64 "\n", start); 1188 1188 debugError(" Error: %s\n", strerror(errno)); 1189 1189 start += step; 1190 1190 } else { 1191 debugOutput(DEBUG_LEVEL_VERBOSE, " -> use 0x%016" PRIX64"\n", start);1191 debugOutput(DEBUG_LEVEL_VERBOSE, " -> use 0x%016" PRIX64 "\n", start); 1192 1192 err = raw1394_arm_unregister(m_handle, start); 1193 1193 if (err) { … … 1238 1238 raw1394_arm_response_t arm_resp = arm_req_resp->response; 1239 1239 1240 debugOutput(DEBUG_LEVEL_VERBOSE,"ARM handler for address 0x%016" PRIX64" called\n",1240 debugOutput(DEBUG_LEVEL_VERBOSE,"ARM handler for address 0x%016" PRIX64 " called\n", 1241 1241 (*it)->getStart()); 1242 1242 debugOutput(DEBUG_LEVEL_VERBOSE," request type : 0x%02X\n", request_type); … … 1634 1634 debugOutput( DEBUG_LEVEL_VERBOSE, " CycleTimerHelper: %p, IsoManager: %p, WatchDog: %p\n", 1635 1635 m_pCTRHelper, m_pIsoManager, m_pWatchdog ); 1636 debugOutput( DEBUG_LEVEL_VERBOSE, " Time: %011" PRIu64" (%03us %04ucy %04uticks)\n",1636 debugOutput( DEBUG_LEVEL_VERBOSE, " Time: %011" PRIu64 " (%03us %04ucy %04uticks)\n", 1637 1637 ctr, 1638 1638 (unsigned int)TICKS_TO_SECS( ctr ),