Changeset 1245
- Timestamp:
- 06/05/08 11:45:16 (16 years ago)
- Files:
-
- trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (8 diffs)
- trunk/libffado/src/bebob/bebob_avdevice.h (modified) (2 diffs)
- trunk/libffado/src/bebob/bebob_avplug.cpp (modified) (1 diff)
- trunk/libffado/src/bebob/bebob_avplug.h (modified) (1 diff)
- trunk/libffado/src/bebob/terratec/terratec_device.cpp (modified) (1 diff)
- trunk/libffado/src/bebob/terratec/terratec_device.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/bebob/bebob_avdevice.cpp
r1239 r1245 410 410 AVC::Plug::EPlugAddressType plugAddressType, 411 411 AVC::Plug::EPlugDirection plugDirection, 412 AVC::plug_id_t plugId ) 412 AVC::plug_id_t plugId, 413 int globalId ) 413 414 { 414 415 … … 419 420 plugAddressType, 420 421 plugDirection, 421 plugId ); 422 plugId, 423 globalId ); 422 424 if (p) p->setVerboseLevel(getDebugLevel()); 423 425 return p; … … 448 450 if ( !extStreamFormatCmd.fire() ) { 449 451 debugError( "Stream format command failed\n" ); 450 return false;452 return 0; 451 453 } 452 454 … … 471 473 ExtendedPlugInfoCmd extPlugInfoCmd( get1394Service() ); 472 474 UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR, 473 getNodeId());475 0 ); 474 476 extPlugInfoCmd.setPlugAddress( PlugAddress( ePlugDirection, 475 477 PlugAddress::ePAM_Unit, … … 485 487 if ( !extPlugInfoCmd.fire() ) { 486 488 debugError( "Number of channels command failed\n" ); 487 return false;489 return 0; 488 490 } 489 491 … … 501 503 } 502 504 503 uint 8_t505 uint16_t 504 506 AvDevice::getConfigurationIdSyncMode() 505 507 { … … 517 519 if ( !signalSourceCmd.fire() ) { 518 520 debugError( "Signal source command failed\n" ); 519 return false;521 return 0; 520 522 } 521 523 … … 553 555 uint64_t id = 0; 554 556 id = getConfigurationIdSampleRate(); 555 id |= ( getConfigurationIdNumberOfChannel( PlugAddress::ePD_Input ) 556 + getConfigurationIdNumberOfChannel( PlugAddress::ePD_Output ) ) << 8; 557 id |= getConfigurationIdSyncMode() << 16; 558 557 id |= getConfigurationIdNumberOfChannel( PlugAddress::ePD_Input ) << 8; 558 id |= getConfigurationIdNumberOfChannel( PlugAddress::ePD_Output ) << 16; 559 id |= ((uint64_t)getConfigurationIdSyncMode()) << 24; 559 560 return id; 560 561 } trunk/libffado/src/bebob/bebob_avdevice.h
r1239 r1245 79 79 AVC::Plug::EPlugAddressType plugAddressType, 80 80 AVC::Plug::EPlugDirection plugDirection, 81 AVC::plug_id_t plugId ); 81 AVC::plug_id_t plugId, 82 int globalId = -1 ); 82 83 83 84 virtual int getSelectorFBValue(int id); … … 105 106 virtual uint8_t getConfigurationIdSampleRate(); 106 107 virtual uint8_t getConfigurationIdNumberOfChannel( AVC::PlugAddress::EPlugDirection ePlugDirection ); 107 virtual uint 8_t getConfigurationIdSyncMode();108 virtual uint16_t getConfigurationIdSyncMode(); 108 109 109 110 protected: trunk/libffado/src/bebob/bebob_avplug.cpp
r864 r1245 49 49 plugDirection, 50 50 plugId ) 51 { 52 debugOutput( DEBUG_LEVEL_VERBOSE, 53 "nodeId = %d, subunitType = %d, " 54 "subunitId = %d, functionBlockType = %d, " 55 "functionBlockId = %d, addressType = %d, " 56 "direction = %d, id = %d\n", 57 unit->getConfigRom().getNodeId(), 58 getSubunitType(), 59 getSubunitId(), 60 functionBlockType, 61 functionBlockId, 62 plugAddressType, 63 plugDirection, 64 plugId ); 65 } 66 67 Plug::Plug( AVC::Unit* unit, 68 AVC::Subunit* subunit, 69 AVC::function_block_type_t functionBlockType, 70 AVC::function_block_type_t functionBlockId, 71 AVC::Plug::EPlugAddressType plugAddressType, 72 AVC::Plug::EPlugDirection plugDirection, 73 AVC::plug_id_t plugId, 74 int globalId ) 75 : AVC::Plug( unit, 76 subunit, 77 functionBlockType, 78 functionBlockId, 79 plugAddressType, 80 plugDirection, 81 plugId, 82 globalId ) 51 83 { 52 84 debugOutput( DEBUG_LEVEL_VERBOSE, trunk/libffado/src/bebob/bebob_avplug.h
r1154 r1245 55 55 AVC::Plug::EPlugDirection plugDirection, 56 56 AVC::plug_id_t plugId ); 57 Plug( AVC::Unit* unit, 58 AVC::Subunit* subunit, 59 AVC::function_block_type_t functionBlockType, 60 AVC::function_block_type_t functionBlockId, 61 AVC::Plug::EPlugAddressType plugAddressType, 62 AVC::Plug::EPlugDirection plugDirection, 63 AVC::plug_id_t plugId, 64 int globalId ); 57 65 Plug( const Plug& rhs ); 58 66 virtual ~Plug(); trunk/libffado/src/bebob/terratec/terratec_device.cpp
r1234 r1245 121 121 } 122 122 123 uint 8_t123 uint16_t 124 124 Phase88Device::getConfigurationIdSyncMode() 125 125 { trunk/libffado/src/bebob/terratec/terratec_device.h
r1175 r1245 46 46 47 47 protected: 48 virtual uint 8_t getConfigurationIdSyncMode();48 virtual uint16_t getConfigurationIdSyncMode(); 49 49 50 50 private: