Changeset 1134 for trunk/libffado/src/libieee1394
- Timestamp:
- 05/08/08 01:38:46 (16 years ago)
- Files:
-
- trunk/libffado/src/libieee1394/ARMHandler.h (modified) (1 diff)
- trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (8 diffs)
- trunk/libffado/src/libieee1394/ieee1394service.h (modified) (1 diff)
- trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libieee1394/ARMHandler.h
r1131 r1134 64 64 65 65 nodeaddr_t getStart() {return m_start;}; 66 size_t getLength() {return m_length;};66 nodeaddr_t getLength() {return m_length;}; 67 67 unsigned int getAccessRights() {return m_access_rights;}; 68 68 unsigned int getNotificationOptions() {return m_notification_options;}; trunk/libffado/src/libieee1394/ieee1394service.cpp
r1131 r1134 39 39 40 40 #include <errno.h> 41 #include < byteswap.h>41 #include <netinet/in.h> 42 42 43 43 #include <string.h> … … 388 388 CSR_REGISTER_BASE | CSR_CYCLE_TIME, 389 389 sizeof(uint32_t), cycle_timer ) == 0 ) { 390 *cycle_timer = bswap_32(*cycle_timer);390 *cycle_timer = ntohl(*cycle_timer); 391 391 return true; 392 392 } else { … … 479 479 return write( nodeId, addr, sizeof( data )/4, 480 480 reinterpret_cast<fb_quadlet_t*>( &data ) ); 481 } 482 483 fb_octlet_t 484 Ieee1394Service::byteSwap_octlet(fb_octlet_t value) { 485 #if __BYTE_ORDER == __BIG_ENDIAN 486 return value; 487 #elif __BYTE_ORDER == __LITTLE_ENDIAN 488 fb_quadlet_t in_hi = (value >> 32) & 0xFFFFFFFF; 489 fb_quadlet_t in_lo = value & 0xFFFFFFFF; 490 in_hi = htonl(in_hi); 491 in_lo = htonl(in_lo); 492 fb_octlet_t value_new = in_lo; 493 value_new <<= 32; 494 value_new |= in_hi; 495 return value_new; 496 #else 497 #error Unknown endiannes 498 #endif 481 499 } 482 500 … … 502 520 503 521 // do endiannes swapping 504 compare_value = b swap_64(compare_value);505 swap_value = b swap_64(swap_value);522 compare_value = byteSwap_octlet(compare_value); 523 swap_value = byteSwap_octlet(swap_value); 506 524 507 525 // do separate locking here (no MutexLockHelper) since … … 525 543 #endif 526 544 527 *result = b swap_64(*result);545 *result = byteSwap_octlet(*result); 528 546 529 547 return (retval == 0); … … 539 557 m_handle_lock->Lock(); 540 558 for (int i = 0; i < len; ++i) { 541 buf[i] = bswap_32( buf[i] );559 buf[i] = ntohl( buf[i] ); 542 560 } 543 561 … … 551 569 552 570 for ( unsigned int i = 0; i < *resp_len; ++i ) { 553 result[i] = bswap_32( result[i] );571 result[i] = htonl( result[i] ); 554 572 } 555 573 … … 1096 1114 if (result < 0) 1097 1115 return -1; 1098 return bswap_32(buffer);1116 return ntohl(buffer); 1099 1117 } 1100 1118 trunk/libffado/src/libieee1394/ieee1394service.h
r1131 r1134 345 345 arm_handler_vec_t m_armHandlers; 346 346 347 fb_octlet_t byteSwap_octlet(fb_octlet_t value); 348 347 349 public: 348 350 void setVerboseLevel(int l); trunk/libffado/src/libieee1394/IsoHandler.cpp
r1131 r1134 34 34 35 35 #include <errno.h> 36 #include < byteswap.h>36 #include <netinet/in.h> 37 37 #include <assert.h> 38 38 #include <unistd.h>