Changeset 583 for trunk/libffado/src/dice/dice_avdevice.cpp
- Timestamp:
- 08/29/07 02:19:04 (17 years ago)
- Files:
-
- trunk/libffado/src/dice/dice_avdevice.cpp (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/dice/dice_avdevice.cpp
r554 r583 51 51 }; 52 52 53 DiceAvDevice::DiceAvDevice( std::auto_ptr< ConfigRom >( configRom ), 54 Ieee1394Service& ieee1394service, 55 int nodeId ) 56 : FFADODevice( configRom, ieee1394service, nodeId ) 53 DiceAvDevice::DiceAvDevice( Ieee1394Service& ieee1394Service, 54 std::auto_ptr<ConfigRom>( configRom )) 55 : FFADODevice( ieee1394Service, configRom ) 57 56 , m_model( NULL ) 58 57 , m_global_reg_offset (0xFFFFFFFFLU) … … 73 72 { 74 73 debugOutput( DEBUG_LEVEL_VERBOSE, "Created Dice::DiceAvDevice (NodeID %d)\n", 75 nodeId);74 configRom->getNodeId() ); 76 75 77 76 } … … 105 104 106 105 return false; 106 } 107 108 FFADODevice * 109 DiceAvDevice::createDevice( Ieee1394Service& ieee1394Service, 110 std::auto_ptr<ConfigRom>( configRom )) 111 { 112 return new DiceAvDevice(ieee1394Service, configRom ); 107 113 } 108 114 … … 282 288 debugOutput(DEBUG_LEVEL_VERBOSE, 283 289 "%s %s at node %d\n", m_model->vendor_name, m_model->model_name, 284 m_nodeId);290 getNodeId()); 285 291 286 292 debugOutput(DEBUG_LEVEL_VERBOSE," DICE Parameter Space info:\n"); … … 666 672 667 673 debugOutput(DEBUG_LEVEL_VERBOSE, "Locking %s %s at node %d\n", 668 m_model->vendor_name, m_model->model_name, m_nodeId);674 m_model->vendor_name, m_model->model_name, getNodeId()); 669 675 670 676 // get a notifier to handle device notifications … … 710 716 swap_value |= m_notifier->getStart(); 711 717 712 if (!m_p1394Service->lockCompareSwap64( m_nodeId| 0xFFC0, addr, DICE_OWNER_NO_OWNER,718 if (!m_p1394Service->lockCompareSwap64( getNodeId() | 0xFFC0, addr, DICE_OWNER_NO_OWNER, 713 719 swap_value, &result )) { 714 720 debugWarning("Could not register ourselves as device owner\n"); … … 747 753 compare_value |= m_notifier->getStart(); 748 754 749 if (!m_p1394Service->lockCompareSwap64( m_nodeId| 0xFFC0, addr, compare_value,755 if (!m_p1394Service->lockCompareSwap64( getNodeId() | 0xFFC0, addr, compare_value, 750 756 DICE_OWNER_NO_OWNER, &result )) { 751 757 debugWarning("Could not unregister ourselves as device owner\n"); … … 1202 1208 1203 1209 fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset; 1204 fb_nodeid_t nodeId= m_nodeId| 0xFFC0;1210 fb_nodeid_t nodeId=getNodeId() | 0xFFC0; 1205 1211 1206 1212 if(!m_p1394Service->read_quadlet( nodeId, addr, result ) ) { … … 1227 1233 1228 1234 fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset; 1229 fb_nodeid_t nodeId= m_nodeId| 0xFFC0;1235 fb_nodeid_t nodeId=getNodeId() | 0xFFC0; 1230 1236 1231 1237 if(!m_p1394Service->write_quadlet( nodeId, addr, htonl(data) ) ) { … … 1247 1253 1248 1254 fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset; 1249 fb_nodeid_t nodeId= m_nodeId| 0xFFC0;1255 fb_nodeid_t nodeId=getNodeId() | 0xFFC0; 1250 1256 1251 1257 if(!m_p1394Service->read( nodeId, addr, length/4, data ) ) { … … 1272 1278 1273 1279 fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset; 1274 fb_nodeid_t nodeId= m_nodeId| 0xFFC0;1280 fb_nodeid_t nodeId=getNodeId() | 0xFFC0; 1275 1281 1276 1282 fb_quadlet_t data_out[length/4];