Changeset 374

Show
Ignore:
Timestamp:
01/14/07 18:55:23 (16 years ago)
Author:
jwoithe
Message:

More adjustments to make MOTU devices actually work again.
Make MOTU and RME work again now that ieee1394service's read/write functions interpret their length argument in quadlets rather than bytes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libfreebob/src/libfreebobavc/ieee1394service.cpp

    r340 r374  
    282282Ieee1394Service::startRHThread() 
    283283{ 
     284    int i; 
     285 
    284286    if ( m_threadRunning ) { 
    285287        return true; 
    286288    } 
    287289    pthread_mutex_lock( &m_mutex ); 
    288     pthread_create( &m_thread, 0, rHThread, this ); 
     290    i = pthread_create( &m_thread, 0, rHThread, this ); 
    289291    pthread_mutex_unlock( &m_mutex ); 
     292    if (i) { 
     293        debugFatal("Could not start ieee1394 service thread\n"); 
     294        return false; 
     295    } 
    290296    m_threadRunning = true; 
    291297 

  • trunk/libfreebob/src/motu/motu_avdevice.cpp

    r373 r374  
    582582        case 0: 
    583583                // TODO: do the stuff that is nescessary to make the device 
    584                 // transmit a stream 
     584                // receive a stream 
    585585 
    586586                // Set the streamprocessor channel to the one obtained by  
    …… 
    599599        case 1: 
    600600                // TODO: do the stuff that is nescessary to make the device 
    601                 // receive a stream 
     601                // transmit a stream 
    602602 
    603603                // Set the streamprocessor channel to the one obtained by  
    …… 
    911911  quadlet = 0; 
    912912  // 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) { 
    914914    debugError("Error doing motu read from register 0x%06x\n",reg); 
    915915  } 
    …… 
    927927 
    928928  // 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) { 
    930930    err = 1; 
    931931    debugError("Error doing motu write to register 0x%06x\n",reg); 

  • trunk/libfreebob/src/rme/rme_avdevice.cpp

    r373 r374  
    520520  quadlet = 0; 
    521521  // 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) { 
    523523    debugError("Error doing rme read from register 0x%06x\n",reg); 
    524524  } 
    …… 
    536536 
    537537  // 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) { 
    539539    err = 1; 
    540540    debugError("Error doing rme write to register 0x%06x\n",reg);