Changeset 436

Timestamp:

03/11/07 12:50:16 (17 years ago)

Author:

pieterpalmers

Message:

- fixed verbose level setting
- debugged DICE code, works with EVM

Files:

• branches/streaming-rework/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/bounce/bounce_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/devicemanager.cpp (modified) (8 diffs)
• branches/streaming-rework/src/devicemanager.h (modified) (2 diffs)
• branches/streaming-rework/src/dice/dice_avdevice.cpp (modified) (31 diffs)
• branches/streaming-rework/src/dice/dice_avdevice.h (modified) (3 diffs)
• branches/streaming-rework/src/dice/dice_defines.h (modified) (4 diffs)
• branches/streaming-rework/src/freebob-downloader.cpp (modified) (1 diff)
• branches/streaming-rework/src/freebob-sync.cpp (modified) (1 diff)
• branches/streaming-rework/src/freebob.cpp (modified) (2 diffs)
• branches/streaming-rework/src/freebob_streaming.cpp (modified) (4 diffs)
• branches/streaming-rework/src/iavdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/iavdevice.h (modified) (2 diffs)
• branches/streaming-rework/src/libieee1394/ieee1394service.cpp (modified) (4 diffs)
• branches/streaming-rework/src/libieee1394/ieee1394service.h (modified) (3 diffs)
• branches/streaming-rework/src/libosc/OscNode.cpp (modified) (1 diff)
• branches/streaming-rework/src/libosc/OscNode.h (modified) (1 diff)
• branches/streaming-rework/src/libosc/OscServer.cpp (modified) (1 diff)
• branches/streaming-rework/src/libosc/OscServer.h (modified) (1 diff)
• branches/streaming-rework/src/maudio/maudio_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/maudio/maudio_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/metrichalo/mh_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/metrichalo/mh_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/rme/rme_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/rme/rme_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/ser.cpp (modified) (1 diff)
• branches/streaming-rework/tests/test-freebob.cpp (modified) (4 diffs)
• branches/streaming-rework/tests/test-mixer.cpp (modified) (1 diff)
• branches/streaming-rework/tests/test-volume.cpp (modified) (2 diffs)

branches/streaming-rework/src/bebob/bebob_avdevice.cpp

@@ -881 +881 @@
-
-void
- const
+
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE,

branches/streaming-rework/src/bebob/bebob_avdevice.h

@@ -79 +79 @@
-    bool stopStreamByIndex(int i);
-
- const
+
-
-    Ieee1394Service& get1394Service()

branches/streaming-rework/src/bounce/bounce_avdevice.cpp

@@ -150 +150 @@
-
-void
- const
+
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "\nI am the bouncedevice, the bouncedevice I am...\n" );

branches/streaming-rework/src/bounce/bounce_avdevice.h

@@ -87 +87 @@
-    bool stopStreamByIndex(int i);
-    
- const
+
-
-protected:

branches/streaming-rework/src/devicemanager.cpp

@@ -70 +70 @@
-    , m_1394Service( 0 )
-    , m_oscServer( NULL )
+    , m_verboseLevel( DEBUG_LEVEL_NORMAL )
-{
-    addOption(Util::OptionContainer::Option("slaveMode",false));
@@ -90 +91 @@
-
-    delete m_1394Service;
+}
+
+void
+DeviceManager::setVerboseLevel(int l) 
+{
+    m_verboseLevel=l;
+    setDebugLevel(l);
+    
+    if (m_1394Service) m_1394Service->setVerboseLevel(l);
+    if (m_oscServer) m_oscServer->setVerboseLevel(l);
+    OscNode::setVerboseLevel(l);
+    
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        (*it)->setVerboseLevel(l);
+    }
-}
-
@@ -143 +162 @@
-        return false;
-    }
-
+
+
-    return true;
-}
-
-bool
-int verboseLevel 
+
-{
-    bool slaveMode=false;
@@ -159 +179 @@
-    }
-
-
-
+
-
-    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
@@ -208 +227 @@
-                             nodeId );
-
-
+m_
-                
-                if ( !avDevice->discover() ) {
@@ -231 +250 @@
-                }
-                
-verboseLevel
+m_verboseLevel >= DEBUG_LEVEL_VERBOSE
-                    avDevice->showDevice();
-                }
@@ -271 +290 @@
-                         nodeId );
-            
-
+m_
-
-            if ( !avDevice->discover() ) {
@@ -282 +301 @@
-                debugError( "setting Id failed\n" );
-            }
-verboseLevel
+m_verboseLevel >= DEBUG_LEVEL_VERBOSE
-                avDevice->showDevice();
-            }
-            
-
-            m_avDevices.push_back( avDevice );

