Changeset 374
- Timestamp:
- 01/14/07 18:55:23 (17 years ago)
- Files:
-
- trunk/libfreebob/src/libfreebobavc/ieee1394service.cpp (modified) (1 diff)
- trunk/libfreebob/src/motu/motu_avdevice.cpp (modified) (4 diffs)
- trunk/libfreebob/src/rme/rme_avdevice.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libfreebob/src/libfreebobavc/ieee1394service.cpp
r340 r374 282 282 Ieee1394Service::startRHThread() 283 283 { 284 int i; 285 284 286 if ( m_threadRunning ) { 285 287 return true; 286 288 } 287 289 pthread_mutex_lock( &m_mutex ); 288 pthread_create( &m_thread, 0, rHThread, this );290 i = pthread_create( &m_thread, 0, rHThread, this ); 289 291 pthread_mutex_unlock( &m_mutex ); 292 if (i) { 293 debugFatal("Could not start ieee1394 service thread\n"); 294 return false; 295 } 290 296 m_threadRunning = true; 291 297 trunk/libfreebob/src/motu/motu_avdevice.cpp
r373 r374 582 582 case 0: 583 583 // TODO: do the stuff that is nescessary to make the device 584 // transmita stream584 // receive a stream 585 585 586 586 // Set the streamprocessor channel to the one obtained by … … 599 599 case 1: 600 600 // TODO: do the stuff that is nescessary to make the device 601 // receivea stream601 // transmit a stream 602 602 603 603 // Set the streamprocessor channel to the one obtained by … … 911 911 quadlet = 0; 912 912 // Note: 1394Service::read() expects a physical ID, not the node id 913 if (m_1394Service->read(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 4, &quadlet) < 0) {913 if (m_1394Service->read(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 1, &quadlet) < 0) { 914 914 debugError("Error doing motu read from register 0x%06x\n",reg); 915 915 } … … 927 927 928 928 // Note: 1394Service::write() expects a physical ID, not the node id 929 if (m_1394Service->write(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 4, &data) < 0) {929 if (m_1394Service->write(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 1, &data) < 0) { 930 930 err = 1; 931 931 debugError("Error doing motu write to register 0x%06x\n",reg); trunk/libfreebob/src/rme/rme_avdevice.cpp
r373 r374 520 520 quadlet = 0; 521 521 // Note: 1394Service::read() expects a physical ID, not the node id 522 if (m_1394Service->read(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 4, &quadlet) < 0) {522 if (m_1394Service->read(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 1, &quadlet) < 0) { 523 523 debugError("Error doing rme read from register 0x%06x\n",reg); 524 524 } … … 536 536 537 537 // Note: 1394Service::write() expects a physical ID, not the node id 538 if (m_1394Service->write(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 4, &data) < 0) {538 if (m_1394Service->write(0xffc0 | m_nodeId, MOTUFW_BASE_ADDR+reg, 1, &data) < 0) { 539 539 err = 1; 540 540 debugError("Error doing rme write to register 0x%06x\n",reg);