branches/streaming-rework/src/devicemanager.h

@@ -55 +55 @@
-    bool deinitialize();
-
-int verboseLevel 
+
-
-    bool isValidNode( int node );
@@ -80 +80 @@
-    
-    OSC::OscServer*  m_oscServer;
-
+
+
+
+
+
+
-    DECLARE_DEBUG_MODULE;
-};

branches/streaming-rework/src/dice/dice_avdevice.cpp

@@ -18 +18 @@
- * MA 02111-1307 USA.
- */
-#warning DICE support is currently untested
-
-#include "dice/dice_avdevice.h"
@@ -45 +44 @@
-static VendorModelEntry supportedDeviceList[] =
-{
-
+
+
-};
-
@@ -107 +107 @@
-DiceAvDevice::discover()
-{
-c
-c
+pC
+pC
-
-    for ( unsigned int i = 0;
@@ -171 +171 @@
-DiceAvDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency )
-{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Setting sample rate: %d\n", 
+        convertESamplingFrequency(samplingFrequency));
+        
-    bool supported=false;
-    fb_quadlet_t select=0x0;
@@ -239 +242 @@
-        return false;
-    }
-
+
-    clockreg = DICE_SET_RATE(clockreg, select);
-
+
-    if (!writeGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, clockreg)) {
-        debugError("Could not write CLOCK_SELECT register\n");
@@ -247 +250 @@
-    }
-
+    // check if the write succeeded
+    fb_quadlet_t clockreg_verify;
+    if (!readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clockreg_verify)) {
+        debugError("Could not read CLOCK_SELECT register\n");
+        return false;
+    }
+    
+    if(clockreg != clockreg_verify) {
+        debugError("Samplerate register write failed\n");
+        return false;
+    }
+    
-    return true;
-}
-
-void
- const
+
-{
+    fb_quadlet_t tmp_quadlet;
+    fb_octlet_t tmp_octlet;
+    
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-        "%s %s at node %d\n", m_model->vendor_name, m_model->model_name,
-        m_nodeId);
+
+    debugOutput(DEBUG_LEVEL_VERBOSE," DICE Parameter Space info:\n");
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Global  : offset=0x%04X size=%04d\n", m_global_reg_offset, m_global_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  TX      : offset=0x%04X size=%04d\n", m_tx_reg_offset, m_tx_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"                nb=%4d size=%04d\n", m_nb_tx, m_tx_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  RX      : offset=0x%04X size=%04d\n", m_rx_reg_offset, m_rx_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"                nb=%4d size=%04d\n", m_nb_rx, m_rx_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  UNUSED1 : offset=0x%04X size=%04d\n", m_unused1_reg_offset, m_unused1_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  UNUSED2 : offset=0x%04X size=%04d\n", m_unused2_reg_offset, m_unused2_reg_size);
+
+    debugOutput(DEBUG_LEVEL_VERBOSE," Global param space:\n");
+    
+    readGlobalRegBlock(DICE_REGISTER_GLOBAL_OWNER, (fb_quadlet_t *)&tmp_octlet,sizeof(fb_octlet_t));
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Owner            : 0x%016X\n",tmp_octlet);
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Notification     : 0x%08X\n",tmp_quadlet);
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Nick name        : %s\n",getDeviceNickName().c_str());
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock Select     : 0x%02X 0x%02X\n",
+        (tmp_quadlet>>8) & 0xFF, tmp_quadlet & 0xFF);
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_ENABLE, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Enable           : %s\n",
+        (tmp_quadlet&0x1?"true":"false"));
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_STATUS, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock Status     : %s 0x%02X\n",
+        (tmp_quadlet&0x1?"locked":"not locked"), (tmp_quadlet>>8) & 0xFF);
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Extended Status  : 0x%08X\n",tmp_quadlet);
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_SAMPLE_RATE, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Samplerate       : 0x%08X (%lu)\n",tmp_quadlet,tmp_quadlet);
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_VERSION, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Version          : 0x%08X (%u.%u.%u.%u)\n",
+        tmp_quadlet,
+        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_A(tmp_quadlet),
+        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_B(tmp_quadlet),
+        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_C(tmp_quadlet),
+        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_D(tmp_quadlet)
+        );
+    
+    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &tmp_quadlet);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock caps       : 0x%08X\n",tmp_quadlet & 0x1FFF007F);
+
+    diceNameVector names=getClockSourceNameString();
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock sources    :\n");
+    
+    for ( diceNameVectorIterator it = names.begin();
+          it != names.end();
+          ++it )
+    {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"    %s\n", (*it).c_str());
+    }
+    
+    debugOutput(DEBUG_LEVEL_VERBOSE," TX param space:\n");
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Nb of xmit        : %1d\n", m_nb_tx);
+    for (unsigned int i=0;i<m_nb_tx;i++) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"  Transmitter %d:\n",i);
+        
+        readTxReg(i, DICE_REGISTER_TX_ISOC_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   ISO channel       : %3d\n", tmp_quadlet);
+        readTxReg(i, DICE_REGISTER_TX_SPEED_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   ISO speed         : %3d\n", tmp_quadlet);
+        
+        readTxReg(i, DICE_REGISTER_TX_NB_AUDIO_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb audio channels : %3d\n", tmp_quadlet);
+        readTxReg(i, DICE_REGISTER_TX_MIDI_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb midi channels  : %3d\n", tmp_quadlet);
+        
+        readTxReg(i, DICE_REGISTER_TX_AC3_CAPABILITIES_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 caps          : 0x%08X\n", tmp_quadlet);
+        readTxReg(i, DICE_REGISTER_TX_AC3_ENABLE_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 enable        : 0x%08X\n", tmp_quadlet);
+        
+        diceNameVector channel_names=getTxNameString(i);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Channel names     :\n");
+        for ( diceNameVectorIterator it = channel_names.begin();
+            it != channel_names.end();
+            ++it )
+        {
+            debugOutput(DEBUG_LEVEL_VERBOSE,"     %s\n", (*it).c_str());
+        }
+    }
+    
+    debugOutput(DEBUG_LEVEL_VERBOSE," RX param space:\n");
+    debugOutput(DEBUG_LEVEL_VERBOSE,"  Nb of recv        : %1d\n", m_nb_tx);
+    for (unsigned int i=0;i<m_nb_rx;i++) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"  Receiver %d:\n",i);
+        
+        readTxReg(i, DICE_REGISTER_RX_ISOC_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   ISO channel       : %3d\n", tmp_quadlet);
+        readTxReg(i, DICE_REGISTER_RX_SEQ_START_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Sequence start    : %3d\n", tmp_quadlet);
+        
+        readTxReg(i, DICE_REGISTER_RX_NB_AUDIO_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb audio channels : %3d\n", tmp_quadlet);
+        readTxReg(i, DICE_REGISTER_RX_MIDI_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb midi channels  : %3d\n", tmp_quadlet);
+        
+        readTxReg(i, DICE_REGISTER_RX_AC3_CAPABILITIES_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 caps          : 0x%08X\n", tmp_quadlet);
+        readTxReg(i, DICE_REGISTER_RX_AC3_ENABLE_BASE, &tmp_quadlet);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 enable        : 0x%08X\n", tmp_quadlet);
+        
+        diceNameVector channel_names=getRxNameString(i);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"   Channel names     :\n");
+        for ( diceNameVectorIterator it = channel_names.begin();
+            it != channel_names.end();
+            ++it )
+        {
+            debugOutput(DEBUG_LEVEL_VERBOSE,"     %s\n", (*it).c_str());
+        }
+    }
-}
-
@@ -264 +402 @@
-// Currently we assume the following.
-//   * Ack/iso gap = 0.05 us
-
+1
-//   * DATA_END    = 0.26 us
-// These numbers are the worst-case figures given in the ieee1394
@@ -334 +472 @@
-        for (unsigned int j=0;j<nb_audio;j++) {
-            diceChannelInfo channelInfo;
-i
+j
-            channelInfo.portType=ePT_Analog;
-            channelInfo.streamPosition=j;
@@ -349 +487 @@
-        for (unsigned int j=0;j<nb_midi;j++) {
-            diceChannelInfo channelInfo;
-i
+j
-            channelInfo.portType=ePT_MIDI;
-            channelInfo.streamPosition=nb_audio;
@@ -421 +559 @@
-        for (unsigned int j=0;j<nb_audio;j++) {
-            diceChannelInfo channelInfo;
-i
+j
-            channelInfo.portType=ePT_Analog;
-            channelInfo.streamPosition=j;
@@ -436 +574 @@
-        for (unsigned int j=0;j<nb_midi;j++) {
-            diceChannelInfo channelInfo;
-i
+j
-            channelInfo.portType=ePT_MIDI;
-            channelInfo.streamPosition=nb_audio;
@@ -465 +603 @@
-
-    std::ostringstream portname;
-
+
+
+
+
+
+
+
+
-
-    Streaming::Port *p=NULL;
@@ -552 +697 @@
-    }
-    
-
+
+
-    swap_value |= m_notifier->getStart();
-    
-
+ | 0xFFC0
-                                       swap_value, &result )) {
-        debugWarning("Could not register ourselves as device owner\n");
+    }
+    
+    if (result != DICE_OWNER_NO_OWNER) {
+        debugWarning("Could not register ourselves as device owner, unexpected register value: 0x%016llX\n", result);
-    }
-
@@ -584 +734 @@
-    }
-    
-
+
+
-    compare_value |= m_notifier->getStart();
-    
-
+ | 0xFFC0
-                                       DICE_OWNER_NO_OWNER, &result )) {
-        debugWarning("Could not unregister ourselves as device owner\n");
@@ -597 +748 @@
-
-    return true;
+}
+
+bool
+DiceAvDevice::enableStreaming() {
+    return enableIsoStreaming();
+}
+
+bool
+DiceAvDevice::disableStreaming() {
+    return disableIsoStreaming();
-}
-
@@ -845 +1006 @@
-DiceAvDevice::getTxNameString(unsigned int i) {
-    diceNameVector names;
-*4
+
-    
-    if (!readTxRegBlock(i, DICE_REGISTER_TX_NAMES_BASE, 
-*4
+
-        debugError("Could not read TX name string \n");
-        return names;
-    }
-    
-*4
+
-    return splitNameString(std::string(namestring));
-}
@@ -860 +1021 @@
-DiceAvDevice::getRxNameString(unsigned int i) {
-    diceNameVector names;
-*4
+
-    
-    if (!readRxRegBlock(i, DICE_REGISTER_RX_NAMES_BASE, 
-*4
+
-        debugError("Could not read RX name string \n");
-        return names;
-    }
-    
-*4
+
-    return splitNameString(std::string(namestring));
-}
@@ -875 +1036 @@
-DiceAvDevice::getClockSourceNameString() {
-    diceNameVector names;
-*4
+
-    
-    if (!readGlobalRegBlock(DICE_REGISTER_GLOBAL_CLOCKSOURCENAMES, 
-*4
+
-        debugError("Could not read CLOCKSOURCE name string \n");
-        return names;
-    }
-    
-*4
+
-    return splitNameString(std::string(namestring));
-}
@@ -889 +1050 @@
-std::string
-DiceAvDevice::getDeviceNickName() {
-*4
+
-    
-    if (!readGlobalRegBlock(DICE_REGISTER_GLOBAL_NICK_NAME, 
-*4
+
-        debugError("Could not read nickname string \n");
-        return std::string("(unknown)");
-    }
-    
-*4
+
-    return std::string(namestring);
-}
@@ -906 +1067 @@
-
-    // find the end of the string
-_first_of("\\\\"
+(string("\\\\")
-    // cut the end
--2
+
-
-    unsigned int cut;
-_first_of("\\"
+(string("\\")
-        if(cut > 0) {
-            names.push_back(in.substr(0,cut));
@@ -928 +1089 @@
-DiceAvDevice::initIoFunctions() {
-
+    // offsets and sizes are returned in quadlets, but we use byte values
+
-    if(!readReg(DICE_REGISTER_GLOBAL_PAR_SPACE_OFF, &m_global_reg_offset)) {
-        debugError("Could not initialize m_global_reg_offset\n");
-        return false;
-    }
+    m_global_reg_offset*=4;
+    
-    if(!readReg(DICE_REGISTER_GLOBAL_PAR_SPACE_SZ, &m_global_reg_size)) {
-        debugError("Could not initialize m_global_reg_size\n");
-        return false;
-    }
+    m_global_reg_size*=4;
+    
-    if(!readReg(DICE_REGISTER_TX_PAR_SPACE_OFF, &m_tx_reg_offset)) {
-        debugError("Could not initialize m_tx_reg_offset\n");
-        return false;
-    }
+    m_tx_reg_offset*=4;
+    
-    if(!readReg(DICE_REGISTER_TX_PAR_SPACE_SZ, &m_tx_reg_size)) {
-        debugError("Could not initialize m_tx_reg_size\n");
-        return false;
-    }
+    m_tx_reg_size*=4;
+    
-    if(!readReg(DICE_REGISTER_RX_PAR_SPACE_OFF, &m_rx_reg_offset)) {
-        debugError("Could not initialize m_rx_reg_offset\n");
-        return false;
-    }
+    m_rx_reg_offset*=4;
+    
-    if(!readReg(DICE_REGISTER_RX_PAR_SPACE_SZ, &m_rx_reg_size)) {
-        debugError("Could not initialize m_rx_reg_size\n");
-        return false;
-    }
+    m_rx_reg_size*=4;
+    
-    if(!readReg(DICE_REGISTER_UNUSED1_SPACE_OFF, &m_unused1_reg_offset)) {
-        debugError("Could not initialize m_unused1_reg_offset\n");
-        return false;
-    }
+    m_unused1_reg_offset*=4;
+    
-    if(!readReg(DICE_REGISTER_UNUSED1_SPACE_SZ, &m_unused1_reg_size)) {
-        debugError("Could not initialize m_unused1_reg_size\n");
-        return false;
-    }
+    m_unused1_reg_size*=4;
+    
-    if(!readReg(DICE_REGISTER_UNUSED2_SPACE_OFF, &m_unused2_reg_offset)) {
-        debugError("Could not initialize m_unused2_reg_offset\n");
-        return false;
-    }
+    m_unused2_reg_offset*=4;
+    
-    if(!readReg(DICE_REGISTER_UNUSED2_SPACE_SZ, &m_unused2_reg_size)) {
-        debugError("Could not initialize m_unused2_reg_size\n");
-        return false;
-    }
+    m_unused2_reg_size*=4;
-
-    if(!readReg(m_tx_reg_offset + DICE_REGISTER_TX_NB_TX, &m_nb_tx)) {
@@ -977 +1159 @@
-        return false;
-    }
+    m_tx_size*=4;
+    
-    if(!readReg(m_tx_reg_offset + DICE_REGISTER_RX_NB_RX, &m_nb_rx)) {
-        debugError("Could not initialize m_nb_rx\n");
@@ -985 +1169 @@
-        return false;
-    }
+    m_rx_size*=4;
+    
+    debugOutput(DEBUG_LEVEL_VERBOSE,"DICE Parameter Space info:\n");
+    debugOutput(DEBUG_LEVEL_VERBOSE," Global  : offset=%04X size=%04d\n", m_global_reg_offset, m_global_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE," TX      : offset=%04X size=%04d\n", m_tx_reg_offset, m_tx_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"               nb=%4d size=%04d\n", m_nb_tx, m_tx_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE," RX      : offset=%04X size=%04d\n", m_rx_reg_offset, m_rx_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"               nb=%4d size=%04d\n", m_nb_rx, m_rx_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE," UNUSED1 : offset=%04X size=%04d\n", m_unused1_reg_offset, m_unused1_reg_size);
+    debugOutput(DEBUG_LEVEL_VERBOSE," UNUSED2 : offset=%04X size=%04d\n", m_unused2_reg_offset, m_unused2_reg_size);
-    
-    return true;
@@ -1005 +1199 @@
-        return false;
-    }
+    
+    *result=ntohl(*result);
+    
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", *result);
-   
@@ -1023 +1220 @@
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-    
-data
+htonl(data)
-        debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr);
-        return false;
@@ -1043 +1240 @@
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-    
-
+/4
-        debugError("Could not read from node 0x%04X addr 0x%012llX\n", nodeId, addr);
-        return false;
-    }
+    
+    for(unsigned int i=0;i<length/4;i++) {
+        *(data+i)=ntohl(*(data+i));
+    }
+    
-    return true;
-}
@@ -1062 +1264 @@
-    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
-
+
+
+
+
+
+
+
+
-        debugError("Could not write to node 0x%04X addr 0x%012llX\n", nodeId, addr);
-        return false;
-    }
+    
-    return true;
-}
@@ -1115 +1324 @@
-    }
-    // out-of-range check
- + length > 
++length > m_global_reg_offset+
-        debugError("register offset+length too large: 0x%0llX\n", offset + length);
-        return DICE_INVALID_OFFSET;
@@ -1174 +1383 @@
-        return DICE_INVALID_OFFSET;
-    }
-r
+t
-        debugError("TX index out of range\n");
-        return DICE_INVALID_OFFSET;
@@ -1182 +1391 @@
-
-    // out-of-range check
-size
+offset+4+m_tx_reg_size*m_nb_tx
-        debugError("register offset+length too large: 0x%0llX\n", offset_tx + length);
-        return DICE_INVALID_OFFSET;
@@ -1249 +1458 @@
-
-    // out-of-range check
-size
+offset+4+m_rx_reg_size*m_nb_rx
-        debugError("register offset+length too large: 0x%0llX\n", offset_rx + length);
-        return DICE_INVALID_OFFSET;

branches/streaming-rework/src/dice/dice_avdevice.h

@@ -60 +60 @@
-    bool discover();
-
- const
+
-
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
@@ -75 +75 @@
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-
+
+
+
+
-protected:
-    std::auto_ptr<ConfigRom>( m_configRom );
-    Ieee1394Service* m_p1394Service;
-    
-    struct VendorModelEntry *m_model;
-    
@@ -116 +116 @@
-    
-    typedef std::vector< std::string > diceNameVector;
+    typedef std::vector< std::string >::iterator diceNameVectorIterator;
-    diceNameVector splitNameString(std::string in);
-    diceNameVector getTxNameString(unsigned int i);

branches/streaming-rework/src/dice/dice_defines.h

@@ -20 +20 @@
-#ifndef DICEDEFINES_H
-#define DICEDEFINES_H
+
+#define DICE_VER_1_0_4_0
+// #define DICE_VER_1_0_7_0
+
-
-#define DICE_INVALID_OFFSET                  0xFFFFF00000000000ULL
@@ -72 +76 @@
-
-#define DICE_REGISTER_TX_PARAM(size, i, offset) \
-* 4ULL
+
-
-//  RX_PAR_SPACE registers
@@ -78 +82 @@
-#define DICE_REGISTER_RX_SZ_RX                  0x0004
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define DICE_REGISTER_RX_PARAM(size, i, offset) \
-* 4ULL
+
-
-// Register Bitfields
@@ -184 +200 @@
-#define DICE_RATE_NONE                  0x0A
-
-FFFF00
+0000FF
-#define DICE_GET_RATE(reg)              (((reg) & DICE_RATE_MASK) >> 8)
-#define DICE_SET_RATE(reg,rate)         (((reg) & ~DICE_RATE_MASK) | (((rate) << 8) & DICE_RATE_MASK) )

branches/streaming-rework/src/freebob-downloader.cpp

@@ -145 +145 @@
-    }
-
-( arguments.verbose > 0
+Level( arguments.verbose
-    BeBoB::BootloaderManager blMgr( service, node_id );
-    if ( arguments.force == 1 ) {

branches/streaming-rework/src/freebob-sync.cpp

@@ -132 +132 @@
-        return -1;
-    }
-
+
+
+
+
-        debugError( "Could not discover devices\n" );
-        return -1;

branches/streaming-rework/src/freebob.cpp

@@ -103 +103 @@
-freebob_discover_devices( freebob_handle_t freebob_handle, int verbose )
-{
-
+
+
+
+
-}
-
@@ -130 +133 @@
-    if ( avDevice ) {
-        if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {
-0
+
-        }
-    }

branches/streaming-rework/src/freebob_streaming.cpp

@@ -83 +83 @@
-            return 0;
-    }
+    
+    dev->m_deviceManager->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-    if ( !dev->m_deviceManager->initialize( dev->options.port ) ) {
-            debugFatal( "Could not initialize device manager\n" );
@@ -125 +127 @@
-    
-    // discover the devices on the bus
-DEBUG_LEVEL_NORMAL
+
-            debugFatal("Could not discover devices\n");
-            delete dev->processorManager;
@@ -254 +256 @@
-            }
-        }
+
+        if (!device->enableStreaming()) {
+            debugWarning("Could not enable streaming on device %d!\n",i);
+        }
-    }
-
@@ -276 +282 @@
-        IAvDevice *device=dev->m_deviceManager->getAvDeviceByIndex(i);
-        assert(device);
-
+
+
+
+
+
-        int j=0;
-        for(j=0; j<device->getStreamCount();j++) {

branches/streaming-rework/src/iavdevice.cpp

@@ -72 +72 @@
-    m_verboseLevel=l;
-    setDebugLevel(l);
+//     m_pConfigRom->setVerboseLevel(l);
+    m_p1394Service->setVerboseLevel(l);
-}
+
+bool
+IAvDevice::enableStreaming() {
+    return true;
+}
+
+bool
+IAvDevice::disableStreaming() {
+    return true;
+}

branches/streaming-rework/src/iavdevice.h

@@ -108 +108 @@
-         * device detected, and its configuration.
-         */
-const 
+
-
-        /** 
@@ -135 +135 @@
-         */
-        virtual bool unlock() = 0;
+
+    /** 
+     * @brief Enable streaming on all 'started' streams
+     *
+     * Enables the ISO streaming on all streams that are 'started'
+     * using startStreamByIndex. This is useful to control a 'master enable'
+     * function on the device.
+     *
+     * @return true if successful
+     */
+    virtual bool enableStreaming();
+    
+    /** 
+     * @brief Disable streaming on all streams
+     *
+     * Disables ISO streaming on all streams.
+     * This is useful to control a 'master enable'
+     * function on the device.
+     *
+     * @return true if successful
+     */
+    virtual bool disableStreaming();
-
-        /** 

branches/streaming-rework/src/libieee1394/ieee1394service.cpp

@@ -214 +214 @@
-}
-
+fb_octlet_t
+Ieee1394Service::byteSwap_octlet(fb_octlet_t value) {
+    #if __BYTE_ORDER == __BIG_ENDIAN
+        return value;
+    #elif __BYTE_ORDER == __LITTLE_ENDIAN
+        fb_octlet_t value_new;
+        fb_quadlet_t *in_ptr=reinterpret_cast<fb_quadlet_t *>(&value);
+        fb_quadlet_t *out_ptr=reinterpret_cast<fb_quadlet_t *>(&value_new);
+        *(out_ptr+1)=htonl(*(in_ptr));
+        *(out_ptr)=htonl(*(in_ptr+1));
+        return value_new;
+    #else
+        #error Unknown endiannes
+    #endif
+}
+
-bool 
-Ieee1394Service::lockCompareSwap64(  fb_nodeid_t nodeId,
@@ -222 +238 @@
-{
-    #ifdef DEBUG
-Y_VERBOSE,"lockCompareSwap64: node 0x%X, addr = 0x%016
+BOSE,"lockCompareSwap64: node 0x%X, addr = 0x%016ll
-                nodeId, addr);
-Y_VER
+
-                compare_value, swap_value);
+    fb_octlet_t buffer;
+    if(!read_octlet( nodeId, addr,&buffer )) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Could not read owner register\n");
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Owner register before = 0x%016llX\n", buffer);
+    }
+    
+    buffer=0x123456789ABCDEF0LL;
+        debugOutput(DEBUG_LEVEL_VERBOSE,"before byteswap = 0x%016llX\n", buffer);
+    buffer=byteSwap_octlet(buffer);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"after byteswap = 0x%016llX\n", buffer);
+    
+    
-    #endif
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -272 +317 @@
-{
-    avc1394_transaction_block_close( m_handle );
-    return true;
-}
-
-bool
-Ieee1394Service::setVerbose( int verboseLevel )
-{
-    setDebugLevel(verboseLevel);
-    return true;
-}
@@ -796 +834 @@
-    return ntohl(buffer);
-}
+
+void
+Ieee1394Service::setVerboseLevel(int l) 
+{
+    setDebugLevel(l);
+}

branches/streaming-rework/src/libieee1394/ieee1394service.h

@@ -124 +124 @@
-     * the content of \ref addr equals \ref compare_with
-     *
+     * @note takes care of endiannes
+     *
-     * @param nodeId target node ID
-     * @param addr address within target node address space
@@ -147 +149 @@
-    raw1394handle_t getHandle() {return m_handle;};
-
-    bool setVerbose( int verboseLevel );
-    int getVerboseLevel();
-
@@ -240 +241 @@
-    arm_handler_vec_t m_armHandlers;
-    
+    fb_octlet_t byteSwap_octlet(fb_octlet_t value);
+    
+public:
+    void setVerboseLevel(int l);
+private:
-    DECLARE_DEBUG_MODULE;
-};

branches/streaming-rework/src/libosc/OscNode.cpp

@@ -61 +61 @@
-            delete (*it);
-        }
+    }
+}
+
+void
+OscNode::setVerboseLevel(int l) {
+    setDebugLevel(l);
+    for ( OscNodeVectorIterator it = m_ChildNodes.begin();
+      it != m_ChildNodes.end();
+      ++it )
+    {
+        (*it)->setVerboseLevel(l);
-    }
-}

branches/streaming-rework/src/libosc/OscNode.h

@@ -79 +79 @@
-    OscNodeVector m_ChildNodes;
-
+public:
+    void setVerboseLevel(int l);
-protected:
-    DECLARE_DEBUG_MODULE;

branches/streaming-rework/src/libosc/OscServer.cpp

@@ -49 +49 @@
-    lo_server_thread_free(m_server);
-    if (m_rootNode) delete m_rootNode;
+}
+
+void
+OscServer::setVerboseLevel(int l) {
+    setDebugLevel(l);
+    if (m_rootNode) m_rootNode->setVerboseLevel(l);
-}
-

branches/streaming-rework/src/libosc/OscServer.h

@@ -64 +64 @@
-    OscNode * m_rootNode;
-
-
+
+
+
-    DECLARE_DEBUG_MODULE;
-

branches/streaming-rework/src/maudio/maudio_avdevice.cpp

@@ -119 +119 @@
-
-void
- const
+
-{
-}

branches/streaming-rework/src/maudio/maudio_avdevice.h

@@ -57 +57 @@
-    bool discover();
-    
- const
+
-    
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );

branches/streaming-rework/src/metrichalo/mh_avdevice.cpp

@@ -137 +137 @@
-
-void
- const
+
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE,

branches/streaming-rework/src/metrichalo/mh_avdevice.h

@@ -52 +52 @@
-    bool discover();
-
- const
+
-
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );

branches/streaming-rework/src/motu/motu_avdevice.cpp

@@ -302 +302 @@
-
-void
- const
+
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE,

branches/streaming-rework/src/motu/motu_avdevice.h

@@ -99 +99 @@
-    virtual bool discover();
-
- const
+
-
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );

branches/streaming-rework/src/rme/rme_avdevice.cpp

@@ -142 +142 @@
-
-void
- const
+
-{
-        debugOutput(DEBUG_LEVEL_VERBOSE,

branches/streaming-rework/src/rme/rme_avdevice.h

@@ -53 +53 @@
-    bool discover();
-
- const
+
-
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );

branches/streaming-rework/src/ser.cpp

@@ -14 +14 @@
-        return false;
-    }
-
+
+
+
+
-        std::cerr << "could not discover devices" << std::endl;
-        return false;

branches/streaming-rework/tests/test-freebob.cpp

@@ -226 +226 @@
-            return -1;
-        }
-
+
+
+
+
-            fprintf( stderr, "Could not discover devices\n" );
-            delete m_deviceManager;
@@ -251 +254 @@
-            return -1;
-        }
-
-
+
+
+
+
-            fprintf( stderr, "Could not discover devices\n" );
-            delete m_deviceManager;
@@ -262 +267 @@
-            if ( avDevice ) {
-                if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {
-arguments.verbose
+
-                } else {
-                    fprintf( stderr, "Could not set samplerate\n" );
@@ -313 +318 @@
-            return -1;
-        }
-
-
+
+
+
+
-            fprintf( stderr, "Could not discover devices\n" );
-            delete m_deviceManager;

branches/streaming-rework/tests/test-mixer.cpp

@@ -48 +48 @@
-    fbCmd.setVerbose( bVerbose );
-    if (bVerbose) {
-
+Level
-    }
-    

branches/streaming-rework/tests/test-volume.cpp

@@ -40 +40 @@
-
-    fbCmd.setVerbose( bVerbose );
-
+
+
+
-
-    if ( !fbCmd.fire() ) {
@@ -68 +70 @@
-
-    fbCmd.setVerbose( bVerbose );
-
+
+
+
-
-    bool bStatus = fbCmd.fire();