Changeset 1763

Timestamp:

12/19/09 08:12:53 (14 years ago)

Author:

ppalmers

Message:

Merged revisions 1536,1541,1544-1546,1549,1554-1562,1571,1579-1581,1618,1632,1634-1635,1661,1677-1679,1703-1704,1715,1720-1723,1743-1745,1755 via svnmerge from
svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0

Also fix remaining format string warnings.

Files:

• trunk/libffado (modified) (2 props)
• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/SConstruct (modified) (9 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/bebob/bebob_avplug.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_dl_bcd.cpp (modified) (4 diffs)
• trunk/libffado/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_dl_mgr.h (modified) (1 diff)
• trunk/libffado/src/bebob/focusrite/focusrite_generic.cpp (modified) (12 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (4 diffs)
• trunk/libffado/src/bebob/terratec/terratec_device.cpp (modified) (2 diffs)
• trunk/libffado/src/bebob/terratec/terratec_device.h (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.cpp (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (2 diffs)
• trunk/libffado/src/devicemanager.cpp (modified) (9 diffs)
• trunk/libffado/src/devicemanager.h (modified) (1 diff)
• trunk/libffado/src/DeviceStringParser.cpp (modified) (7 diffs)
• trunk/libffado/src/DeviceStringParser.h (modified) (1 diff)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (45 diffs)
• trunk/libffado/src/dice/dice_eap.cpp (modified) (4 diffs)
• trunk/libffado/src/fbtypes.h (modified) (2 diffs)
• trunk/libffado/src/fireworks/efc/efc_cmds_flash.cpp (modified) (4 diffs)
• trunk/libffado/src/fireworks/efc/efc_cmds_hardware.cpp (modified) (2 diffs)
• trunk/libffado/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp (modified) (2 diffs)
• trunk/libffado/src/fireworks/efc/efc_cmds_ioconfig.cpp (modified) (1 diff)
• trunk/libffado/src/fireworks/efc/efc_cmds_mixer.cpp (modified) (1 diff)
• trunk/libffado/src/fireworks/efc/efc_cmds_monitor.cpp (modified) (1 diff)
• trunk/libffado/src/fireworks/fireworks_control.cpp (modified) (4 diffs)
• trunk/libffado/src/fireworks/fireworks_device.cpp (modified) (6 diffs)
• trunk/libffado/src/fireworks/fireworks_firmware.cpp (modified) (3 diffs)
• trunk/libffado/src/fireworks/fireworks_session_block.cpp (modified) (1 diff)
• trunk/libffado/src/genericavc/stanton/scs.cpp (modified) (12 diffs)
• trunk/libffado/src/libavc/audiosubunit/avc_descriptor_audio.h (modified) (1 diff)
• trunk/libffado/src/libavc/descriptors/avc_descriptor.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/descriptors/avc_descriptor_cmd.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (1 diff)
• trunk/libffado/src/libcontrol/Element.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/ARMHandler.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/configrom.cpp (modified) (7 diffs)
• trunk/libffado/src/libieee1394/cycletimer.h (modified) (14 diffs)
• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (19 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (22 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (5 diffs)
• trunk/libffado/src/libieee1394/test-cyclecalc.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpStreamProcessor-common.h (copied) (copied from branches/libffado-2.0/src/libstreaming/amdtp/AmdtpStreamProcessor-common.h)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (11 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (40 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.h (modified) (3 diffs)
• trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (5 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (33 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.h (modified) (1 diff)
• trunk/libffado/src/libutil/Configuration.cpp (modified) (3 diffs)
• trunk/libffado/src/libutil/PosixThread.cpp (modified) (5 diffs)
• trunk/libffado/src/libutil/serialize_expat.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/serialize_libxml.cpp (modified) (2 diffs)
• trunk/libffado/src/libutil/StreamStatistics.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/SystemTimeSource.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/Time.h (modified) (2 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (5 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.h (modified) (1 diff)
• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (18 diffs)
• trunk/libffado/src/motu/motu_avdevice.h (modified) (8 diffs)
• trunk/libffado/src/motu/motu_controls.cpp (modified) (6 diffs)
• trunk/libffado/src/motu/motu_controls.h (modified) (1 diff)
• trunk/libffado/src/motu/motu_mark3_controls.cpp (copied) (copied from branches/libffado-2.0/src/motu/motu_mark3_controls.cpp)
• trunk/libffado/src/motu/motu_mark3_controls.h (copied) (copied from branches/libffado-2.0/src/motu/motu_mark3_controls.h)
• trunk/libffado/src/motu/motu_mark3_mixerdefs.cpp (copied) (copied from branches/libffado-2.0/src/motu/motu_mark3_mixerdefs.cpp)
• trunk/libffado/src/motu/motu_mark3_mixerdefs.h (copied) (copied from branches/libffado-2.0/src/motu/motu_mark3_mixerdefs.h)
• trunk/libffado/src/motu/motu_mixer.cpp (copied) (copied from branches/libffado-2.0/src/motu/motu_mixer.cpp)
• trunk/libffado/src/motu/motu_mixerdefs.cpp (copied) (copied from branches/libffado-2.0/src/motu/motu_mixerdefs.cpp) (2 diffs)
• trunk/libffado/src/motu/motu_mixerdefs.h (copied) (copied from branches/libffado-2.0/src/motu/motu_mixerdefs.h) (1 diff)
• trunk/libffado/src/SConscript (modified) (1 diff)
• trunk/libffado/support/dbus/SConscript (modified) (1 diff)
• trunk/libffado/support/firmware/fireworks-downloader.cpp (modified) (2 diffs)
• trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py (modified) (1 diff)
• trunk/libffado/support/mixer-qt4/ffado/mixer/phase88.ui (modified) (20 diffs)
• trunk/libffado/support/mixer-qt4/ffado/mixer/saffire.py (modified) (1 diff, 1 prop)
• trunk/libffado/support/mixer-qt4/ffado/regdialog.py (modified) (2 diffs)
• trunk/libffado/tests/streaming/test-ipcclient.cpp (modified) (1 diff)
• trunk/libffado/tests/streaming/teststreaming-ipc.cpp (modified) (4 diffs)
• trunk/libffado/tests/streaming/teststreaming3.cpp (modified) (1 diff)
• trunk/libffado/tests/systemtests/gen-loadpulses.cpp (modified) (3 diffs)
• trunk/libffado/tests/systemtests/test-clock_nanosleep.cpp (modified) (3 diffs)
• trunk/libffado/tests/systemtests/test-isorecv-1.cpp (modified) (2 diffs)
• trunk/libffado/tests/systemtests/test-isoxmit-1.cpp (modified) (3 diffs)
• trunk/libffado/tests/systemtests/test-sysload.cpp (modified) (3 diffs)
• trunk/libffado/tests/test-bufferops.cpp (modified) (4 diffs)
• trunk/libffado/tests/test-dice-eap.cpp (modified) (1 diff)
• trunk/libffado/tests/test-ffado.cpp (modified) (6 diffs)
• trunk/libffado/tests/test-focusrite.cpp (modified) (1 diff)
• trunk/libffado/tests/test-ieee1394service.cpp (modified) (9 diffs)
• trunk/libffado/tests/test-scs.cpp (modified) (1 diff)
• trunk/libffado/tests/test-timestampedbuffer.cpp (modified) (7 diffs)

trunk/libffado/config.h.in

@@ -117 +117 @@
-// more robust. It should be noted though that shifting the transfer
-// time to a later time instant also causes the xmit buffer fill to be
-
+
+
-#define STREAMPROCESSORMANAGER_SIGNAL_DELAY_TICKS           (3072*0)
+
+// the number of frames that we prebuffer in the 1394 ISO layer
+// this adds directly to the roundtrip latency
+#define STREAMPROCESSORMANAGER_XMIT_PREBUFFER_FRAMES         100
-
-// causes the waitForPeriod() call to wait until sufficient

trunk/libffado/SConstruct

@@ -24 +24 @@
-#
-
-=
+ = 
-FFADO_VERSION="2.999.0"
-
@@ -33 +33 @@
-import distutils.sysconfig
-
-build_dir = ARGUMENTS.get('BUILDDIR', "")
-if build_dir:
-        build_base=build_dir+'/'
-        if not os.path.isdir( build_base ):
-                os.makedirs( build_base )
-        print "Building into: " + build_base
-else:
-        build_base=''
-
-if not os.path.isdir( "cache" ):
-        os.makedirs( "cache" )
-
-
-
-
-
-
+
-
-opts.AddOptions(
@@ -138 +125 @@
-
-# make sure the necessary dirs exist
-/" + build_base
-    os.makedirs( "cache/" + build_base
+"
+       os.makedirs( "cache"
-if not os.path.isdir( 'cache/objects' ):
-    os.makedirs( 'cache/objects' )
@@ -145 +132 @@
-CacheDir( 'cache/objects' )
-
-' + build_base + "options.cache"
+options.cache'
-
-def ConfigGuess( context ):
@@ -200 +187 @@
-conf = Configure( env,
-    custom_tests = tests,
- + build_base
-"cache/" + build_base + '
+
+'cache/
-
-if env['SERIALIZE_USE_EXPAT']:
@@ -365 +352 @@
-    env['BUILD_STATIC_LIB'] = True
-
-
-
-
-
+
-
-#
@@ -529 +513 @@
-    env['REVISION'] = ''
-
-
+
+
+
+
+
+
+
-
-env['PACKAGE'] = "libffado"
@@ -557 +547 @@
-# ensure that the config.h is updated
-env.Depends( "config.h", "SConstruct" )
-' + build_base + "options.cache"
+options.cache'
-
-# update version.h whenever the version or SVN revision changes
@@ -573 +563 @@
-    subdirs.append('tests')
-
-
-
-
-
-
-
-
-
+
-
-if 'debian' in COMMAND_LINE_TARGETS:

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -724 +724 @@
-
-    char* configId;
-llx
+"PRIx64"
-    if ( !configId ) {
-        debugError( "could not create id string\n" );
@@ -800 +800 @@
-    // come up with an unique file name for the current settings
-    char* configId;
-llx
+"PRIx64"
-    if ( !configId ) {
-        debugError( "Could not create id string\n" );

trunk/libffado/src/bebob/bebob_avplug.cpp

@@ -583 +583 @@
-        {
-            debugError( "number of output plugs (%d) disagree with "
-
+z
-                        infoType->m_plugOutput->m_nrOfOutputPlugs,
-                        infoType->m_plugOutput->m_outputPlugAddresses.size());

trunk/libffado/src/bebob/bebob_dl_bcd.cpp

@@ -154 +154 @@
-    bytes_read = fread( &m_bcd_version, 1, sizeof( fb_quadlet_t ), m_file );
-    if ( bytes_read != sizeof( fb_quadlet_t ) ) {
-
+z
-                    sizeof( fb_quadlet_t ),
-                    BCDFileVersionOffset );
@@ -245 +245 @@
-    size_t bytes_read = std::fread( q, 1, sizeof( *q ), m_file );
-    if ( bytes_read  != sizeof( *q ) ) {
-
+z
-                    sizeof( *q ),  addr );
-        return false;
@@ -263 +263 @@
-    size_t bytes_read = std::fread( o, 1, sizeof( *o ), m_file );
-    if ( bytes_read  != sizeof( *o ) ) {
-
+z
-                    sizeof( *o ), addr );
-        return false;
@@ -281 +281 @@
-    size_t bytes_read = std::fread( b, 1, len, m_file );
-    if ( bytes_read  != len ) {
-
+z
-                    len, addr );
-        return false;

trunk/libffado/src/bebob/bebob_dl_mgr.cpp

@@ -165 +165 @@
-
-    return false;
+}
+
+std::string
+BeBoB::BootloaderManager::getSoftwareDate()
+{
+    return makeDate( m_cachedInfoRegs.m_softwareDate );
+}
+
+std::string
+BeBoB::BootloaderManager::getSoftwareTime()
+{
+    return makeDate( m_cachedInfoRegs.m_softwareTime );
-}
-

trunk/libffado/src/bebob/bebob_dl_mgr.h

@@ -67 +67 @@
-        bool setStartBootloader( bool bStartBootloader )
-            { m_bStartBootloader = bStartBootloader; return true; }
+
+        int getSoftwareVersion() {return m_cachedInfoRegs.m_softwareVersion;};
+        std::string getSoftwareDate();
+        std::string getSoftwareTime();
+
-        protected:
-        enum EObjectType {

trunk/libffado/src/bebob/focusrite/focusrite_generic.cpp

@@ -58 +58 @@
-FocusriteDevice::setSpecificValue(uint32_t id, uint32_t v)
-{
-lX (%u), data: 0x%08l
+X (%u), data: 0x%08
-        id, id, v);
-    bool use_avc = false;
@@ -69 +69 @@
-    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) {
-        ffado_microsecs_t wait = m_earliest_next_cmd_time - now;
-llu
+"PRIu64"
-        Util::SystemTimeSource::SleepUsecRelative(wait);
-    }
@@ -94 +94 @@
-    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) {
-        ffado_microsecs_t wait = m_earliest_next_cmd_time - now;
-llu
+"PRIu64"
-        Util::SystemTimeSource::SleepUsecRelative(wait);
-    }
@@ -105 +105 @@
-        retval = getSpecificValueARM(id, v);
-    }
-lX (%u): %08l
+X (%u): %08
-    return retval;
-}
@@ -161 +161 @@
-FocusriteDevice::setSpecificValueARM(uint32_t id, uint32_t v)
-{
-=
-lX (%u), data: 0x%08l
+ = 
+X (%u), data: 0x%08
-        id, id, data);
-
@@ -169 +169 @@
-
-    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) {
-X
+"PRIX64"
-        return false;
-    }
@@ -179 +179 @@
-{
-    fb_quadlet_t result;
-l
+
-
-    fb_nodeaddr_t addr = FR_PARAM_SPACE_START + (id * 4);
@@ -185 +185 @@
-
-    if(!get1394Service().read_quadlet( nodeId, addr, &result ) ) {
-llX addr 0x%012llX
-
-
-
-=
-ll
+X addr 0x%012"PRIX64"
+
+
+
+ = 
+
-
-    *v = result;
@@ -385 +385 @@
-RegisterControl::setValue(uint64_t addr, uint64_t v)
-{
-llu to %llu
+"PRIu64" to %"PRIu64"
-                                     addr, v);
-
@@ -403 +403 @@
-        return 0;
-    } else {
-llu = %l
+"PRIu64" = %
-                                         addr, val);
-        return val;
@@ -576 +576 @@
-    struct sCellInfo c = m_CellInfo.at(row).at(col);
-
-l
+
-                                     c.address, row, col, val, v);
-
@@ -597 +597 @@
-        return 0;
-    } else {
-l
+
-                                         c.address, row, col, val);
-        return val;

trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp

@@ -48 +48 @@
-    if(config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "cmd_interval_time", delaytime)) {
-        m_cmd_time_interval = delaytime;
-llu
+"PRIu64"
-                     m_cmd_time_interval );
-    } else {
-        m_cmd_time_interval = 10000;
-llu
+"PRIu64"
-                     m_cmd_time_interval );
-    }

trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp

@@ -423 +423 @@
-        return;
-    }
-l
+
-
-    switch(sync & FR_SAFFIREPRO_CMD_ID_SYNC_CONFIG_MASK) {
-        default:
-l
+
-        case FR_SAFFIREPRO_CMD_SYNC_CONFIG_INTERNAL:
-            m_internal_clocksource.active=true;
@@ -466 +466 @@
-            break;
-        default:
-l
+
-    }
-}
@@ -772 +772 @@
-                break;
-            }
- 
+, ntries
-        }
-
@@ -872 +872 @@
-    }
-
-
-
+
-    return v;
-}

trunk/libffado/src/bebob/terratec/terratec_device.cpp

@@ -23 +23 @@
-
-#include "terratec_device.h"
+#include "src/bebob/bebob_dl_mgr.h"
+#include "src/bebob/bebob_dl_bcd.h"
-
-namespace BeBoB {
@@ -45 +47 @@
-    BeBoB::Device::showDevice();
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-void
-Phase88Device::updateClockSources() {

trunk/libffado/src/bebob/terratec/terratec_device.h

@@ -37 +37 @@
-    virtual ~Phase88Device();
-
+    virtual bool discover();
+
-    virtual void showDevice();
-

trunk/libffado/src/debugmodule/debugmodule.cpp

@@ -185 +185 @@
-    int chars_written=0;
-    int retval=0;
-llu: %s (%s)[%4d
+"PRIu64": %s (%s)[%4u
-                      ts_usec, getPreSequence( level ),
-                      fname,  line,  function );

trunk/libffado/src/debugmodule/debugmodule.h

@@ -302 +302 @@
-    void printShort( debug_level_t level,
-                     const char* format,
-
+
+
+
+
+
-
-    void print( debug_level_t level,
@@ -309 +313 @@
-                unsigned int  line,
-                const char*   format,
-
+
+
+
+
+
-
-    bool setLevel( debug_level_t level )

trunk/libffado/src/devicemanager.cpp

@@ -120 +120 @@
-    {
-        if (!deleteElement(*it)) {
-Av
+
-        }
-        delete *it;
@@ -439 +439 @@
-                // the device has disappeared, remove it from the control tree
-                if (!deleteElement(*it)) {
-Av
+
-                }
-                // delete the device
@@ -455 +455 @@
-        {
-            if (!deleteElement(*it)) {
-Av
+
-            }
-            delete *it;
@@ -542 +542 @@
-        {
-            if (!deleteElement(*it2)) {
-Av
+
-            }
-            delete *it2;
@@ -652 +652 @@
-
-                    if (!addElement(avDevice)) {
-Av
+
-                    }
-
@@ -670 +670 @@
-        // a device id always corresponds to the same device
-        sort(m_avDevices.begin(), m_avDevices.end(), FFADODevice::compareGUID);
+
-        int i=0;
+        if(m_deviceStringParser->countDeviceStrings()) { // only if there are devicestrings
+            // first map the devices to a position using the device spec strings
+            std::map<fb_octlet_t, int> positionMap;
+            for ( FFADODeviceVectorIterator it = m_avDevices.begin();
+                it != m_avDevices.end();
+                ++it )
+            {
+                int pos = m_deviceStringParser->matchPosition((*it)->getConfigRom());
+                fb_octlet_t guid = (*it)->getConfigRom().getGuid();
+                positionMap[guid] = pos;
+                debugOutput( DEBUG_LEVEL_VERBOSE, "Mapping %s to position %d...\n", (*it)->getConfigRom().getGuidString().c_str(), pos );
+            }
+    
+            // now run over all positions, and add the devices that belong to it
+            FFADODeviceVector sorted;
+            int nbPositions = m_deviceStringParser->countDeviceStrings();
+            for (i=0; i < nbPositions; i++) {
+                for ( FFADODeviceVectorIterator it = m_avDevices.begin();
+                    it != m_avDevices.end();
+                    ++it )
+                {
+                    fb_octlet_t guid = (*it)->getConfigRom().getGuid();
+                    if(positionMap[guid] == i) {
+                        sorted.push_back(*it);
+                    }
+                }
+            }
+            // assign the new vector
+            flushDebugOutput();
+            assert(sorted.size() == m_avDevices.size());
+            m_avDevices = sorted;
+        }
+
+        // set device id's
+        i = 0;
-        for ( FFADODeviceVectorIterator it = m_avDevices.begin();
-            it != m_avDevices.end();
@@ -710 +746 @@
-        {
-            if (!deleteElement(*it)) {
-Av
+
-            }
-            delete *it;
@@ -827 +863 @@
-
-bool
+DeviceManager::startStreamingOnDevice(FFADODevice *device)
+{
+    assert(device);
+
+    int j=0;
+    bool all_streams_started = true;
+    bool device_start_failed = false;
+    for(j=0; j < device->getStreamCount(); j++) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Starting stream %d of device %p\n", j, device);
+        // start the stream
+        if (!device->startStreamByIndex(j)) {
+            debugWarning("Could not start stream %d of device %p\n", j, device);
+            all_streams_started = false;
+            break;
+        }
+    }
+
+    if(!all_streams_started) {
+        // disable all streams that did start up correctly
+        for(j = j-1; j >= 0; j--) {
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Stopping stream %d of device %p\n", j, device);
+            // stop the stream
+            if (!device->stopStreamByIndex(j)) {
+                debugWarning("Could not stop stream %d of device %p\n", j, device);
+            }
+        }
+        device_start_failed = true;
+    } else {
+        if (!device->enableStreaming()) {
+            debugWarning("Could not enable streaming on device %p!\n", device);
+            device_start_failed = true;
+        }
+    }
+    return !device_start_failed;
+}
+
+bool
-DeviceManager::startStreaming() {
+    bool device_start_failed = false;
+    FFADODeviceVectorIterator it;
+
+    // create the connections for all devices
+    // iterate over the found devices
+    for ( it = m_avDevices.begin();
+        it != m_avDevices.end();
+        ++it )
+    {
+        if (!startStreamingOnDevice(*it)) {
+            debugWarning("Could not start streaming on device %p!\n", *it);
+            device_start_failed = true;
+            break;
+        }
+    }
+
+    // if one of the devices failed to start,
+    // the previous routine should have cleaned up the failing one.
+    // we still have to stop all devices that were started before this one.
+    if(device_start_failed) {
+        for (FFADODeviceVectorIterator it2 = m_avDevices.begin();
+            it2 != it;
+            ++it2 )
+        {
+            if (!stopStreamingOnDevice(*it2)) {
+                debugWarning("Could not stop streaming on device %p!\n", *it2);
+            }
+        }
+        return false;
+    }
+
+    // start the stream processor manager to tune in to the channels
+    if(m_processorManager->start()) {
+        return true;
+    } else {
+        debugWarning("Failed to start SPM!\n");
+        for( it = m_avDevices.begin();
+             it != m_avDevices.end();
+             ++it )
+        {
+            if (!stopStreamingOnDevice(*it)) {
+                debugWarning("Could not stop streaming on device %p!\n", *it);
+            }
+        }
+        return false;
+    }
+}
+
+bool
+DeviceManager::resetStreaming() {
+    return true;
+}
+
+bool
+DeviceManager::stopStreamingOnDevice(FFADODevice *device)
+{
+    assert(device);
+    bool result = true;
+
+    if (!device->disableStreaming()) {
+        debugWarning("Could not disable streaming on device %p!\n", device);
+    }
+
+    int j=0;
+    for(j=0; j < device->getStreamCount(); j++) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Stopping stream %d of device %p\n", j, device);
+        // stop the stream
+        // start the stream
+        if (!device->stopStreamByIndex(j)) {
+            debugWarning("Could not stop stream %d of device %p\n", j, device);
+            result = false;
+            continue;
+        }
+    }
+    return result;
+}
+
+bool
+DeviceManager::stopStreaming()
+{
+    bool result = true;
+    m_processorManager->stop();
+
-    // create the connections for all devices
-    // iterate over the found devices
@@ -835 +991 @@
-        ++it )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    return result;

trunk/libffado/src/devicemanager.h

@@ -90 +90 @@
-    bool prepareStreaming();
-    bool finishStreaming();
+    bool startStreamingOnDevice(FFADODevice *device);
-    bool startStreaming();
+    bool stopStreamingOnDevice(FFADODevice *device);
-    bool stopStreaming();
-    bool resetStreaming();

trunk/libffado/src/DeviceStringParser.cpp

@@ -160 +160 @@
-DeviceStringParser::DeviceString::match(ConfigRom& configRom)
-{
-\n", &configRom
+ (%s)\n", &configRom, configRom.getGuidString().c_str()
-    bool match;
-    switch(m_Type) {
@@ -172 +172 @@
-                match &= ((configRom.getNodeId() & 0x3F) == m_node);
-            }
+            if(match) {
+                debugOutput(DEBUG_LEVEL_VERBOSE, "(eBusNode) device matches device string %s\n", m_String.c_str());
+            }
-            return match;
-        case eGUID:
-            //GUID should not be 0
-
+
+
+
+
+
-        case eInvalid:
-        default:
-Output(DEBUG_LEVEL_VERBOSE, "no match %p\n", &configRom
+Error("invalid DeviceString type (%d)\n", m_Type
-            return false;
-    }
@@ -196 +203 @@
-        case eGUID:
-            retval = m_guid && (m_guid == x.m_guid);
-X == 0x%016X
+"PRIX64" == 0x%016"PRIX64"
-                        m_guid, x.m_guid, retval);
-            return retval;
@@ -218 +225 @@
-        case eGUID:
-            debugOutput(DEBUG_LEVEL_INFO, "type: eGUID\n");
-LLX
+"PRIX64"
-            break;
-        case eInvalid:
@@ -282 +289 @@
-DeviceStringParser::match(ConfigRom& c)
-{
+    return matchPosition(c) != -1;
+}
+
+int
+DeviceStringParser::matchPosition(ConfigRom& c)
+{
+    int pos = 0;
-    for ( DeviceStringVectorIterator it = m_DeviceStrings.begin();
-      it != m_DeviceStrings.end();
@@ -287 +301 @@
-    {
-        if((*it)->match(c)) {
-
-
-
-
-
+
+
+
+
+
+
+
-bool
-DeviceStringParser::addDeviceString(DeviceString *o)
@@ -370 +386 @@
-}
-
-
-void
-DeviceStringParser::show()

trunk/libffado/src/DeviceStringParser.h

@@ -75 +75 @@
-
-    bool match(ConfigRom &);
+    int matchPosition(ConfigRom& c);
-
-    bool parseString(std::string s);

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -376 +376 @@
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &clock_caps);
-    uint16_t clocks_supported = (clock_caps >> 16) & 0xFFFF;
-X
+"PRIX32"
-                                    clock_caps, clocks_supported);
-
@@ -382 +382 @@
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clock_select);
-    byte_t clock_selected = (clock_select) & 0xFF;
-X
+"PRIX32"
-                                    clock_select, clock_selected);
-    quadlet_t extended_status;
@@ -389 +389 @@
-    uint16_t clock_status = (extended_status) & 0xFFFF;
-    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF;
-X
+"PRIX32"
-                                    extended_status, clock_status, clock_slipping);
-    #endif
@@ -540 +540 @@
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &clock_caps);
-    uint16_t clocks_supported = (clock_caps >> 16) & 0xFFFF;
-X
+"PRIX32"
-                                    clock_caps, clocks_supported);
-
@@ -546 +546 @@
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clock_select);
-    byte_t id = (clock_select) & 0xFF;
-X
+"PRIX32"
-                                    clock_select, id);
-    quadlet_t extended_status;
@@ -553 +553 @@
-    uint16_t clock_status = (extended_status) & 0xFFFF;
-    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF;
-X
+"PRIX32"
-                                    extended_status, clock_status, clock_slipping);
-    #endif
@@ -610 +610 @@
-
-    readGlobalRegBlock(DICE_REGISTER_GLOBAL_OWNER, reinterpret_cast<fb_quadlet_t *>(&tmp_octlet), sizeof(fb_octlet_t));
-X
+"PRIX64"
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
-X
+"PRIX32"
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
@@ -631 +631 @@
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &tmp_quadlet);
-"  Extended Status  : 0x%08X\n",
+ "  Extended Status  : 0x%08"PRIX32"\n", 
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_SAMPLE_RATE, &tmp_quadlet);
-"  Samplerate       : 0x%08X (%lu)\n",tmp_quadlet,
+ "  Samplerate       : 0x%08"PRIX32" (%"PRIu32")\n", tmp_quadlet, 
-
-    readGlobalRegBlock(DICE_REGISTER_GLOBAL_VERSION, reinterpret_cast<fb_quadlet_t *>(&tmp_quadlet), sizeof(fb_quadlet_t));
-X
+"PRIX32"
-    
-    readGlobalReg(DICE_REGISTER_GLOBAL_VERSION, &tmp_quadlet);
-X
+"PRIX32"
-        tmp_quadlet,
-        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_A(tmp_quadlet),
@@ -649 +649 @@
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &tmp_quadlet);
-X\n",
+"PRIX32"\n", 
-
-    diceNameVector names=getClockSourceNameString();
@@ -677 +677 @@
-
-        readTxReg(i, DICE_REGISTER_TX_AC3_CAPABILITIES_BASE, &tmp_quadlet);
-X
+"PRIX32"
-        readTxReg(i, DICE_REGISTER_TX_AC3_ENABLE_BASE, &tmp_quadlet);
-X
+"PRIX32"
-
-        diceNameVector channel_names=getTxNameString(i);
@@ -707 +707 @@
-
-        readTxReg(i, DICE_REGISTER_RX_AC3_CAPABILITIES_BASE, &tmp_quadlet);
-X
+"PRIX32"
-        readTxReg(i, DICE_REGISTER_RX_AC3_ENABLE_BASE, &tmp_quadlet);
-X
+"PRIX32"
-
-        diceNameVector channel_names=getRxNameString(i);
@@ -1132 +1132 @@
-    
-        if (result != DICE_OWNER_NO_OWNER) {
-llX
+"PRIX64"
-            return false;
-        }
@@ -1260 +1260 @@
-            }
-            int isochannel = reg_isoch;
-
+
+
+
-            p->setChannel(isochannel);
-        } else {
@@ -1266 +1268 @@
-            int isochannel = allocateIsoChannel(p->getMaxPacketSize());
-            if(isochannel<0) {
-i,
+ i, 
-                return false;
-            }
-
+
+
+
-            p->setChannel(isochannel);
-    
@@ -1281 +1285 @@
-            }
-            if(reg_isoch != 0xFFFFFFFFUL) {
-X
+"PRIX32"
-                p->setChannel(-1);
-                deallocateIsoChannel(isochannel);
@@ -1311 +1315 @@
-            }
-            int isochannel = reg_isoch;
-
+this, 
-            p->setChannel(isochannel);
-        } else {
@@ -1320 +1324 @@
-                return false;
-            }
-lu for TX\n"
+u for TX\n", this
-            p->setChannel(isochannel);
-    
@@ -1332 +1336 @@
-            }
-            if(reg_isoch != 0xFFFFFFFFUL) {
-X
+"PRIX32"
-                p->setChannel(-1);
-                deallocateIsoChannel(isochannel);
@@ -1381 +1385 @@
-            }
-            if(reg_isoch != isochannel) {
-X (=0x%08X
+"PRIX32" (=0x%08"PRIX32"
-                return false;
-            }
@@ -1417 +1421 @@
-            }
-            if(reg_isoch != isochannel) {
-X (=0x%08X
+"PRIX32" (=0x%08"PRIX32"
-                return false;
-            }
@@ -1734 +1738 @@
-bool
-Device::readReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-llX
+"PRIX64"
-
-    if(offset >= DICE_INVALID_OFFSET) {
-llX
+"PRIX64"
-        return false;
-    }
@@ -1745 +1749 @@
-
-    if(!get1394Service().read_quadlet( nodeId, addr, result ) ) {
-012X
+12"PRIX64"
-        return false;
-    }
@@ -1751 +1755 @@
-    *result = CondSwapFromBus32(*result);
-
-X
+"PRIX32"
-
-    return true;
@@ -1758 +1762 @@
-bool
-Device::writeReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-llX, data: 0x%08X
+"PRIX64", data: 0x%08"PRIX32"
-        offset, data);
-
-    if(offset >= DICE_INVALID_OFFSET) {
-6llX
+2"PRIX64"
-        return false;
-    }
@@ -1770 +1774 @@
-
-    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) {
-012X
+12"PRIX64"
-        return false;
-    }
@@ -1778 +1782 @@
-bool
-Device::readRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-
-
+
+
+
-    const int blocksize_quads = 512/4;
-
-    if(offset >= DICE_INVALID_OFFSET) {
-6llX
+2"PRIX64"
-        return false;
-    }
@@ -1796 +1801 @@
-        fb_quadlet_t *curr_data = data + quads_done;
-        int quads_todo = length_quads - quads_done;
-6llX
+2"PRIX64"
-        
-        if (quads_todo > blocksize_quads) {
@@ -1809 +1814 @@
-
-        if(!get1394Service().read( nodeId, curr_addr, quads_todo, curr_data ) ) {
-llX
+"PRIX64"
-            return false;
-        }
@@ -1821 +1826 @@
-bool
-Device::writeRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length: %u
+"PRIX64", length: %zd
-        offset, length);
-    const int blocksize_quads = 512/4;
-
-    if(offset >= DICE_INVALID_OFFSET) {
-6llX
+2"PRIX64"
-        return false;
-    }
@@ -1853 +1858 @@
-
-        if(!get1394Service().write( nodeId, addr, quads_todo, curr_data ) ) {
-llX
+"PRIX64"
-            return false;
-        }
@@ -1864 +1869 @@
-bool
-Device::readGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-llX
+"PRIX64"
-
-    fb_nodeaddr_t offset_gl = globalOffsetGen(offset, sizeof(fb_quadlet_t));
@@ -1872 +1877 @@
-bool
-Device::writeGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-llX, data: 0x%08X
+"PRIX64", data: 0x%08"PRIX32"
-        offset, data);
-
@@ -1881 +1886 @@
-bool
-Device::readGlobalRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length %u
+"PRIX64", length %zd
-        offset, length);
-
@@ -1890 +1895 @@
-bool
-Device::writeGlobalRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length %u
+"PRIX64", length: %zd
-        offset, length);
-
@@ -1908 +1913 @@
-    // out-of-range check
-    if(offset+length > m_global_reg_offset+m_global_reg_size) {
-llX
+4"PRIX64"
-        return DICE_INVALID_OFFSET;
-    }
@@ -1917 +1922 @@
-bool
-Device::readTxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *result) {
-llX
+"PRIX64"
-
-    fb_nodeaddr_t offset_tx = txOffsetGen(i, offset, sizeof(fb_quadlet_t));
@@ -1925 +1930 @@
-bool
-Device::writeTxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t data) {
-llX, data: 0x%08X
+"PRIX64", data: 0x%08"PRIX32"
-        i, offset, data);
-
@@ -1934 +1939 @@
-bool
-Device::readTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length %u
+"PRIX64", length: %zd
-        offset, length);
-
@@ -1943 +1948 @@
-bool
-Device::writeTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length %u
+"PRIX64", length: %zd
-        offset, length);
-
@@ -1975 +1980 @@
-    // out-of-range check
-    if(offset_tx + length > m_tx_reg_offset+4+m_tx_reg_size*m_nb_tx) {
-llX
+4"PRIX64"
-        return DICE_INVALID_OFFSET;
-    }
@@ -1984 +1989 @@
-bool
-Device::readRxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *result) {
-llX
+"PRIX64"
-
-    fb_nodeaddr_t offset_rx=rxOffsetGen(i, offset, sizeof(fb_quadlet_t));
@@ -1992 +1997 @@
-bool
-Device::writeRxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t data) {
-llX, data: 0x%08X
+"PRIX64", data: 0x%08"PRIX32"
-        offset, data);
-
@@ -2001 +2006 @@
-bool
-Device::readRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length %u
+"PRIX64", length: %zd
-        offset, length);
-
@@ -2010 +2015 @@
-bool
-Device::writeRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-llX, length %u
+"PRIX64", length: %zd
-        offset, length);
-
@@ -2042 +2047 @@
-    // out-of-range check
-    if(offset_rx + length > m_rx_reg_offset+4+m_rx_reg_size*m_nb_rx) {
-llX
+4"PRIX64"
-        return DICE_INVALID_OFFSET;
-    }

trunk/libffado/src/dice/dice_eap.cpp

@@ -676 +676 @@
-    // out-of-range check
-    if(length > maxlen) {
-d > %d
+zd > %"PRIu64"
-        return DICE_INVALID_OFFSET;
-    }
@@ -827 +827 @@
-        m_input_route_map[i] = rcfg->getRouteForDestination(dest, ch);
-
-
+ (%d)
-                                          srcBlockToString(m_input_route_map[i].src),
-                                          m_input_route_map[i].srcChannel);
@@ -1978 +1978 @@
-        return false;
-    }
-lu, RX: %l
+u, RX: %
-
-    if(m_tx_configs) {
@@ -2070 +2070 @@
-Device::EAP::StreamConfig::showConfigBlock(struct ConfigBlock &b)
-{
-lu audio, %l
+u audio, %
-    debugOutput(DEBUG_LEVEL_VERBOSE, " AC3 Map       : 0x%08X\n", b.ac3_map);
-    diceNameVector channel_names  = getNamesForBlock(b);

trunk/libffado/src/fbtypes.h

@@ -25 +25 @@
-#define FBTYPES_H
-
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
+
-#include <libraw1394/raw1394.h>
-
@@ -35 +40 @@
-typedef nodeaddr_t  fb_nodeaddr_t;
-
+#define FORMAT_FB_OCTLET_T      "0x%016" PRIX64
+#define FORMAT_FB_NODEID_T      "0x%016" PRIX64
+#define FORMAT_FB_NODEADDR_T    "0x%016" PRIX64
+
-class DeviceManager;
-

trunk/libffado/src/fireworks/efc/efc_cmds_flash.cpp

@@ -68 +68 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Erase:\n");
-l
+
-}
-
@@ -120 +120 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Read:\n");
-l
-l
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Data              : \n");
-    for (unsigned int i=0; i < m_nb_quadlets; i++) {
@@ -174 +174 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Write:\n");
-l
-l
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Data              : \n");
-    for (unsigned int i=0; i < m_nb_quadlets; i++) {
@@ -292 +292 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Get Session Base:\n");
-l
+
-}
-

trunk/libffado/src/fireworks/efc/efc_cmds_hardware.cpp

@@ -127 +127 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC HW CAPS info:\n");
-    debugOutput(DEBUG_LEVEL_NORMAL, " Flags   : 0x%08X\n", m_flags);
-llX
+"PRIX64"
-    debugOutput(DEBUG_LEVEL_NORMAL, " HwType  : 0x%08X\n", m_type);
-l
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Vendor  : %s\n", m_vendor_name);
-    debugOutput(DEBUG_LEVEL_NORMAL, " Model   : %s\n", m_model_name);
@@ -232 +232 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, " # Output Meters : %d\n", m_nb_output_meters);
-    for (i=0;i<m_nb_output_meters;i++) {
-l
+
-    }
-    
-    debugOutput(DEBUG_LEVEL_NORMAL, " # Input Meters  : %d\n", m_nb_input_meters);
-    for (;i<m_nb_output_meters+m_nb_input_meters;i++) {
-l
+
-    }
-}

trunk/libffado/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp

@@ -73 +73 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Get Clock:\n");
-l
-l
-l
+
+
+
-}
-
@@ -124 +124 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Set Clock:\n");
-l
-l
-l
+
+
+
-}
-

trunk/libffado/src/fireworks/efc/efc_cmds_ioconfig.cpp

@@ -162 +162 @@
-                                    (m_type==eCT_Get?"GET":"SET"),
-                                    eIOConfigRegisterToString(m_reg));
-l
+
-}
-

trunk/libffado/src/fireworks/efc/efc_cmds_mixer.cpp

@@ -245 +245 @@
-                                    eMixerTargetToString(m_target),
-                                    eMixerCommandToString(m_command));
-l
-l
+
+
-}
-

trunk/libffado/src/fireworks/efc/efc_cmds_monitor.cpp

@@ -150 +150 @@
-                                    (m_type==eCT_Get?"GET":"SET"),
-                                    eMonitorCommandToString(m_command));
-l
-l
-l
+
+
+
-}
-

trunk/libffado/src/fireworks/fireworks_control.cpp

@@ -321 +321 @@
-            break;
-        }
-lf
+u
-                                            m_Slave->m_channel, val, m_Slave->m_value);
-        return true;
@@ -339 +339 @@
-            return 0.0;
-        }
-lf
+u
-                                            m_Slave->m_channel, m_Slave->m_value);
-        return m_Slave->m_value;
@@ -451 +451 @@
-        }
-
-l
+
-                                            m_Slave->m_channel, val, old_reg, reg);
-        return true;
@@ -583 +583 @@
-            return 0;
-        }
-l
+
-        return true;
-    } else {

trunk/libffado/src/fireworks/fireworks_device.cpp

@@ -43 +43 @@
-
-#define ECHO_FLASH_ERASE_TIMEOUT_MILLISECS 2000
+#define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000
-
-#include <sstream>
@@ -136 +137 @@
-    // get the info from the EFC
-    if ( !discoverUsingEFC() ) {
-        debugError( "Could not discover using EFC\n" );
-        return false;
-    }
@@ -161 +161 @@
-    if (!doEfcOverAVC(m_HwInfo)) {
-        debugError("Could not read hardware capabilities\n");
+        return false;
+    }
+
+    // check the firmware version
+    if (m_HwInfo.m_arm_version < FIREWORKS_MIN_FIRMWARE_VERSION) {
+        debugError("Firmware version %u.%u (rev %u) not recent enough. FFADO requires at least version %u.%u (rev %u).\n", 
+                    (m_HwInfo.m_arm_version >> 24) & 0xFF,
+                    (m_HwInfo.m_arm_version >> 16) & 0xFF,
+                    (m_HwInfo.m_arm_version >> 0) & 0xFFFF,
+                    (FIREWORKS_MIN_FIRMWARE_VERSION >> 24) & 0xFF,
+                    (FIREWORKS_MIN_FIRMWARE_VERSION >> 16) & 0xFF,
+                    (FIREWORKS_MIN_FIRMWARE_VERSION >> 0) & 0xFFFF
+                    );
-        return false;
-    }
@@ -547 +560 @@
-Device::clockIdToClockSource(uint32_t clockid) {
-    ClockSource s;
-l
+
-
-    // the polled values are used to detect
@@ -611 +624 @@
-        return EFC_CMD_HW_CLOCK_UNSPECIFIED;
-    }
-l
+
-    gccmd.showEfcCmd();
-
@@ -624 +637 @@
-        return false;
-    }
-l
+
-
-    EfcSetClockCmd sccmd;

trunk/libffado/src/fireworks/fireworks_firmware.cpp

@@ -172 +172 @@
-    unsigned int version_minor = (m_version & 0x00FF0000) >> 16;
-    unsigned int version_build = (m_version & 0x0000FFFF);
-l
-l
-l
-l
+
+
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Firmware version     : %02u.%02u.%02u (0x%08X)\n", 
-                                    version_major, version_minor, version_build, m_version);
-    debugOutput(DEBUG_LEVEL_NORMAL, " Append CRC           : %s\n", (m_append_crc?"Yes":"No"));
-l
+
-    #endif
-}
@@ -298 +298 @@
-        }
-        
-l
+
-                    i, m_header[i]);
-    }
@@ -337 +337 @@
-        }
-        
-l
+
-                    i, m_data[i]);
-    }

trunk/libffado/src/fireworks/fireworks_session_block.cpp

@@ -255 +255 @@
-
-    if (len != h.size_quads*4) {
-
+z
-    }
-

trunk/libffado/src/genericavc/stanton/scs.cpp

@@ -69 +69 @@
-    // read the current value present in the register, i.e. read-ping
-    if(!readRegBlock(addr, (quadlet_t *)cmdBuffer, 1) ) {
-llX
+"PRIX64"
-    } else {
-        int version = cmdBuffer[0] & 0xFFFF;
@@ -84 +84 @@
-    // execute the command
-    if(!writeRegBlock(addr, (quadlet_t *)cmdBuffer, 1)) {
-llX
+"PRIX64"
-    } else {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Write Ping succeeded\n");
@@ -126 +126 @@
-    // execute the command
-    if(!writeRegBlock(addr, (quadlet_t *)cmdBuffer, 2)) {
-llX
+"PRIX64"
-        return false;
-    }
@@ -140 +140 @@
-    // execute the command
-    if(!writeRegBlock(addr, (quadlet_t *)cmdBuffer, 2)) {
-llX
+"PRIX64"
-        return false;
-    }
@@ -149 +149 @@
-bool
-ScsDevice::writeHSS1394Message(enum eMessageType message_type, byte_t* buffer, size_t len) {
-u
+zd
-        message_type, len);
-    size_t len_quadlets = len/4 + 1;
@@ -169 +169 @@
-    // execute the command
-    if(!writeRegBlock(addr, (quadlet_t *)cmdBuffer, len_quadlets)) {
-llX
+"PRIX64"
-        return false;
-    }
@@ -177 +177 @@
-bool
-ScsDevice::readRegBlock(fb_nodeaddr_t addr, fb_quadlet_t *data, size_t length_quads, size_t blocksize_quads) {
-llX, length %u
+"PRIX64", length %zd
-        addr, length_quads, data);
-
@@ -187 +187 @@
-        int quads_todo = length_quads - quads_done;
-        if (quads_todo > (int)blocksize_quads) {
-
+z
-            quads_todo = blocksize_quads;
-        }
@@ -196 +196 @@
-        #endif
-
-llX
+"PRIX64"
-        if(!get1394Service().read( nodeId, curr_addr, quads_todo, curr_data ) ) {
-llX
+"PRIX64"
-            return false;
-        }
@@ -210 +210 @@
-bool
-ScsDevice::writeRegBlock(fb_nodeaddr_t addr, fb_quadlet_t *data, size_t length_quads, size_t blocksize_quads) {
-
-
+
+
+
-
-    fb_quadlet_t data_out[length_quads];
@@ -224 +225 @@
-        int quads_todo = length_quads - quads_done;
-        if (quads_todo > (int)blocksize_quads) {
-
+z
-            quads_todo = blocksize_quads;
-        }
@@ -233 +234 @@
-        #endif
-
-llX
+"PRIX64"
-        if(!get1394Service().write( nodeId, addr, quads_todo, curr_data ) ) {
-llX
+"PRIX64"
-            return false;
-        }

trunk/libffado/src/libavc/audiosubunit/avc_descriptor_audio.h

@@ -43 +43 @@
-class Ieee1394Service;
-
+// forward declarations
+namespace Util {
+    namespace Cmd {
+        class IOSSerialize;
+        class IISDeserialize;
+    }
+}
+
-namespace AVC {
-
-
-class Util::Cmd::IOSSerialize;
-class Util::Cmd::IISDeserialize;
-
-class AVCAudioClusterInformation

trunk/libffado/src/libavc/descriptors/avc_descriptor.cpp

@@ -249 +249 @@
-        // copy the payload
-        
-+readDescCmd.m_data_length>
+ + readDescCmd.m_data_length > 
-            debugWarning("Device returned too much data, truncating\n");
-            readDescCmd.m_data_length=m_descriptor_length-bytes_read;
-        }
-        
-
+
+
+
-        
-        memcpy(m_data+bytes_read,readDescCmd.m_data, readDescCmd.m_data_length);

trunk/libffado/src/libavc/descriptors/avc_descriptor_cmd.cpp

@@ -120 +120 @@
-        break;
-    default:
-s
+d
-        return false;
-    }

trunk/libffado/src/libavc/general/avc_plug.cpp

@@ -1423 +1423 @@
-        case eAPD_Output:
-            return string("Output");
-        default:
-        case eAPT_Unknown:
-            return string("Unknown");
-    }
-}

trunk/libffado/src/libcontrol/Element.cpp

@@ -327 +327 @@
-{
-    Util::MutexLockHelper lock(getLock());
-
+z
-        getName().c_str(), m_Children.size());
-

trunk/libffado/src/libieee1394/ARMHandler.cpp

@@ -123 +123 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "  tlabel: 0x%02X, tcode: 0x%02X, extended tcode: 0x%02X\n",
-        arm_req->tlabel, arm_req->tcode, arm_req->extended_transaction_code);
-l
+
-        arm_req->generation);
-l
+
-        arm_req->buffer_length);
-    printBufferBytes(DEBUG_LEVEL_VERBOSE, arm_req->buffer_length, arm_req->buffer);

trunk/libffado/src/libieee1394/configrom.cpp

@@ -486 +486 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, 
-llX
+"PRIX64"
-                 getGuid());
-
@@ -517 +517 @@
-
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-llX
+"PRIX64"
-                        guid);
-
@@ -524 +524 @@
-            if ( nodeId != getNodeId() ) {
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-llX
+"PRIX64"
-                             "from %d to %d\n",
-                             getGuid(),
@@ -532 +532 @@
-            } else {
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-llX
+"PRIX64"
-                             getGuid(),
-                             getNodeId());
@@ -549 +549 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE,
-llX
+"PRIX64"
-                 "the bus anymore (removed?)\n",
-                 getGuid() );
@@ -562 +562 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "Config ROM\n" );
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tCurrent Node Id:\t%d\n",       getNodeId() );
-llX
+"PRIX64"
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tVendor Name:\t\t%s\n",         getVendorName().c_str() );
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tModel Name:\t\t%s\n",          getModelName().c_str() );
@@ -583 +583 @@
-    printMessage("Config ROM\n" );
-    printMessage("\tCurrent Node Id:\t%d\n",       getNodeId() );
-llX
+"PRIX64"
-    printMessage("\tVendor Name:\t\t%s\n",         getVendorName().c_str() );
-    printMessage("\tModel Name:\t\t%s\n",          getModelName().c_str() );

trunk/libffado/src/libieee1394/cycletimer.h

@@ -95 +95 @@
-#ifdef DEBUG
-        if (x >= TICKS_PER_SECOND * 128L) {
-llu
+"PRIu64"
-        }
-#endif
@@ -118 +118 @@
-#ifdef DEBUG
-        if (x < 0) {
-lld
+"PRId64"
-        }
-#endif
@@ -145 +145 @@
-#ifdef DEBUG
-        if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) {
-llu
+"PRIu64"
-        }
-        if (x < 0) {
-lld
+"PRId64"
-        }
-#endif
@@ -249 +249 @@
-    if(diff > max || diff < -max) {
-        debugWarning("difference does not make any sense\n");
-lld max=%lld
+"PRId64" max=%"PRId64"
-        
-    }
@@ -302 +302 @@
-    uint64_t timestamp;
-
-04llX CY=%u CTR=%08llX
+"PRIX64" CY=%u CTR=%08"PRIX64"
-                       syt_timestamp, rcv_cycle, ctr_now);
-
@@ -313 +313 @@
-    int diff_cycles = diffCycles(cc_cycles, rcv_cycle);
-    if (diff_cycles<0) {
-llu
+"PRIu64"
-                        rcv_cycle, cc_cycles, diff_cycles);
-    }
@@ -351 +351 @@
-    } else {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-d + %d = %d
+u + %"PRId64" = %"PRId64"
-                           rcv_cycle, delta_cycles, new_cycles);
-
@@ -372 +372 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-llu TSC=%08lX SYT=%04X
+"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -391 +391 @@
-    uint64_t timestamp;
-
-llX
+"PRIX64"
-                       syt_timestamp, rcv_ctr);
-
@@ -433 +433 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-llu TSC=%08lX SYT=%04X
+"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -457 +457 @@
-    uint64_t timestamp;
-
-llX CY=%04X CTR=%08llX
+"PRIX64" CY=%04X CTR=%08"PRIX64"
-                       syt_timestamp, xmt_cycle, ctr_now);
-
@@ -467 +467 @@
-    int diff_cycles = diffCycles(xmt_cycle, cc_cycles);
-    if (diff_cycles<0) {
-llu
+"PRIu64"
-                        xmt_cycle, cc_cycles, diff_cycles);
-    }
@@ -505 +505 @@
-    } else {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-d + %d = %d
+u + %"PRId64" = %"PRId64"
-                           xmt_cycle, delta_cycles, new_cycles);
-
@@ -526 +526 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-llu TSC=%08lX SYT=%04X
+"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -164 +164 @@
-                        m_cycle_timer_prev, maxtries2);
-        }
-lu, local: %17llu
+u, local: %17"PRIu64"
-                            m_cycle_timer_prev, local_time);
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-llu
+"PRIu64"
-                           (uint32_t)m_cycle_timer_prev, (uint64_t)CYCLE_TIMER_TO_TICKS(m_cycle_timer_prev),
-                           (unsigned int)CYCLE_TIMER_GET_SECS( m_cycle_timer_prev ),
@@ -291 +291 @@
-    cycle_timer_ticks = CYCLE_TIMER_TO_TICKS(cycle_timer);
-
-lu, local: %17llu
+u, local: %17"PRIu64"
-                        cycle_timer, local_time);
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                       (uint32_t)cycle_timer, (uint64_t)cycle_timer_ticks,
-                       (unsigned int)TICKS_TO_SECS( (uint64_t)cycle_timer_ticks ),
@@ -310 +310 @@
-                bw_abs, bw_rel);
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-lu, ticks/update: %l
+u, ticks/update: %
-                m_usecs_per_update, m_ticks_per_update, m_dll_e2);
-    debugOutput(DEBUG_LEVEL_VERBOSE,
@@ -351 +351 @@
-        ffado_microsecs_t now = Util::SystemTimeSource::getCurrentTimeAsUsecs();
-        int sleep_time = m_sleep_until - now;
-lld/%f (now: %lld
+"PRId64"/%f (now: %"PRId64"
-                    this, m_sleep_until, m_next_time_usecs, now, sleep_time);
-        #endif
@@ -390 +390 @@
-        if(not_good) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, 
-lld, max: +/- %ld (try: %d) %lld
+"PRId64", max: +/- %u (try: %d) %"PRId64"
-                        this, err_ticks, 1*TICKS_PER_CYCLE, ntries, expected_ticks);
-            // sleep half a cycle to make sure the hardware moved on
-
+ / 2
-        }
-
@@ -409 +409 @@
-    // // simulate a random scheduling delay between (0-10ms)
-    // ffado_microsecs_t tmp = Util::SystemTimeSource::SleepUsecRandom(10000);
-ll
+
-
-    if(m_unhandled_busreset) {
@@ -419 +419 @@
-    }
-
-lu, local: %17llu
+u, local: %17"PRIu64"
-                        cycle_timer, local_time);
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-llu
+"PRIu64"
-                       (uint32_t)cycle_timer, (uint64_t)cycle_timer_ticks,
-                       (unsigned int)TICKS_TO_SECS( (uint64_t)cycle_timer_ticks ),
@@ -436 +436 @@
-    } else if (diff_ticks > m_ticks_per_update * 20) {
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-lld
+"PRId64"
-                    diff_ticks, (float)(m_ticks_per_update * 20));
-        if(!initDLL()) {
@@ -462 +462 @@
-            diff_ticks_corr = diff_ticks - ticks_late;
-            debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-lld, diff_ticks = %lld, ticks_late = %lld
+"PRId64", diff_ticks = %"PRId64", ticks_late = %"PRId64"
-                               diff_ticks_corr, diff_ticks, ticks_late);
-        } else {
@@ -473 +473 @@
-        // makes no sense if not running realtime
-        if(m_realtime && usecs_late > 1000) {
-lld
+"PRId64"
-        }
-        #endif
@@ -526 +526 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
-lld ticks_late=%lld
+"PRId64" ticks_late=%"PRId64"
-                           m_current_time_usecs, m_next_time_usecs, usecs_late, ticks_late);
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lld
+"PRId64"
-                           m_current_time_ticks, m_next_time_ticks, diff_ticks);
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                           (uint64_t)m_current_time_ticks,
-                           (unsigned int)TICKS_TO_SECS( (uint64_t)m_current_time_ticks ),
@@ -538 +538 @@
-                           (unsigned int)TICKS_TO_OFFSET( (uint64_t)m_current_time_ticks ) );
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                           (uint64_t)m_next_time_ticks,
-                           (unsigned int)TICKS_TO_SECS( (uint64_t)m_next_time_ticks ),
@@ -545 +545 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                           local_time, m_dll_e2, getRate());
-    }
@@ -589 +589 @@
-    }
-    int32_t ctr_diff = cycle_timer_ticks-dll_time;
-llu - DLL %010lu = %010l
+"PRIu64" - DLL %010u = %010
-                this, cycle_timer_ticks, dll_time, ctr_diff, (ctr_diff>0?"lag":"lead"));
-#endif
@@ -625 +625 @@
-    if (y_step_in_ticks_int > 0) {
-        retval = addTicks(offset_in_ticks_int, y_step_in_ticks_int);
-lld, time_diff: %f, rate: %f, retval: %l
+d, time_diff: %f, rate: %f, retval: %
-                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/
-    } else {
@@ -631 +631 @@
-
-        // this can happen if the update thread was woken up earlier than it should have been
-lld, time_diff: %f, rate: %f, retval: %l
+d, time_diff: %f, rate: %f, retval: %
-                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/
-    }
@@ -792 +792 @@
-        if (diffTicks(cycle_timer_ticks, m_cycle_timer_ticks_prev) < 0) {
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-llu -> %llu
+"PRIu64" -> %"PRIu64"
-                        maxtries, m_cycle_timer_ticks_prev, cycle_timer_ticks);
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
@@ -798 +798 @@
-                        m_cycle_timer_prev, *cycle_timer);
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                        cycle_timer_ticks,
-                        (unsigned int)TICKS_TO_SECS( cycle_timer_ticks ),
@@ -804 +804 @@
-                        (unsigned int)TICKS_TO_OFFSET( cycle_timer_ticks ) );
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                        m_cycle_timer_ticks_prev,
-                        (unsigned int)TICKS_TO_SECS( m_cycle_timer_ticks_prev ),

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -57 +57 @@
-    , m_armHelperRealtime( NULL )
-    , m_handle( 0 )
-CV
+VC
-    , m_util_handle( 0 )
-    , m_port( -1 )
@@ -85 +85 @@
-    , m_armHelperRealtime( NULL )
-    , m_handle( 0 )
-CV
+VC
-    , m_util_handle( 0 )
-    , m_port( -1 )
@@ -122 +122 @@
-          ++it )
-    {
-llX
+"PRIX64"
-        if(m_armHelperNormal) {
-            int err = raw1394_arm_unregister(m_armHelperNormal->get1394Handle(), (*it)->getStart());
-            if (err) {
-llX
+"PRIX64"
-                debugError(" Error: %s\n", strerror(errno));
-            }
@@ -557 +557 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-llX, length = %u
+"PRIX64", length = %zd
-            nodeId, addr, length);
-        printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, buffer );
@@ -566 +566 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-llX, length = %u
+"PRIX64", length = %zd
-                    nodeId, addr, length);
-        #endif
@@ -612 +612 @@
-
-    #ifdef DEBUG
-llX, length = %
+"PRIX64", length = %z
-                nodeId, addr, length);
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, data );
@@ -649 +649 @@
-    }
-    #ifdef DEBUG
-llX
+"PRIX64"
-                nodeId, addr);
-llX) *(addr)=0x%016llX
+"PRIX64") *(addr)=0x%016"PRIX64"
-                compare_value, swap_value);
-    fb_octlet_t buffer;
@@ -657 +657 @@
-        debugWarning("Could not read register\n");
-    } else {
-llX
+"PRIX64"
-    }
-    #endif
@@ -681 +681 @@
-        debugWarning("Could not read register\n");
-    } else {
-llX
+"PRIX64"
-    }
-    #endif
@@ -831 +831 @@
-    }
-
+    // check the request and figure out what happened
+    if(m_fcp_block.status == eFS_Waiting) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "FCP response timed out\n");
+        retval = false;
+        goto out;
+    }
+    if(m_fcp_block.status == eFS_Error) {
+        debugError("FCP request/response error\n");
+        retval = false;
+        goto out;
+    }
+
+out:
-    // stop listening for FCP responses
-    err = raw1394_stop_fcp_listen(m_handle);
@@ -836 +849 @@
-        debugOutput(DEBUG_LEVEL_VERBOSE, "could not stop FCP listen (err=%d, errno=%d)\n", err, errno);
-        retval = false;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    m_fcp_block.status = eFS_Empty;
-    return retval;
@@ -876 +875 @@
-    fb_quadlet_t *data_quads = (fb_quadlet_t *)data;
-    #ifdef DEBUG
-
+z
-                nodeid, response, length);
-    printBuffer(DEBUG_LEVEL_VERY_VERBOSE, (length+3)/4, data_quads );
@@ -906 +905 @@
-            } else if(FCP_MASK_SUBUNIT_AND_OPCODE(first_quadlet) 
-                      != FCP_MASK_SUBUNIT_AND_OPCODE(CondSwapFromBus32(m_fcp_block.request[0]))) {
-lX != %08l
+X != %08
-                             FCP_MASK_SUBUNIT_AND_OPCODE(first_quadlet),
-                             FCP_MASK_SUBUNIT_AND_OPCODE(CondSwapFromBus32(m_fcp_block.request[0])));
@@ -970 +969 @@
-        return 0;
-    }
-l
+
-
-    if(!readNoLock( 0xffc0 | nodeId, CSR_REGISTER_BASE + CSR_SPLIT_TIMEOUT_LO, 1,
@@ -977 +976 @@
-        return 0;
-    }
-l
+
-
-    split_timeout_hi = CondSwapFromBus32(split_timeout_hi);
@@ -1073 +1072 @@
-
-bool Ieee1394Service::registerARMHandler(ARMHandler *h) {
-
-
+
+
+
-
-    // FIXME: note that this will result in the ARM handlers not running in a realtime context
@@ -1083 +1083 @@
-                                   h->getClientTransactions());
-    if (err) {
-llX
+"PRIX64"
-        debugError(" Error: %s\n", strerror(errno));
-        return false;
@@ -1092 +1092 @@
-
-bool Ieee1394Service::unregisterARMHandler( ARMHandler *h ) {
-llX
+"PRIX64"
-        h, h->getStart());
-
@@ -1123 +1123 @@
- */
-nodeaddr_t Ieee1394Service::findFreeARMBlock( nodeaddr_t start, size_t length, size_t step ) {
-
-
+
+
+
-
-    int cnt=0;
@@ -1135 +1136 @@
-
-        if (err) {
-llX
+"PRIX64"
-            debugError("    Error: %s\n", strerror(errno));
-            start += step;
-        } else {
-llX
+"PRIX64"
-            err = raw1394_arm_unregister(m_handle, start);
-            if (err) {
@@ -1188 +1189 @@
-            raw1394_arm_response_t arm_resp = arm_req_resp->response;
-
-llX
+"PRIX64"
-                (*it)->getStart());
-            debugOutput(DEBUG_LEVEL_VERBOSE," request type   : 0x%02X\n", request_type);
@@ -1583 +1584 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, " CycleTimerHelper: %p, IsoManager: %p, WatchDog: %p\n",
-                 m_pCTRHelper, m_pIsoManager, m_pWatchdog );
-llu
+"PRIu64"
-                ctr,
-                (unsigned int)TICKS_TO_SECS( ctr ),

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -261 +261 @@
-
-    // wake ourselves up
-
+if(m_handle) 
-}
-
@@ -396 +396 @@
-    if((pkt_ctr & ~0x0FFFL) != pkt_ctr_ref) {
-        debugWarning("reconstructed CTR counter discrepancy\n");
-
-
-
+
+
+
+
+
+
+
-    }
-    #endif
@@ -475 +479 @@
-        if(((pkt_ctr & ~0x0FFFL) != pkt_ctr_ref) && (m_packets > m_buf_packets)) {
-            debugWarning("reconstructed CTR counter discrepancy\n");
-
-
-
+
+
+
+
+
+
+
-        }
-        #endif

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -114 +114 @@
-
-        if (!h->handleBusReset()) {
-
+, h
-            retval = false;
-        }
@@ -261 +261 @@
-
-        if(no_one_to_poll) {
-(DEBUG_LEVEL_ULTRA
+Extreme(DEBUG_LEVEL
-                        "(%p, %s) No one to poll, waiting for something to happen\n",
-                        this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"));
@@ -325 +325 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-lld, max = %lld, now: %08lX, last: %08l
+"PRId64", max = %"PRId64", now: %08X, last: %08
-                           this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"), 
-                           i, measured_diff_ticks, max_diff_ticks, ctr_at_poll_return, last_packet_seen);
-        if(measured_diff_ticks > max_diff_ticks) {
-lX, last: %08lX, diff: %lld (max: %lld
+X, last: %08X, diff: %"PRId64" (max: %"PRId64"
-                       this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"),
-                       ctr_at_poll_return, last_packet_seen, measured_diff_ticks, max_diff_ticks);
@@ -410 +410 @@
-            debugError("(%p) sem_timedwait error (result=%d errno=EINVAL)\n", 
-                        this, result);
-
-
+
+
+
-            return eAR_Error;
-        } else {
-            debugError("(%p) sem_timedwait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-
-
+
+
+
-            return eAR_Error;
-        }
@@ -885 +887 @@
-
-    m_StreamProcessors.push_back(stream);
-d streams, %
+zd streams, %z
-                                      m_StreamProcessors.size(), m_IsoHandlers.size());
-    return true;

trunk/libffado/src/libieee1394/test-cyclecalc.cpp

@@ -52 +52 @@
-                          (unsigned int)CYCLE_TIMER_GET_OFFSET(now_ctr));
-
-llu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
@@ -68 +68 @@
-    #endif
-
-llu
+"PRIu64"
-                          calc_ts,
-                          (unsigned int)TICKS_TO_SECS(calc_ts),

trunk/libffado/src/libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp

@@ -190 +190 @@
-            m_dll_e2 += m_dll_c * err;
-
-llu %lld %d %d
+"PRIu64" %"PRId64" %"PRId32" %"PRId64"
-                                             m_next_packet_timestamp, m_next_packet_timestamp-m_last_timestamp,
-                                             frames_in_tempbuffer,  ((length / sizeof (quadlet_t)) - 2) / m_dimension);

trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

@@ -148 +148 @@
-    if(isRunning()) {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                           m_last_timestamp, m_syt_interval, getTicksPerFrame());
-/*        debugOutput(DEBUG_LEVEL_NORMAL,
-llu ticks | delta_t: %5lld
+"PRIu64" ticks | delta_t: %5"PRId64"
-                           m_last_timestamp, now_t-last_t, m_data_buffer->getBufferFill());*/
-    }
@@ -378 +378 @@
-                    sample_int |= 0x01000000; // flag that there is a midi event present
-                    *buffer = sample_int;
+                    debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "(%p) MIDI [%d]: %08X\n", this, i, sample_int);
-                } else if(IEC61883_AM824_HAS_LABEL(sample_int, IEC61883_AM824_LABEL_MIDI_2X)
-                       || IEC61883_AM824_HAS_LABEL(sample_int, IEC61883_AM824_LABEL_MIDI_3X) ) {

trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h

@@ -29 +29 @@
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-namespace Streaming {

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -96 +96 @@
-
-    debugOutputExtreme( DEBUG_LEVEL_ULTRA_VERBOSE,
-
+(int) 
-    // check whether the packet buffer has packets for us to send.
-    // the base timestamp is the one of the next sample in the buffer
@@ -142 +142 @@
-        {
-            debugOutput( DEBUG_LEVEL_NORMAL,
-u
-
+d
+(int)
-                         transmit_at_cycle, cycles_until_transmit );
-            // we are too late
@@ -154 +154 @@
-
-            debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-u
-
+d
+(int)
-                               transmit_at_cycle, cycles_until_transmit, now_cycle );
-            #endif
@@ -201 +201 @@
-            // we are too late
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-u, TC=%04u, CUT=%04d, TSP=%011llu
-
+d, TC=%04u, CUT=%04d, TSP=%011"PRIu64"
+(int)
-                        transmit_at_cycle, cycles_until_transmit,
-                        presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time) );
@@ -230 +230 @@
-            // for timestamp tracing
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                               presentation_time,
-                               (unsigned int)CYCLE_TIMER_GET_CYCLES(pkt_ctr),
@@ -240 +240 @@
-        {
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu (%04u), TSP=%011llu
-
+"PRIu64" (%04u), TSP=%011"PRId64"
+(int)
-                               transmit_at_cycle, cycles_until_transmit,
-                               transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time),
@@ -249 +249 @@
-            {
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu (%04u), TSP=%011llu 
-
+"PRIu64" (%04u), TSP=%011"PRId64"
+(int)
-                                   transmit_at_cycle, cycles_until_transmit,
-                                   transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time),
@@ -269 +269 @@
-    if (m_data_buffer->readFrames(m_syt_interval, (char *)(data + 8)))
-    {
-Y_VER
-llu
+
+"PRIu64"
-                           m_last_timestamp,
-                           (unsigned int)TICKS_TO_CYCLES(m_last_timestamp));
+        #if 0
+        // debug code to output the packet content
+        char tmpbuff[8192];
+        int cnt=0;
+        quadlet_t *tmp = (quadlet_t *)((char *)(data + 8));
+
+        for(int i=0; i<m_syt_interval; i++) {
+            cnt += snprintf(tmpbuff + cnt, 8192-cnt, "[%02d] ", i);
+            for(int j=0; j<m_dimension; j++) {
+                cnt += snprintf(tmpbuff + cnt, 8192-cnt, "%08X ", *tmp);
+                tmp++;
+            }
+            cnt += snprintf(tmpbuff + cnt, 8192-cnt, "\n");
+        }
+        debugOutput(DEBUG_LEVEL_VERBOSE, "\n%s\n", tmpbuff);
+        #endif
-        return eCRV_OK;
-    }
@@ -286 +302 @@
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-CY=%04u, TSP=%011llu
-
+TSP=%011"PRIu64"
+(int)
-                       (unsigned int)TICKS_TO_CYCLES(m_last_timestamp));
-
@@ -323 +339 @@
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-CY=%04u, TSP=%011llu
-
+TSP=%011"PRIu64"
+(int)
-                       (unsigned int)TICKS_TO_CYCLES(m_last_timestamp) );
-    packet->sid = m_local_node_id;
@@ -1036 +1052 @@
-                    *target_event = CondSwapToBus32(tmpval);
-
-//                     debugOutput 
-// 
-//                     debugOutput 
-// 
+                    debugOutputExtreme
+
+                    debugOutputExtreme
+
-                } else {
-                    // can't send a byte, either because there is no byte,

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h

@@ -30 +30 @@
-#include "config.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-namespace Streaming {

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -77 +77 @@
-    , m_ticks_per_frame( 0 )
-    , m_dll_bandwidth_hz ( STREAMPROCESSOR_DLL_BW_HZ )
-sync_delay
+extra_buffer
-    , m_in_xrun( false )
-{
@@ -130 +130 @@
-    m_in_xrun = true;
-    SIGNAL_ACTIVITY_ALL;
-}
-
-uint64_t StreamProcessor::getTimeNow() {
-    return m_1394service.getCycleTimerTicks();
-}
-
@@ -172 +168 @@
- * Buffer management and manipulation          *
- ***********************************************/
+void
+StreamProcessor::getBufferHeadTimestamp(ffado_timestamp_t *ts, signed int *fc)
+{
+    m_data_buffer->getBufferHeadTimestamp(ts, fc);
+}
+
+void
+StreamProcessor::getBufferTailTimestamp(ffado_timestamp_t *ts, signed int *fc)
+{
+    m_data_buffer->getBufferTailTimestamp(ts, fc);
+}
+
+void StreamProcessor::setBufferTailTimestamp(ffado_timestamp_t new_timestamp)
+{
+    m_data_buffer->setBufferTailTimestamp(new_timestamp);
+}
+
+void
+StreamProcessor::setBufferHeadTimestamp(ffado_timestamp_t new_timestamp)
+{
+    m_data_buffer->setBufferHeadTimestamp(new_timestamp);
+}
-
-int StreamProcessor::getBufferFill() {
@@ -177 +195 @@
-}
-
-int64_t
-StreamProcessor::getTimeUntilNextPeriodSignalUsecs()
-{
-    uint64_t time_at_period=getTimeAtPeriod();
-
-    // we delay the period signal with the sync delay
-    // this makes that the period signals lag a little compared to reality
-    // ISO buffering causes the packets to be received at max
-    // m_handler->getWakeupInterval() later than the time they were received.
-    // hence their payload is available this amount of time later. However, the
-    // period boundary is predicted based upon earlier samples, and therefore can
-    // pass before these packets are processed. Adding this extra term makes that
-    // the period boundary is signalled later
-    time_at_period = addTicks(time_at_period, m_StreamProcessorManager.getSyncSource().getSyncDelay());
-
-    uint64_t cycle_timer=m_1394service.getCycleTimerTicks();
-
-    // calculate the time until the next period
-    int32_t until_next=diffTicks(time_at_period,cycle_timer);
-
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> TAP=%11llu, CTR=%11llu, UTN=%11ld\n",
-        time_at_period, cycle_timer, until_next
-        );
-
-    // now convert to usecs
-    // don't use the mapping function because it only works
-    // for absolute times, not the relative time we are
-    // using here (which can also be negative).
-    return (int64_t)(((float)until_next) / TICKS_PER_USEC);
-}
-
-void
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
-unsigned int
-
-
-
-
-
-
-
+
+
-}
-
-uint64_t
-
-
-
-
-
-
-
+
-{
-    if (getType() == ePT_Receive) {
@@ -412 +378 @@
-        if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
-            int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
-lld
+"PRId64"
-            double tsp_diff_d = tsp_diff;
-            double fs_syt = 1.0/tsp_diff_d;
@@ -433 +399 @@
-                if(diff-ticks_per_packet > 50 || diff-ticks_per_packet < -50) {
-                    debugOutput(DEBUG_LEVEL_VERBOSE,
-u rather large TSP difference TS=%011llu => TS=%011llu
-
+d rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                m_last_timestamp, diff, ticks_per_packet);
-                    // !!!HACK!!! FIXME: this is the result of a failure in wrapping/unwrapping somewhere
@@ -444 +410 @@
-                    diff = diffTicks(last_timestamp_fixed, m_last_timestamp2);
-                    if(diff-ticks_per_packet < 50 && diff-ticks_per_packet > -50) {
-u rather large TSP difference TS=%011llu => TS=%011llu
-
+d rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                    m_last_timestamp, diff, ticks_per_packet);
-                        debugWarning("HACK: fixed by adding one second of ticks. This is a bug being run-time fixed.\n");
@@ -454 +420 @@
-                        diff = diffTicks(last_timestamp_fixed, m_last_timestamp2);
-                        if(diff-ticks_per_packet < 50 && diff-ticks_per_packet > -50) {
-u rather large TSP difference TS=%011llu => TS=%011llu
-
+d rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                        m_last_timestamp, diff, ticks_per_packet);
-                            debugWarning("HACK: fixed by subtracing one second of ticks. This is a bug being run-time fixed.\n");
@@ -463 +429 @@
-                }
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu %011llu
-
+"PRIu64" %011"PRIu64"
+(int)
-                                m_last_timestamp2, m_last_timestamp, 
-                                diff, ticks_per_packet);
@@ -471 +437 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
-
+"PRIu64"
+(int)
-                          m_last_timestamp);
-
@@ -640 +606 @@
-        if (result == eCRV_Packet) {
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu
-
+"PRIu64"
+(int)
-
-            // assumed not to xrun
@@ -691 +657 @@
-        if (result == eCRV_Packet || result == eCRV_Defer) {
-            debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-llu
-
+"PRIu64"
+(int)
-
-            // valid packet timestamp
@@ -728 +694 @@
-            if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
-                int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
-lld
+"PRId64"
-                double tsp_diff_d = tsp_diff;
-                double fs_syt = 1.0/tsp_diff_d;
@@ -737 +703 @@
-                debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)\n",
-                           fs_nom, fs_syt, fs_diff, fs_diff_norm);
-llu, m_last_timestamp2: %011llu
+"PRIu64", m_last_timestamp2: %011"PRIu64"
-//                            fs_diff, m_last_timestamp, m_last_timestamp2);
-                if (fs_diff_norm > 0.01 || fs_diff_norm < -0.01) {
@@ -750 +716 @@
-                if(diff-ticks_per_packet > 50 || diff-ticks_per_packet < -50) {
-                    debugOutput(DEBUG_LEVEL_VERBOSE,
-llu => TS=%011llu
-
+"PRIu64" => TS=%011"PRIu64"
+(int)
-                                m_last_timestamp, diff, ticks_per_packet);
-                }
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-llu %011llu
-
+"PRIu64" %011"PRIu64"
+(int)
-                                m_last_timestamp, diff, ticks_per_packet);
-            }
@@ -791 +757 @@
-            goto send_empty_packet;
-        } else if (result == eCRV_Again) {
-
+(int)
-            if(m_state != m_next_state) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state from %s to %s\n",
@@ -826 +792 @@
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-                       "XMIT EMPTY: CY=%04u\n",
-
+(int)
-
-    generateEmptyPacketHeader(data, length, tag, sy, pkt_ctr);
@@ -843 +809 @@
-    bool result;
-    debugOutputExtreme( DEBUG_LEVEL_VERBOSE,
-llu
+"PRIu64"
-                        this, getTypeString(), nbframes, ts);
-    assert( getType() == ePT_Receive );
@@ -874 +840 @@
-    lag_frames = (((float)lag_ticks) / srate);
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lld, %llu
+"PRId64", %"PRIu64"
-                       this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    if (lag_frames >= 1.0) {
-        // the stream lags
-lld, %llu
+"PRId64", %"PRIu64"
-                      this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    } else if (lag_frames <= -1.0) {
-        // the stream leads
-lld, %llu
+"PRId64", %"PRIu64"
-                      this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    }
@@ -896 +862 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lld
+"PRId64"
-                       this, nbframes, ts);
-    // dry run on this side means that we put silence in all enabled ports
@@ -907 +873 @@
-{
-    bool result;
-lld
+"PRId64"
-    result = m_data_buffer->dropFrames(nbframes);
-    SIGNAL_ACTIVITY_ISO_RECV;
@@ -917 +883 @@
-    bool result;
-    debugOutputExtreme( DEBUG_LEVEL_VERBOSE,
-llu
+"PRIu64"
-                        this, getTypeString(), nbframes, ts);
-    assert( getType() == ePT_Transmit );
@@ -930 +896 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-llu
+"PRIu64"
-                       nbframes, ts);
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-llu
+"PRIu64"
-    return true; // FIXME: what about failure?
-}
@@ -943 +909 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-llu
+"PRIu64"
-                       nbframes, ts);
-    // do nothing
@@ -953 +919 @@
-{
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                       nbframes, ts);
-
@@ -1104 +1070 @@
-    // make the scratch buffer one period of frames long
-    m_scratch_buffer_size_bytes = m_StreamProcessorManager.getPeriodSize() * getEventsPerFrame() * getEventSize();
-d quadlets\n"
+zd quadlets\n", m_scratch_buffer_size_bytes
-    if(m_scratch_buffer) delete[] m_scratch_buffer;
-    m_scratch_buffer = new byte_t[m_scratch_buffer_size_bytes];
@@ -1193 +1159 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-llu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-llu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1239 +1205 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-llu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-llu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1263 +1229 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-llu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-llu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1288 +1254 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-llu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-llu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1384 +1350 @@
-StreamProcessor::doStop()
-{
+    assert(m_data_buffer);
+
-    float ticks_per_frame;
-
+
+
+
-
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Enter from state: %s\n", ePSToString(m_state));
@@ -1392 +1362 @@
-    switch(m_state) {
-        case ePS_Created:
-            assert(m_data_buffer);
-
-            // prepare the framerate estimate
-            ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_StreamProcessorManager.getNominalRate());
@@ -1399 +1367 @@
-            m_local_node_id= m_1394service.getLocalNodeId() & 0x3f;
-            m_correct_last_timestamp = false;
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Initializing remote ticks/frame to %f\n", ticks_per_frame);
-
+
-            // initialize internal buffer
-            result &= m_data_buffer->setBufferSize(ringbuffer_size_frames);
-
+
-            result &= m_data_buffer->setEventSize( getEventSize() );
-            result &= m_data_buffer->setEventsPerFrame( getEventsPerFrame() );
@@ -1413 +1381 @@
-            }
-            result &= m_data_buffer->setNominalRate(ticks_per_frame);
-*
+ * 
-            result &= m_data_buffer->setBandwidth(STREAMPROCESSOR_DLL_FAST_BW_HZ / (double)TICKS_PER_SECOND);
-            result &= m_data_buffer->prepare(); // FIXME: the name
@@ -1419 +1387 @@
-            debugOutput(DEBUG_LEVEL_VERBOSE, "DLL info: nominal tpf: %f, update period: %d, bandwidth: %e 1/ticks (%e Hz)\n", 
-                        m_data_buffer->getNominalRate(), m_data_buffer->getUpdatePeriod(), m_data_buffer->getBandwidth(), m_data_buffer->getBandwidth() * TICKS_PER_SECOND);
-
-            break;
-        case ePS_DryRunning:
@@ -1432 +1399 @@
-    }
-
-
+
+
-    // make the buffer transparent
-    m_data_buffer->setTransparent(true);
@@ -1549 +1517 @@
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Enter from state: %s\n", ePSToString(m_state));
-
+
+
+
+
+
-    switch(m_state) {
-        case ePS_DryRunning:
@@ -1556 +1528 @@
-            // be picked up by the packet iterator
-
-
-
+
+
+
+
-                return false;
-            }
+
-            if (getType() == ePT_Transmit) {
-                ringbuffer_size_frames = m_StreamProcessorManager.getNbBuffers() * m_StreamProcessorManager.getPeriodSize();
-
-
-
-
-
-
-
+
+
+
+
-                // prefill the buffer
-                if(!transferSilence(ringbuffer_size_frames)) {
@@ -1929 +1901 @@
-    }
-    uint64_t now = m_1394service.getCycleTimerTicks();
-llu
+"PRIu64"
-                        now,
-                        (unsigned int)TICKS_TO_SECS(now),
@@ -1948 +1920 @@
-                                          24576000.0/m_StreamProcessorManager.getSyncSource().m_data_buffer->getRate(),
-                                          24576000.0/m_data_buffer->getRate());
-    float d = getSyncDelay();
-    debugOutputShort(DEBUG_LEVEL_NORMAL, "  Sync delay             : %f ticks (%f frames, %f cy)\n",
-                                         d, d/getTicksPerFrame(),
-                                         d/((float)TICKS_PER_CYCLE));
-    #endif
-    m_data_buffer->dumpInfo();

trunk/libffado/src/libstreaming/generic/StreamProcessor.h

@@ -298 +298 @@
-//--- data buffering and accounting
-public:
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-protected:
-    Util::TimestampedBuffer *m_data_buffer;
@@ -332 +328 @@
-
-        /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-         * boundary. This is assumed to be the point at which the buffer transfer should
-         * take place, meaning that it can be used as a reference timestamp for transmitting
-         * StreamProcessors
-         *
-         * \return the time in usecs
-         */
-        uint64_t getTimeAtPeriodUsecs();
-
-        /**
-         * \brief return the time of the next period boundary (in internal units)
-         *
-         * The same as getTimeAtPeriodUsecs() but in internal units.
-         *
-         * @return the time in internal units
-         */
-        uint64_t getTimeAtPeriod();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /**
@@ -453 +424 @@
-        float m_ticks_per_frame;
-        float m_dll_bandwidth_hz;
-sync_delay
+extra_buffer
-    private:
-        bool m_in_xrun;

trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

@@ -187 +187 @@
-    #ifdef DEBUG
-    if(isRunning()) {
-llu
+"PRIu64"
-            m_last_timestamp, getTicksPerFrame());
-    }

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

@@ -207 +207 @@
-            // we are too late
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-llu
+"PRIu64"
-                        cycle,
-                        transmit_at_cycle, cycles_until_transmit,
@@ -242 +242 @@
-        {
-            debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-llu (%04u), TSP=%011llu
+"PRIu64" (%04u), TSP=%011"PRIu64"
-                        cycle,
-                        transmit_at_cycle, cycles_until_transmit,
@@ -251 +251 @@
-            {
-                debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-llu (%04u), TSP=%011llu
+"PRIu64" (%04u), TSP=%011"PRIu64"
-                            cycle,
-                            transmit_at_cycle, cycles_until_transmit,
@@ -330 +330 @@
-    uint32_t pkt_ctr )
-{
-u, TSP=%011llu
-
+d, TSP=%011"PRIu64"
+(int)
-                ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );
-
@@ -359 +359 @@
-    unsigned int cycle = CYCLE_TIMER_GET_CYCLES(pkt_ctr);
-
-llu
+"PRIu64"
-                 cycle, m_last_timestamp,
-                 ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -53 +53 @@
-    , m_nb_buffers( 0 )
-    , m_period( 0 )
+    , m_sync_delay( 0 )
-    , m_audio_datatype( eADT_Float )
-    , m_nominal_framerate ( 0 )
@@ -77 +78 @@
-    , m_nb_buffers(nb_buffers)
-    , m_period(period)
+    , m_sync_delay( 0 )
-    , m_audio_datatype( eADT_Float )
-    , m_nominal_framerate ( framerate )
@@ -191 +193 @@
-            debugError("(%p) sem_[timed]wait error (result=%d errno=EINVAL)\n", 
-                        this, result);
-
-
+
+
+
-            return eAR_Error;
-        } else {
-            debugError("(%p) sem_[timed]wait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-
-
+
+
+
-            return eAR_Error;
-        }
@@ -472 +476 @@
-    // get the options
-    int signal_delay_ticks = STREAMPROCESSORMANAGER_SIGNAL_DELAY_TICKS;
+    int xmit_prebuffer_frames = STREAMPROCESSORMANAGER_XMIT_PREBUFFER_FRAMES;
-    int sync_wait_time_msec = STREAMPROCESSORMANAGER_SYNC_WAIT_TIME_MSEC;
-    int cycles_for_startup = STREAMPROCESSORMANAGER_CYCLES_FOR_STARTUP;
@@ -478 +483 @@
-    Util::Configuration &config = m_parent.getConfiguration();
-    config.getValueForSetting("streaming.spm.signal_delay_ticks", signal_delay_ticks);
+    config.getValueForSetting("streaming.spm.xmit_prebuffer_frames", xmit_prebuffer_frames);
-    config.getValueForSetting("streaming.spm.sync_wait_time_msec", sync_wait_time_msec);
-    config.getValueForSetting("streaming.spm.cycles_for_startup", cycles_for_startup);
@@ -514 +520 @@
-    // at which the buffer is transfer()'ed. This makes things somewhat
-    // more robust.
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    //STEP X: when we implement such a function, we can wait for a signal from the devices that they
@@ -540 +535 @@
-    nb_sync_runs /= getPeriodSize();
-
-    int64_t time_till_next_period;
-    while(nb_sync_runs--) { // or while not sync-ed?
-        // check if we were woken up too soon
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -564 +569 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, " sync source frame rate: %f fps (%f tpf)\n", syncrate, tpf);
-
-    m_SyncSource->setSyncDelay(max_of_min_delay);
-    syncdelay = m_SyncSource->getSyncDelay();
-    debugOutput( DEBUG_LEVEL_VERBOSE, " updated sync delay = %d => %d ticks (%f frames) (%03us %04uc %04ut)...\n", 
-        max_of_min_delay, syncdelay, syncdelay/tpf,
-        (unsigned int)TICKS_TO_SECS(syncdelay),
-        (unsigned int)TICKS_TO_CYCLES(syncdelay),
-        (unsigned int)TICKS_TO_OFFSET(syncdelay));
-
-    // we now should have decent sync info on the sync source
-    // determine a point in time where the system should start
-    // figure out where we are now
-    uint64_t time_of_first_sample = m_SyncSource->getTimeAtPeriod();
-llu
+"PRIu64"
-        time_of_first_sample,
-        (unsigned int)TICKS_TO_SECS(time_of_first_sample),
@@ -593 +590 @@
-    time_of_first_sample = addTicks(time_of_first_sample,
-                                    time_for_startup_ticks);
-llu
+"PRIu64"
-        time_for_startup_frames, time_for_startup_ticks);
-
-llu
+"PRIu64"
-        time_of_first_sample,
-        (unsigned int)TICKS_TO_SECS(time_of_first_sample),
@@ -609 +606 @@
-    uint64_t time_to_start_recv = substractTicks(time_of_first_sample,
-                                                 prestart_cycles_for_recv * TICKS_PER_CYCLE);
-llu
+"PRIu64"
-        time_to_start_xmit,
-        (unsigned int)TICKS_TO_SECS(time_to_start_xmit),
-        (unsigned int)TICKS_TO_CYCLES(time_to_start_xmit),
-        (unsigned int)TICKS_TO_OFFSET(time_to_start_xmit));
-llu
+"PRIu64"
-        time_to_start_recv,
-        (unsigned int)TICKS_TO_SECS(time_to_start_recv),
-        (unsigned int)TICKS_TO_CYCLES(time_to_start_recv),
-        (unsigned int)TICKS_TO_OFFSET(time_to_start_recv));
+
+    // print the sync delay
+    int sync_delay_frames = (int)((float)m_sync_delay / m_SyncSource->getTicksPerFrame());
+    debugOutput( DEBUG_LEVEL_VERBOSE, " sync delay: %d = %d + %d ticks (%03us %04uc %04ut) [%d frames]...\n", 
+        m_sync_delay, max_of_min_delay, signal_delay_ticks,
+        (unsigned int)TICKS_TO_SECS(m_sync_delay),
+        (unsigned int)TICKS_TO_CYCLES(m_sync_delay),
+        (unsigned int)TICKS_TO_OFFSET(m_sync_delay),
+        sync_delay_frames);
+
+    // the amount of prebuffer frames should be a multiple of the common block size
+    // as otherwise the position of MIDI is messed up
+    if(xmit_prebuffer_frames % max_packet_size_frames) {
+        int tmp = 0;
+        while(tmp < xmit_prebuffer_frames) {
+            tmp += max_packet_size_frames;
+        }
+        debugOutput(DEBUG_LEVEL_VERBOSE,
+                    "The number of prebuffer frames (%d) is not a multiple of the common block size (%d), increased to %d...\n", 
+                    xmit_prebuffer_frames, max_packet_size_frames, tmp);
+        xmit_prebuffer_frames = tmp;
+    }
+
+    // check if this can even work.
+    // the worst case point where we can receive a period is at 1 period + sync delay
+    // this means that the number of frames in the xmit buffer has to be at least
+    // 1 period + sync delay
+    if(xmit_prebuffer_frames + m_period * m_nb_buffers < m_period + sync_delay_frames) {
+        debugWarning("The amount of transmit buffer frames (%d) is too small (< %d). "
+                     "This will most likely cause xruns.\n",
+                     xmit_prebuffer_frames + m_period * m_nb_buffers,
+                     m_period + sync_delay_frames);
+    }
-
-    // at this point the buffer head timestamp of the transmit buffers can be set
@@ -625 +655 @@
-          it != m_TransmitProcessors.end();
-          ++it ) {
+        // set the number of prebuffer frames
+        (*it)->setExtraBufferFrames(xmit_prebuffer_frames);
+
+        // set the TSP of the first sample in the buffer
-        (*it)->setBufferHeadTimestamp(time_of_first_sample);
-        ffado_timestamp_t ts;
-        signed int fc;
-        (*it)->getBufferHeadTimestamp ( &ts, &fc );
-lld => head TS %010lld
+"PRId64" => head TS %010"PRIu64"
-                    time_of_first_sample, (uint64_t)ts, fc);
+    }
+
+    // the receive processors can be delayed by sync_delay ticks
+    // this means that in the worst case we have to be able to accomodate
+    // an extra sync_delay ticks worth of frames in the receive SP buffer
+    // the sync delay should be rounded to an integer amount of max_packet_size
+    int tmp = sync_delay_frames / max_packet_size_frames;
+    tmp = tmp + 1;
+    sync_delay_frames = tmp * max_packet_size_frames;
+    if (sync_delay_frames < 1024) sync_delay_frames = 1024; //HACK
+
+    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
+          it != m_ReceiveProcessors.end();
+          ++it ) {
+        // set the number of extra buffer frames
+        (*it)->setExtraBufferFrames(sync_delay_frames);
-    }
-
@@ -643 +693 @@
-    }
-    if(!m_SyncSource->scheduleStartRunning(time_to_start_sync)) {
-llu
+"PRIu64"
-        return false;
-    }
@@ -653 +703 @@
-        if(*it != m_SyncSource) {
-            if(!(*it)->scheduleStartRunning(time_to_start_recv)) {
-llu
+"PRIu64"
-                return false;
-            }
@@ -663 +713 @@
-        if(*it != m_SyncSource) {
-            if(!(*it)->scheduleStartRunning(time_to_start_xmit)) {
-llu
+"PRIu64"
-                return false;
-            }
@@ -696 +746 @@
-    #endif
-
-lld
+"PRId64"
-                m_time_of_transfer, rate);
-
-
-
-
-
+
+
+
-
-    // then use this information to initialize the xmit handlers
@@ -709 +758 @@
-    //  to the period transfer time instant plus what's nb_buffers - 1
-    //  in ticks. This due to the fact that we (should) have received one period
-=
+ = 
-    //  hence one period of frames should also have been transmitted, which means
-    //  that there should be (nb_buffers - 1) * periodsize of frames in the xmit buffer
+    //  there are also xmit_prebuffer_frames frames extra present in the buffer
-    //  that allows us to calculate the tail timestamp for the buffer.
-
-    int64_t transmit_tail_timestamp = addTicks(m_time_of_transfer, delay_in_ticks);
-lld
+"PRId64"
-                transmit_tail_timestamp, rate);
-
@@ -726 +776 @@
-        signed int fc;
-        (*it)->getBufferHeadTimestamp ( &ts, &fc );
-lld
+"PRId64"
-                    (uint64_t)ts, fc);
-    }
@@ -783 +833 @@
-                StreamProcessor *s = m_ReceiveProcessors.at(i);
-                diff = diffTicks(m_SyncSource->getTimeAtPeriod(), s->getTimeAtPeriod());
-lld
+"PRId64"
-                    m_SyncSource, s, diff);
-                if ( nb_sync_runs == periods_per_align_try ) {
@@ -805 +855 @@
-            diff_between_streams[i] /= periods_per_align_try;
-            diff_between_streams_frames[i] = (int)roundf(diff_between_streams[i] / s->getTicksPerFrame());
-lld
+"PRId64"
-                m_SyncSource, s, diff_between_streams[i], diff_between_streams_frames[i]);
-
@@ -1078 +1128 @@
-                        m_SyncSource->getBufferFill());
-    uint64_t ticks_at_period = m_SyncSource->getTimeAtPeriod();
-SyncSource->getSyncDelay()
+sync_delay
-    uint64_t pred_system_time_at_xfer = m_SyncSource->getParent().get1394Service().getSystemTimeForCycleTimerTicks(ticks_at_period_margin);
-
-    #ifdef DEBUG
-    int64_t now = Util::SystemTimeSource::getCurrentTime();
-
+
+
-    #endif
-
@@ -1091 +1142 @@
-    #ifdef DEBUG
-    now = Util::SystemTimeSource::getCurrentTime();
-pred: %lld now: %lld, excess: %lld
+POSTWAIT pred: %"PRId64", now: %"PRId64", excess: %"PRId64"
-    #endif
-
-    // the period should be ready now
+    #ifdef DEBUG
+    int rcv_fills[10];
+    int xmt_fills[10];
+    int i;
+    i=0;
+    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
+        it != m_ReceiveProcessors.end();
+        ++it ) {
+        rcv_fills[i] = (*it)->getBufferFill();
+        debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "RECV SP %p bufferfill: %05d\n", *it, rcv_fills[i]);
+        i++;
+    }
+    i=0;
+    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
+        it != m_TransmitProcessors.end();
+        ++it ) {
+        xmt_fills[i] = (*it)->getBufferFill();
+        debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "XMIT SP %p bufferfill: %05d\n", *it, xmt_fills[i]);
+        i++;
+    }
+    for(i=0;i<1;i++) {
+        debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "SP %02d RECV: %05d [%05d] XMIT: %05d [%05d] DIFF: %05d\n", i,
+                    rcv_fills[i], rcv_fills[i] - m_period,
+                    xmt_fills[i], xmt_fills[i] - m_period,
+                    rcv_fills[i] - xmt_fills[i]);
+    }
+    #endif
-
-    #if STREAMPROCESSORMANAGER_ALLOW_DELAYED_PERIOD_SIGNAL
@@ -1194 +1272 @@
-    // so 50 ticks = 10%, which is a rather large jitter value.
-    if(diff-ticks_per_period > 50 || diff-ticks_per_period < -50) {
-llu => TS=%011llu
+"PRIu64" => TS=%011"PRIu64"
-                                            m_time_of_transfer2, m_time_of_transfer, diff, ticks_per_period);
-    }
@@ -1201 +1279 @@
-
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-llu
+"PRIu64"
-                        m_nbperiods, m_time_of_transfer);
-
-
-
-
-
-
-
-
+
-    int rcv_bf=0, xmt_bf=0;
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
@@ -1223 +1295 @@
-    }
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE, 
-llu
+"PRIu64"
-                        m_time_of_transfer, rcv_bf, xmt_bf, rcv_bf+xmt_bf);
-
@@ -1255 +1327 @@
-        }
-    }
-
+    
-    m_nbperiods++;
+
+    // this is to notify the client of the delay that we introduced by waiting
+    pred_system_time_at_xfer = m_SyncSource->getParent().get1394Service().getSystemTimeForCycleTimerTicks(m_time_of_transfer);
+
+    m_delayed_usecs = Util::SystemTimeSource::getCurrentTime() - pred_system_time_at_xfer;
+    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
+                        "delayed for %d usecs...\n",
+                        m_delayed_usecs);
+
-    // now we can signal the client that we are (should be) ready
-    return !xrun_occurred;
@@ -1287 +1368 @@
-    if(m_SyncSource == NULL) return false;
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -1301 +1382 @@
-                ++it ) {
-            if(!(*it)->getFrames(m_period, m_time_of_transfer)) {
-llu
+"PRIu64"
-                            m_period, m_time_of_transfer,*it);
-                retval &= false; // buffer underrun
@@ -1310 +1391 @@
-        //        1394 time
-        float rate = m_SyncSource->getTicksPerFrame();
-        int64_t one_ringbuffer_in_ticks=(int64_t)(((float)((m_nb_buffers * m_period))) * rate);
-
-        // the data we are putting into the buffer is intended to be transmitted
-        // one ringbuffer size after it has been received
-
-        // we also add one syncdelay as a safety margin, since that's the amount of time we can get
-        // postponed.
-        int syncdelay = m_SyncSource->getSyncDelay();
-        int64_t transmit_timestamp = addTicks(m_time_of_transfer, one_ringbuffer_in_ticks + syncdelay);
-
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-                it != m_TransmitProcessors.end();
-                ++it ) {
-
-
+
+
+
+
+
+
+
+
+
-            if(!(*it)->putFrames(m_period, transmit_timestamp)) {
-llu
+"PRIu64"
-                        m_period, transmit_timestamp, *it);
-                retval &= false; // buffer underrun
@@ -1367 +1446 @@
-    if(m_SyncSource == NULL) return false;
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -1381 +1460 @@
-                ++it ) {
-            if(!(*it)->dropFrames(m_period, m_time_of_transfer)) {
-llu
+"PRIu64"
-                            m_period, m_time_of_transfer,*it);
-                retval &= false; // buffer underrun
@@ -1390 +1469 @@
-        //        1394 time
-        float rate = m_SyncSource->getTicksPerFrame();
-        int64_t one_ringbuffer_in_ticks=(int64_t)(((float)(m_nb_buffers * m_period)) * rate);
-
-        // the data we are putting into the buffer is intended to be transmitted
-        // one ringbuffer size after it has been received
-        // we also add one syncdelay as a safety margin, since that's the amount of time we can get
-        // postponed.
-        int syncdelay = m_SyncSource->getSyncDelay();
-        int64_t transmit_timestamp = addTicks(m_time_of_transfer, one_ringbuffer_in_ticks + syncdelay);
-
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-                it != m_TransmitProcessors.end();
-                ++it ) {
-
-
+
+
+
+
+
+
+
+
+
-            if(!(*it)->putSilenceFrames(m_period, transmit_timestamp)) {
-llu
+"PRIu64"
-                        m_period, transmit_timestamp, *it);
-                retval &= false; // buffer underrun
@@ -1578 +1656 @@
-        #ifdef DEBUG
-        if(idx >= (int)m_CapturePorts_shadow.size()) {
-
+z
-            return NULL;
-        }
@@ -1586 +1664 @@
-        #ifdef DEBUG
-        if(idx >= (int)m_PlaybackPorts_shadow.size()) {
-
+z
-            return NULL;
-        }

trunk/libffado/src/libstreaming/StreamProcessorManager.h

@@ -190 +190 @@
-    unsigned int m_nb_buffers;
-    unsigned int m_period;
+    unsigned int m_sync_delay;
-    enum eADT_AudioDataType m_audio_datatype;
-    unsigned int m_nominal_framerate;

trunk/libffado/src/libutil/Configuration.cpp

@@ -182 +182 @@
-            int32_t i = s;
-            debugOutput(DEBUG_LEVEL_NORMAL,
-ld (0x%08l
+d (0x%08
-                        prefix.c_str(), s.getName(), i, i);
-        }
@@ -190 +190 @@
-            int64_t i = s;
-            debugOutput(DEBUG_LEVEL_NORMAL,
-lld (0x%016llX
+"PRId64" (0x%016"PRIX64"
-                        prefix.c_str(), s.getName(), i, i);
-        }
@@ -259 +259 @@
-        if(t == Setting::TypeInt64) {
-            ref = *s;
-d
+"PRId64"
-            return true;
-        } else {

trunk/libffado/src/libutil/PosixThread.cpp

@@ -149 +149 @@
-        if (res) {
-            debugError("Cannot create realtime thread (%d: %s)\n", res, strerror(res));
- %s
+
-            return -1;
-        }
@@ -172 +172 @@
-{
-    if (fThread) { // If thread has been started
-
+(void *)
-        void* status;
-        pthread_cancel(fThread);
@@ -178 +178 @@
-        pthread_join(fThread, &status);
-        m_lock.Unlock();
-
+(void *)
-        return 0;
-    } else {
@@ -188 +188 @@
-{
-    if (fThread) { // If thread has been started
-
+(void *)
-        void* status;
-        fRunning = false; // Request for the thread to stop
@@ -195 +195 @@
-        fThread = NULL;
-        m_lock.Unlock();
-
+(void *)
-        return 0;
-    } else {

trunk/libffado/src/libutil/serialize_expat.cpp

@@ -117 +117 @@
-            Xml::Node& n = pNode->add( Xml::Node(tokens[tokens.size() - 1].c_str(), NULL) );
-            char* valstr;
-lld
+"PRId64"
-            n.set_child_text( valstr );
-            free( valstr );

trunk/libffado/src/libutil/serialize_libxml.cpp

@@ -89 +89 @@
-
-{
-
+ll
-                 strMemberName.c_str(), value );
-
@@ -266 +266 @@
-            value = strtoll( pElement->get_child_text()->get_content().c_str(),
-                             &tail, 0 );
-
+ll
-                         strMemberName.c_str(), value );
-            return true;

trunk/libffado/src/libutil/StreamStatistics.cpp

@@ -55 +55 @@
-void StreamStatistics::dumpInfo() {
-    debugOutputShort( DEBUG_LEVEL_VERBOSE, 
-ld avg=%f max=%ld cnt=%ld sum=%ld
+"PRId64" avg=%f max=%"PRId64" cnt=%"PRId64" sum=%"PRId64"
-                      m_name.c_str(), m_min, m_average, m_max, m_count, m_sum);
-    debugOutputShort( DEBUG_LEVEL_VERBOSE, "    Signal stats\n");

trunk/libffado/src/libutil/SystemTimeSource.cpp

@@ -55 +55 @@
-    ts.tv_nsec = (wake_at_usec % (1000000LL)) * 1000LL;
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-"clock_nanosleep until %lld sec, %lld
-
+       "clock_nanosleep until %"PRId64" sec, %"PRId64"
+       
-    int err = clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &ts, NULL);
-    if(err) {

trunk/libffado/src/libutil/Time.h

@@ -25 +25 @@
-#define __Time__
-
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
-#include <inttypes.h>
-
@@ -34 +37 @@
- */
-typedef uint64_t ffado_microsecs_t;
+#define PRI_FFADO_MICROSECS_T PRIu64
-
-static inline void SleepRelativeUsec(ffado_microsecs_t usec) {

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -383 +383 @@
-    m_current_rate = m_nominal_rate;
-
-
-
-
+
+
-        return false;
-    }
@@ -408 +407 @@
-    m_buffer_tail_timestamp = TIMESTAMP_MAX + 1.0;
-    m_buffer_next_tail_timestamp = TIMESTAMP_MAX + 1.0;
+
+    return true;
+}
+
+/**
+ * Resizes the timestamped buffer
+ * @return true if successful, false if not
+ */
+bool
+TimestampedBuffer::resizeBuffer(unsigned int new_size)
+{
+    assert(new_size);
+    assert(m_events_per_frame);
+    assert(m_event_size);
+
+    // if present, free the previous buffer
+    if(m_event_buffer) {
+        ffado_ringbuffer_free(m_event_buffer);
+    }
+    // allocate a new one
+    if( !(m_event_buffer = ffado_ringbuffer_create(
+            (m_events_per_frame * new_size) * m_event_size))) {
+        debugFatal("Could not allocate memory event ringbuffer\n");
+
+        return false;
+    }
+    resetFrameCounter();
+
+    m_current_rate = m_nominal_rate;
+    m_dll_e2 = m_current_rate * (float)m_update_period;
+
+    m_buffer_size = new_size;
-
-    return true;
@@ -474 +505 @@
-        if (written < write_size)
-        {
-u
+zd
-            return false;
-        }
@@ -503 +534 @@
-    if (written < write_size)
-    {
-u
+zd
-        return false;
-    }
@@ -614 +645 @@
-
-        if(vec[0].len + vec[1].len < m_process_block_size) { // this indicates a full event buffer
-u
+zd
-                       this, ffado_ringbuffer_read_space(m_event_buffer), bytes2write);
-            debugShowBackLog();

trunk/libffado/src/libutil/TimestampedBuffer.h

@@ -152 +152 @@
-        void dumpInfo();
-        void setVerboseLevel ( int l ) {setDebugLevel ( l );};
+
+        bool resizeBuffer(unsigned int size);
-
-    private:

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -26 +26 @@
-
-#include "motu/motu_avdevice.h"
+#include "motu/motu_mixerdefs.h"
+#include "motu/motu_mark3_mixerdefs.h"
-
-#include "devicemanager.h"
@@ -67 +69 @@
-    {FW_VENDORID_MOTU, 0, 0x00000005, 0x000001f2, MOTU_MODEL_896HD, "MOTU", "896HD"},
-    {FW_VENDORID_MOTU, 0, 0x00000015, 0x000001f2, MOTU_MODEL_828mk3, "MOTU", "828Mk3"},
+    {FW_VENDORID_MOTU, 0, 0x00000019, 0x000001f2, MOTU_MODEL_ULTRALITEmk3, "MOTU", "UltraLineMk3"},
-};
-
@@ -202 +205 @@
-const PortEntry Ports_ULTRALITE[] =
-{
-IN
-IN
+
+
-    {"Mix-L", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10},
-    {"Mix-R", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13},
@@ -218 +221 @@
-    {"Phones-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10},
-    {"Phones-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13},
+    {"SPDIF1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 40},
+    {"SPDIF2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 43},
-    {"Padding1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY|MOTU_PA_PADDING, 46},
-    {"Padding2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY|MOTU_PA_PADDING, 49},
@@ -306 +311 @@
-};
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
-const MatrixMixChannel MixerChannels_Traveler[] = {
-    {"Analog 1", MOTU_CTRL_STD_CHANNEL, 0x0000, },
-    {"Analog 2", MOTU_CTRL_STD_CHANNEL, 0x0004, },
-    {"Analog 3", MOTU_CTRL_STD_CHANNEL, 0x0008, },
-    {"Analog 4", MOTU_CTRL_STD_CHANNEL, 0x000c, },
-    {"Analog 5", MOTU_CTRL_STD_CHANNEL, 0x0010, },
-    {"Analog 6", MOTU_CTRL_STD_CHANNEL, 0x0014, },
-    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, },
-    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, },
-    {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, 0x0020, },
-    {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, 0x0024, },
-    {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, 0x0028, },
-    {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, 0x002c, },
-    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0030, },
-    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x0034, },
-    {"ADAT 3", MOTU_CTRL_STD_CHANNEL, 0x0038, },
-    {"ADAT 4", MOTU_CTRL_STD_CHANNEL, 0x003c, },
-    {"ADAT 5", MOTU_CTRL_STD_CHANNEL, 0x0040, },
-    {"ADAT 6", MOTU_CTRL_STD_CHANNEL, 0x0044, },
-    {"ADAT 7", MOTU_CTRL_STD_CHANNEL, 0x0048, },
-    {"ADAT 8", MOTU_CTRL_STD_CHANNEL, 0x004c, },
-};
-
-const MixerCtrl MixerCtrls_Traveler[] = {
-    {"Mix1/Mix_", "Mix 1 ", "", MOTU_CTRL_STD_MIX, 0x0c20, },
-    {"Mix2/Mix_", "Mix 2 ", "", MOTU_CTRL_STD_MIX, 0x0c24, },
-    {"Mix3/Mix_", "Mix 3 ", "", MOTU_CTRL_STD_MIX, 0x0c28, },
-    {"Mix4/Mix_", "Mix 4 ", "", MOTU_CTRL_STD_MIX, 0x0c2c, },
-    {"Mainout_",  "MainOut ", "", MOTU_CTRL_MIX_FADER, 0x0c0c, },
-    {"Phones_",   "Phones ",  "", MOTU_CTRL_MIX_FADER, 0x0c10, },
-
-    /* For mic/line input controls, the "register" is the zero-based channel number */
-    {"Control/Ana1_", "Analog 1 input ", "", MOTU_CTRL_TRAVELER_MIC_INPUT_CTRLS, 0},
-    {"Control/Ana2_", "Analog 2 input ", "", MOTU_CTRL_TRAVELER_MIC_INPUT_CTRLS, 1},
-    {"Control/Ana3_", "Analog 3 input ", "", MOTU_CTRL_TRAVELER_MIC_INPUT_CTRLS, 2},
-    {"Control/Ana4_", "Analog 4 input ", "", MOTU_CTRL_TRAVELER_MIC_INPUT_CTRLS, 3},
-    {"Control/Ana5_", "Analog 5 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 4},
-    {"Control/Ana6_", "Analog 6 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 5},
-    {"Control/Ana7_", "Analog 7 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 6},
-    {"Control/Ana8_", "Analog 8 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 7},
-
-    /* For phones source control, "register" is currently unused */
-    {"Control/Phones_", "Phones source", "", MOTU_CTRL_PHONES_SRC, 0},
-
-    /* For optical mode controls, the "register" is used to indicate direction */
-    {"Control/OpticalIn_mode", "Optical input mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_IN},
-    {"Control/OpticalOut_mode", "Optical output mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_OUT},
-};
-
-const MatrixMixBus MixerBuses_Ultralite[] = {
-    {"Mix 1", 0x4000, },
-    {"Mix 2", 0x4100, },
-    {"Mix 3", 0x4200, },
-    {"Mix 4", 0x4300, },
-};
-
-const MatrixMixChannel MixerChannels_Ultralite[] = {
-    {"Analog 1", MOTU_CTRL_STD_CHANNEL, 0x0000, },
-    {"Analog 2", MOTU_CTRL_STD_CHANNEL, 0x0004, },
-    {"Analog 3", MOTU_CTRL_STD_CHANNEL, 0x0008, },
-    {"Analog 4", MOTU_CTRL_STD_CHANNEL, 0x000c, },
-    {"Analog 5", MOTU_CTRL_STD_CHANNEL, 0x0010, },
-    {"Analog 6", MOTU_CTRL_STD_CHANNEL, 0x0014, },
-    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, },
-    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, },
-    {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, 0x0020, },
-    {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, 0x0024, },
-    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 3", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 4", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 5", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 6", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 7", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-    {"ADAT 8", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
-};
-
-const MixerCtrl MixerCtrls_Ultralite[] = {
-    {"Mix1/Mix_", "Mix 1 ", "", MOTU_CTRL_STD_MIX, 0x0c20, },
-    {"Mix2/Mix_", "Mix 2 ", "", MOTU_CTRL_STD_MIX, 0x0c24, },
-    {"Mix3/Mix_", "Mix 3 ", "", MOTU_CTRL_STD_MIX, 0x0c28, },
-    {"Mix4/Mix_", "Mix 4 ", "", MOTU_CTRL_STD_MIX, 0x0c2c, },
-    {"Mainout_",  "MainOut ", "", MOTU_CTRL_MIX_FADER, 0x0c0c, },
-    {"Phones_",   "Phones ",  "", MOTU_CTRL_MIX_FADER, 0x0c10, },
-
-    /* For mic/line input controls, the "register" is the zero-based channel number */
-    {"Control/Ana1_", "Analog 1 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 0},
-    {"Control/Ana2_", "Analog 2 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 1},
-    {"Control/Ana3_", "Analog 3 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 2},
-    {"Control/Ana4_", "Analog 4 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 3},
-    {"Control/Ana5_", "Analog 5 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 4},
-    {"Control/Ana6_", "Analog 6 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 5},
-    {"Control/Ana7_", "Analog 7 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 6},
-    {"Control/Ana8_", "Analog 8 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 7},
-    {"Control/Spdif1_", "SPDIF 1 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 6},
-    {"Control/Spdif2_", "SPDIF 2 input ", "", MOTU_CTRL_ULTRALITE_INPUT_CTRLS, 7},
-
-    /* For phones source control, "register" is currently unused */
-    {"Control/Phones_", "Phones source", "", MOTU_CTRL_PHONES_SRC, 0},
-
-    /* For optical mode controls, the "register" is used to indicate direction */
-    {"Control/OpticalIn_mode", "Optical input mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_IN},
-    {"Control/OpticalOut_mode", "Optical output mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_OUT},
-};
-
-const MatrixMixBus MixerBuses_896HD[] = {
-    {"Mix 1", 0x4000, },
-    {"Mix 2", 0x4100, },
-    {"Mix 3", 0x4200, },
-    {"Mix 4", 0x4300, },
-};
-
-const MatrixMixChannel MixerChannels_896HD[] = {
-    {"Analog 1", MOTU_CTRL_STD_CHANNEL, 0x0000, },
-    {"Analog 2", MOTU_CTRL_STD_CHANNEL, 0x0004, },
-    {"Analog 3", MOTU_CTRL_STD_CHANNEL, 0x0008, },
-    {"Analog 4", MOTU_CTRL_STD_CHANNEL, 0x000c, },
-    {"Analog 5", MOTU_CTRL_STD_CHANNEL, 0x0010, },
-    {"Analog 6", MOTU_CTRL_STD_CHANNEL, 0x0014, },
-    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, },
-    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, },
-    {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, 0x0020, },
-    {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, 0x0024, },
-    {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, 0x0048, },
-    {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, 0x004c, },
-    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0028, },
-    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x002c, },
-    {"ADAT 3", MOTU_CTRL_STD_CHANNEL, 0x0030, },
-    {"ADAT 4", MOTU_CTRL_STD_CHANNEL, 0x0034, },
-    {"ADAT 5", MOTU_CTRL_STD_CHANNEL, 0x0038, },
-    {"ADAT 6", MOTU_CTRL_STD_CHANNEL, 0x003c, },
-    {"ADAT 7", MOTU_CTRL_STD_CHANNEL, 0x0040, },
-    {"ADAT 8", MOTU_CTRL_STD_CHANNEL, 0x0044, },
-};
-
-const MixerCtrl MixerCtrls_896HD[] = {
-    {"Mix1/Mix_", "Mix 1 ", "", MOTU_CTRL_STD_MIX, 0x0c20, },
-    {"Mix2/Mix_", "Mix 2 ", "", MOTU_CTRL_STD_MIX, 0x0c24, },
-    {"Mix3/Mix_", "Mix 3 ", "", MOTU_CTRL_STD_MIX, 0x0c28, },
-    {"Mix4/Mix_", "Mix 4 ", "", MOTU_CTRL_STD_MIX, 0x0c2c, },
-    {"Mainout_",  "MainOut ", "", MOTU_CTRL_MIX_FADER, 0x0c0c, },
-    {"Phones_",   "Phones ",  "", MOTU_CTRL_MIX_FADER, 0x0c10, },
-
-    /* For phones source control, "register" is currently unused */
-    {"Control/Phones_", "Phones source", "", MOTU_CTRL_PHONES_SRC, 0},
-
-    /* For optical mode controls, the "register" is used to indicate direction */
-    {"Control/OpticalIn_mode", "Optical input mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_IN},
-    {"Control/OpticalOut_mode", "Optical output mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_OUT},
-
-    /* For meter controls the "register" indicates which meter controls are available */
-    {"Control/Meter_", "Meter ", "", MOTU_CTRL_METER,
-      MOTU_CTRL_METER_PEAKHOLD | MOTU_CTRL_METER_CLIPHOLD | MOTU_CTRL_METER_AESEBU_SRC | 
-      MOTU_CTRL_METER_PROG_SRC},
-};
-
-const MatrixMixBus MixerBuses_828Mk2[] = {
-    {"Mix 1", 0x4000, },
-    {"Mix 2", 0x4100, },
-    {"Mix 3", 0x4200, },
-    {"Mix 4", 0x4300, },
-};
-
-const MatrixMixChannel MixerChannels_828Mk2[] = {
-    {"Analog 1", MOTU_CTRL_STD_CHANNEL, 0x0000, },
-    {"Analog 2", MOTU_CTRL_STD_CHANNEL, 0x0004, },
-    {"Analog 3", MOTU_CTRL_STD_CHANNEL, 0x0008, },
-    {"Analog 4", MOTU_CTRL_STD_CHANNEL, 0x000c, },
-    {"Analog 5", MOTU_CTRL_STD_CHANNEL, 0x0010, },
-    {"Analog 6", MOTU_CTRL_STD_CHANNEL, 0x0014, },
-    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, },
-    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, },
-    {"Mic 1", MOTU_CTRL_STD_CHANNEL, 0x0020, },
-    {"Mic 2", MOTU_CTRL_STD_CHANNEL, 0x0024, },
-    {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, 0x0028, },
-    {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, 0x002c, },
-    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0030, },
-    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x0034, },
-    {"ADAT 3", MOTU_CTRL_STD_CHANNEL, 0x0038, },
-    {"ADAT 4", MOTU_CTRL_STD_CHANNEL, 0x003c, },
-    {"ADAT 5", MOTU_CTRL_STD_CHANNEL, 0x0040, },
-    {"ADAT 6", MOTU_CTRL_STD_CHANNEL, 0x0044, },
-    {"ADAT 7", MOTU_CTRL_STD_CHANNEL, 0x0048, },
-    {"ADAT 8", MOTU_CTRL_STD_CHANNEL, 0x004c, },
-};
-
-const MixerCtrl MixerCtrls_828Mk2[] = {
-    {"Mix1/Mix_", "Mix 1 ", "", MOTU_CTRL_STD_MIX, 0x0c20, },
-    {"Mix2/Mix_", "Mix 2 ", "", MOTU_CTRL_STD_MIX, 0x0c24, },
-    {"Mix3/Mix_", "Mix 3 ", "", MOTU_CTRL_STD_MIX, 0x0c28, },
-    {"Mix4/Mix_", "Mix 4 ", "", MOTU_CTRL_STD_MIX, 0x0c2c, },
-    {"Mainout_",  "MainOut ", "", MOTU_CTRL_MIX_FADER, 0x0c0c, },
-    {"Phones_",   "Phones ",  "", MOTU_CTRL_MIX_FADER, 0x0c10, },
-
-    /* For mic/line input controls, the "register" is the zero-based channel number */
-    {"Control/Ana1_", "Analog 1 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 0},
-    {"Control/Ana2_", "Analog 2 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 1},
-    {"Control/Ana3_", "Analog 3 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 2},
-    {"Control/Ana4_", "Analog 4 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 3},
-    {"Control/Ana5_", "Analog 5 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 4},
-    {"Control/Ana6_", "Analog 6 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 5},
-    {"Control/Ana7_", "Analog 7 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 6},
-    {"Control/Ana8_", "Analog 8 input ", "", MOTU_CTRL_TRAVELER_LINE_INPUT_CTRLS, 7},
-
-    /* For phones source control, "register" is currently unused */
-    {"Control/Phones_", "Phones source", "", MOTU_CTRL_PHONES_SRC, 0},
-
-    /* For optical mode controls, the "register" is used to indicate direction */
-    {"Control/OpticalIn_mode", "Optical input mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_IN},
-    {"Control/OpticalOut_mode", "Optical output mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_OUT},
-};
-
-const MotuMixer Mixer_Traveler = MOTUMIXER(
-    MixerCtrls_Traveler, MixerBuses_Traveler, MixerChannels_Traveler);
-
-const MotuMixer Mixer_Ultralite = MOTUMIXER(
-    MixerCtrls_Ultralite, MixerBuses_Ultralite, MixerChannels_Ultralite);
-
-const MotuMixer Mixer_828Mk2 = MOTUMIXER(
-    MixerCtrls_828Mk2, MixerBuses_828Mk2, MixerChannels_828Mk2);
-
-const MotuMixer Mixer_896HD = MOTUMIXER(
-    MixerCtrls_896HD, MixerBuses_896HD, MixerChannels_896HD);
-
-/* The order of DevicesProperty entries must match the numeric order of the
@@ -544 +341 @@
- */
-const DevicePropertyEntry DevicesProperty[] = {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-};
-
@@ -584 +382 @@
-
-    destroyMixer();
-}
-
-bool
-MotuDevice::buildMixerAudioControls(void) {
-
-    bool result = true;
-    MotuMatrixMixer *fader_mmixer = NULL;
-    MotuMatrixMixer *pan_mmixer = NULL;
-    MotuMatrixMixer *solo_mmixer = NULL;
-    MotuMatrixMixer *mute_mmixer = NULL;
-    const struct MatrixMixBus *buses = NULL;
-    const struct MatrixMixChannel *channels = NULL;
-    unsigned int bus, ch, i;
-
-    if (DevicesProperty[m_motu_model-1].mixer == NULL) {
-        debugOutput(DEBUG_LEVEL_WARNING, "No mixer controls defined for model %d\n", m_motu_model);
-        result = false;
-    } else {
-        buses = DevicesProperty[m_motu_model-1].mixer->mixer_buses;
-        if (buses == NULL) {
-            debugOutput(DEBUG_LEVEL_WARNING, "No buses defined for model %d\n", m_motu_model);
-            result = false;
-        }
-        channels = DevicesProperty[m_motu_model-1].mixer->mixer_channels;
-        if (channels == NULL) {
-            debugOutput(DEBUG_LEVEL_WARNING, "No channels defined for model %d\n", m_motu_model);
-            result = false;
-        }
-    }
-    if (result == false) {
-        return true;
-    }
-
-    /* Create the top-level matrix mixers */
-    fader_mmixer = new ChannelFaderMatrixMixer(*this, "fader");
-    result &= m_MixerContainer->addElement(fader_mmixer);
-    pan_mmixer = new ChannelPanMatrixMixer(*this, "pan");
-    result &= m_MixerContainer->addElement(pan_mmixer);
-    solo_mmixer = new ChannelBinSwMatrixMixer(*this, "solo", 
-        MOTU_CTRL_MASK_SOLO_VALUE, MOTU_CTRL_MASK_SOLO_SETENABLE);
-    result &= m_MixerContainer->addElement(solo_mmixer);
-    mute_mmixer = new ChannelBinSwMatrixMixer(*this, "mute",
-        MOTU_CTRL_MASK_MUTE_VALUE, MOTU_CTRL_MASK_MUTE_SETENABLE);
-    result &= m_MixerContainer->addElement(mute_mmixer);
-
-    for (bus=0; bus<DevicesProperty[m_motu_model-1].mixer->n_mixer_buses; bus++) {
-        fader_mmixer->addRowInfo(buses[bus].name, 0, buses[bus].address);
-        pan_mmixer->addRowInfo(buses[bus].name, 0, buses[bus].address);
-        solo_mmixer->addRowInfo(buses[bus].name, 0, buses[bus].address);
-        mute_mmixer->addRowInfo(buses[bus].name, 0, buses[bus].address);
-    }
-
-    for (ch=0; ch<DevicesProperty[m_motu_model-1].mixer->n_mixer_channels; ch++) {
-        uint32_t flags = channels[ch].flags;
-        if (flags & MOTU_CTRL_CHANNEL_FADER)
-            fader_mmixer->addColInfo(channels[ch].name, 0, channels[ch].addr_ofs);
-        if (flags & MOTU_CTRL_CHANNEL_PAN)
-            pan_mmixer->addColInfo(channels[ch].name, 0, channels[ch].addr_ofs);
-        if (flags & MOTU_CTRL_CHANNEL_SOLO)
-            solo_mmixer->addColInfo(channels[ch].name, 0, channels[ch].addr_ofs);
-        if (flags & MOTU_CTRL_CHANNEL_MUTE)
-            mute_mmixer->addColInfo(channels[ch].name, 0, channels[ch].addr_ofs);
-        flags &= ~(MOTU_CTRL_CHANNEL_FADER|MOTU_CTRL_CHANNEL_PAN|MOTU_CTRL_CHANNEL_SOLO|MOTU_CTRL_CHANNEL_MUTE);
-        if (flags) {
-            debugOutput(DEBUG_LEVEL_WARNING, "Control %s: unknown flag bits 0x%08x\n", channels[ch].name, flags);
-        }
-    }
-
-    // Single non-matrixed mixer controls get added here.  Channel controls are supported
-    // here, but usually these will be a part of a matrix mixer.
-    for (i=0; i<DevicesProperty[m_motu_model-1].mixer->n_mixer_ctrls; i++) {
-        const struct MixerCtrl *ctrl = &DevicesProperty[m_motu_model-1].mixer->mixer_ctrl[i];
-        unsigned int type;
-        char name[100];
-        char label[100];
-
-        if (ctrl == NULL) {
-            debugOutput(DEBUG_LEVEL_WARNING, "NULL control at index %d for model %d\n", i, m_motu_model);
-            continue;
-        }
-        type = ctrl->type;
-        if (type & MOTU_CTRL_CHANNEL_FADER) {
-            snprintf(name, 100, "%s%s", ctrl->name, "fader");
-            snprintf(label,100, "%s%s", ctrl->label,"fader");
-            result &= m_MixerContainer->addElement(
-                new ChannelFader(*this, ctrl->dev_register, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_CHANNEL_FADER;
-        }
-        if (type & MOTU_CTRL_CHANNEL_PAN) {
-            snprintf(name, 100, "%s%s", ctrl->name, "pan");
-            snprintf(label,100, "%s%s", ctrl->label,"pan");
-            result &= m_MixerContainer->addElement(
-                new ChannelPan(*this, 
-                    ctrl->dev_register,
-                    name, label,
-                    ctrl->desc));
-            type &= ~MOTU_CTRL_CHANNEL_PAN;
-        }
-        if (type & MOTU_CTRL_CHANNEL_MUTE) {
-            snprintf(name, 100, "%s%s", ctrl->name, "mute");
-            snprintf(label,100, "%s%s", ctrl->label,"mute");
-            result &= m_MixerContainer->addElement(
-                new MotuBinarySwitch(*this, ctrl->dev_register,
-                    MOTU_CTRL_MASK_MUTE_VALUE, MOTU_CTRL_MASK_MUTE_SETENABLE,
-                    name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_CHANNEL_MUTE;
-        }
-        if (type & MOTU_CTRL_CHANNEL_SOLO) {
-            snprintf(name, 100, "%s%s", ctrl->name, "solo");
-            snprintf(label,100, "%s%s", ctrl->label,"solo");
-            result &= m_MixerContainer->addElement(
-                new MotuBinarySwitch(*this, ctrl->dev_register,
-                    MOTU_CTRL_MASK_SOLO_VALUE, MOTU_CTRL_MASK_SOLO_SETENABLE,
-                    name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_CHANNEL_SOLO;
-        }
-
-        if (type & MOTU_CTRL_MIX_FADER) {
-            snprintf(name, 100, "%s%s", ctrl->name, "fader");
-            snprintf(label,100, "%s%s", ctrl->label,"fader");
-            result &= m_MixerContainer->addElement(
-                new MixFader(*this, ctrl->dev_register, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_MIX_FADER;
-        }
-        if (type & MOTU_CTRL_MIX_MUTE) {
-            snprintf(name, 100, "%s%s", ctrl->name, "mute");
-            snprintf(label,100, "%s%s", ctrl->label,"mute");
-            result &= m_MixerContainer->addElement(
-                new MixMute(*this, ctrl->dev_register, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_MIX_MUTE;
-        }
-        if (type & MOTU_CTRL_MIX_DEST) {
-            snprintf(name, 100, "%s%s", ctrl->name, "dest");
-            snprintf(label,100, "%s%s", ctrl->label,"dest");
-            result &= m_MixerContainer->addElement(
-                new MixDest(*this, ctrl->dev_register, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_MIX_DEST;
-        }
-
-        if (type & MOTU_CTRL_INPUT_UL_GAIN) {
-            snprintf(name, 100, "%s%s", ctrl->name, "trimgain");
-            snprintf(label,100, "%s%s", ctrl->label,"trimgain");
-            result &= m_MixerContainer->addElement(
-                new InputGainPadInv(*this, ctrl->dev_register, MOTU_CTRL_MODE_UL_GAIN,
-                    name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_INPUT_UL_GAIN;
-        }
-        if (type & MOTU_CTRL_INPUT_PHASE_INV) {
-            snprintf(name, 100, "%s%s", ctrl->name, "invert");
-            snprintf(label,100, "%s%s", ctrl->label,"invert");
-            result &= m_MixerContainer->addElement(
-                new InputGainPadInv(*this, ctrl->dev_register, MOTU_CTRL_MODE_PHASE_INV,
-                    name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_INPUT_PHASE_INV;
-        }
-        if (type & MOTU_CTRL_INPUT_TRIMGAIN) {
-            snprintf(name, 100, "%s%s", ctrl->name, "trimgain");
-            snprintf(label,100, "%s%s", ctrl->label,"trimgain");
-            result &= m_MixerContainer->addElement(
-                new InputGainPadInv(*this, ctrl->dev_register, MOTU_CTRL_MODE_TRIMGAIN,
-                    name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_INPUT_TRIMGAIN;
-        }
-        if (type & MOTU_CTRL_INPUT_PAD) {
-            snprintf(name, 100, "%s%s", ctrl->name, "pad");
-            snprintf(label,100, "%s%s", ctrl->label,"pad");
-            result &= m_MixerContainer->addElement(
-                new InputGainPadInv(*this, ctrl->dev_register, MOTU_CTRL_MODE_PAD,
-                    name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_INPUT_PAD;
-        }
-
-        if (type & MOTU_CTRL_INPUT_LEVEL) {
-            snprintf(name, 100, "%s%s", ctrl->name, "level");
-            snprintf(label,100, "%s%s", ctrl->label,"level");
-            result &= m_MixerContainer->addElement(
-                new MotuBinarySwitch(*this, MOTU_REG_INPUT_LEVEL,
-                    1<<ctrl->dev_register, 0, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_INPUT_LEVEL;
-        }
-        if (type & MOTU_CTRL_INPUT_BOOST) {
-            snprintf(name, 100, "%s%s", ctrl->name, "boost");
-            snprintf(label,100, "%s%s", ctrl->label,"boost");
-            result &= m_MixerContainer->addElement(
-                new MotuBinarySwitch(*this, MOTU_REG_INPUT_BOOST,
-                    1<<ctrl->dev_register, 0, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_INPUT_BOOST;
-        }
-        if (type & MOTU_CTRL_PHONES_SRC) {
-            snprintf(name, 100, "%s%s", ctrl->name, "src");
-            snprintf(label,100, "%s%s", ctrl->label,"src");
-            result &= m_MixerContainer->addElement(
-                new PhonesSrc(*this, name, label, ctrl->desc));
-            type &= ~MOTU_CTRL_PHONES_SRC;
-        }
-        if (type & MOTU_CTRL_OPTICAL_MODE) {
-            result &= m_MixerContainer->addElement(
-                new OpticalMode(*this, ctrl->dev_register,
-                    ctrl->name, ctrl->label, ctrl->desc));
-            type &= ~MOTU_CTRL_OPTICAL_MODE;
-        }
-        if (type & MOTU_CTRL_METER) {
-            if (ctrl->dev_register & MOTU_CTRL_METER_PEAKHOLD) {
-                snprintf(name, 100, "%s%s", ctrl->name, "peakhold_time");
-                snprintf(label,100, "%s%s", ctrl->label,"peakhold time");
-                result &= m_MixerContainer->addElement(
-                    new MeterControl(*this, MOTU_METER_PEAKHOLD_MASK,
-                        MOTU_METER_PEAKHOLD_SHIFT, name, label, ctrl->desc));
-            }
-            if (ctrl->dev_register & MOTU_CTRL_METER_CLIPHOLD) {
-                snprintf(name, 100, "%s%s", ctrl->name, "cliphold_time");
-                snprintf(label,100, "%s%s", ctrl->label,"cliphold time");
-                result &= m_MixerContainer->addElement(
-                    new MeterControl(*this, MOTU_METER_CLIPHOLD_MASK,
-                        MOTU_METER_CLIPHOLD_SHIFT, name, label, ctrl->desc));
-            }
-            if (ctrl->dev_register & MOTU_CTRL_METER_AESEBU_SRC) {
-                snprintf(name, 100, "%s%s", ctrl->name, "aesebu_src");
-                snprintf(label,100, "%s%s", ctrl->label,"AESEBU source");
-                result &= m_MixerContainer->addElement(
-                    new MeterControl(*this, MOTU_METER_AESEBU_SRC_MASK,
-                        MOTU_METER_AESEBU_SRC_SHIFT, name, label, ctrl->desc));
-            }
-            if (ctrl->dev_register & MOTU_CTRL_METER_PROG_SRC) {
-                snprintf(name, 100, "%s%s", ctrl->name, "src");
-                snprintf(label,100, "%s%s", ctrl->label,"source");
-                result &= m_MixerContainer->addElement(
-                    new MeterControl(*this, MOTU_METER_PROG_SRC_MASK,
-                        MOTU_METER_PROG_SRC_SHIFT, name, label, ctrl->desc));
-            }
-            type &= ~MOTU_CTRL_METER;
-        }
-
-        if (type) {
-            debugOutput(DEBUG_LEVEL_WARNING, "Unknown mixer control type flag bits 0x%08x\n", ctrl->type);
-        }
-    }
-    return result;
-}
-
-bool
-MotuDevice::buildMixer() {
-    bool result = true;
-
-    destroyMixer();
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Building a MOTU mixer...\n");
-
-    // create the mixer object container
-    m_MixerContainer = new Control::Container(this, "Mixer");
-    if (!m_MixerContainer) {
-        debugError("Could not create mixer container...\n");
-        return false;
-    }
-
-    // Create and populate the top-level matrix mixers
-    result = buildMixerAudioControls();
-
-    /* Now add some general device information controls.  These may yet
-     * become device-specific if it turns out to be easier that way.
-     */
-    result &= m_MixerContainer->addElement(
-        new InfoElement(*this, MOTU_INFO_MODEL, "Info/Model", "Model identifier", ""));
-    result &= m_MixerContainer->addElement(
-        new InfoElement(*this, MOTU_INFO_IS_STREAMING, "Info/IsStreaming", "Is device streaming", ""));
-    result &= m_MixerContainer->addElement(
-        new InfoElement(*this, MOTU_INFO_SAMPLE_RATE, "Info/SampleRate", "Device sample rate", ""));
-
-    if (!addElement(m_MixerContainer)) {
-        debugWarning("Could not register mixer to device\n");
-        // clean up
-        destroyMixer();
-        return false;
-    }
-
-    // Special controls
-    m_ControlContainer = new Control::Container(this, "Control");
-    if (!m_ControlContainer) {
-        debugError("Could not create control container...\n");
-        destroyMixer();
-        return false;
-    }
-
-    // Special controls get added here
-
-    if (!result) {
-        debugWarning("One or more device control elements could not be created\n");
-        // clean up those that couldn't be created
-        destroyMixer();
-        return false;
-    }
-    if (!addElement(m_ControlContainer)) {
-        debugWarning("Could not register controls to device\n");
-        // clean up
-        destroyMixer();
-        return false;
-    }
-
-    return true;
-}
-
-
-bool
-MotuDevice::destroyMixer() {
-    bool ret = true;
-    debugOutput(DEBUG_LEVEL_VERBOSE, "destroy mixer...\n");
-
-    if (m_MixerContainer == NULL) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "no mixer to destroy...\n");
-    } else
-    if (!deleteElement(m_MixerContainer)) {
-        debugError("Mixer present but not registered to the avdevice\n");
-        ret = false;
-    } else {
-        // remove and delete (as in free) child control elements
-        m_MixerContainer->clearElements(true);
-        delete m_MixerContainer;
-        m_MixerContainer = NULL;
-    }
-
-    // remove control container
-    if (m_ControlContainer == NULL) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "no controls to destroy...\n");
-    } else
-    if (!deleteElement(m_ControlContainer)) {
-        debugError("Controls present but not registered to the avdevice\n");
-        ret = false;
-    } else {
-        // remove and delete (as in free) child control elements
-        m_ControlContainer->clearElements(true);
-        delete m_ControlContainer;
-        m_ControlContainer = NULL;
-    }
-    return ret;
-}
-
@@ -1010 +475 @@
- * Retrieve the current sample rate from the MOTU device.
- */
-ReadRegister(MOTU_REG_CLK_CTRL)
+0
-    int rate = 0;
-
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        /* The original MOTU interfaces did things rather differently */
+        q = ReadRegister(MOTU_G1_REG_CONFIG);
+        if ((q & MOTU_G1_RATE_MASK) == MOTU_G1_RATE_44100)
+            rate = 44100;
+        else
+            rate = 48000;
+        return rate;
+    }
+
+    q = ReadRegister(MOTU_REG_CLK_CTRL);
-    switch (q & MOTU_RATE_BASE_MASK) {
-        case MOTU_RATE_BASE_44100:
@@ -1057 +533 @@
-    if ( samplingFrequency > DevicesProperty[m_motu_model-1].MaxSampleRate )
-       return false; 
+
+    /* The original MOTU devices do things differently; they are much
+     * simpler than the later interfaces.
+     */
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        reg = ReadRegister(MOTU_G1_REG_CONFIG);
+        if (samplingFrequency > 0) {
+            reg &= ~MOTU_G1_RATE_MASK;
+            switch (samplingFrequency) {
+                case 44100:
+                    reg |= MOTU_G1_RATE_44100;
+                    break;
+                case 48000:
+                    reg |= MOTU_G1_RATE_48000;
+                default:
+                    // Unsupported rate
+                    return false;
+            }
+        }
+        if (clock_source != MOTU_CLKSRC_UNCHANGED) {
+            switch (clock_source) {
+                case MOTU_CLKSRC_INTERNAL:
+                    clock_source = MOTU_G1_CLKSRC_INTERNAL; break;
+                case MOTU_CLKSRC_SPDIF_TOSLINK:
+                    clock_source = MOTU_G1_CLKSRC_SPDIF; break;
+                case MOTU_CLKSRC_ADAT_9PIN:
+                    clock_source = MOTU_G1_CLKSRC_ADAT_9PIN; break;
+                default:
+                    // Unsupported clock source
+                    return false;
+            }
+            reg &= ~MOTU_G1_CLKSRC_MASK;
+            reg |= clock_source;
+        }
+        if (WriteRegister(MOTU_G1_REG_CONFIG, reg) != 0)
+            return false;
+        return true;
+    }
+
+    /* The rest of this function deals with later generation devices */
-
-    reg = ReadRegister(MOTU_REG_CLK_CTRL);
@@ -1220 +736 @@
-MotuDevice::clockIdToClockSource(unsigned int id) {
-    ClockSource s;
+    bool g1_model = (m_motu_model == MOTU_MODEL_828MkI);
-    s.id = id;
-
@@ -1235 +752 @@
-            s.type = eCT_ADAT;
-            s.description = "ADAT optical";
+            s.valid = s.active = s.locked = !g1_model;
-            break;
-        case MOTU_CLKSRC_SPDIF_TOSLINK:
@@ -1252 +770 @@
-            s.type = eCT_WordClock;
-            s.description = "Wordclock";
+            s.valid = s.active = s.locked = !g1_model;
-            break;
-        case MOTU_CLKSRC_ADAT_9PIN:
@@ -1260 +779 @@
-            s.type = eCT_AES;
-            s.description = "AES/EBU";
+            s.valid = s.active = s.locked = !g1_model;
-            break;
-        default:
@@ -1563 +1083 @@
-quadlet_t isoctrl = ReadRegister(MOTU_REG_ISOCTRL);
-
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        // The 828MkI device does this differently.
+        // To be implemented
+        return false;
+    }
+
-    // NOTE: this assumes that you have two streams
-    switch (i) {
@@ -1614 +1140 @@
-    // TODO: connection management: break connection
-    // cfr the start function
+
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        // The 828MkI device does this differently.
+        // To be implemented
+        return false;
+    }
-
-    // NOTE: this assumes that you have two streams
@@ -1650 +1182 @@
-
-unsigned int MotuDevice::getOpticalMode(unsigned int dir) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (dir == MOTU_DIR_IN)
@@ -1662 +1210 @@
-
-signed int MotuDevice::setOpticalMode(unsigned int dir, unsigned int mode) {
- = ReadRegister(MOTU_REG_ROUTE_PORT_CONF)
+
-    unsigned int opt_ctrl = 0x0000002;
-
@@ -1670 +1218 @@
-    if (m_motu_model==MOTU_MODEL_896HD && mode==MOTU_OPTICAL_MODE_TOSLINK)
-        return -1;
+
+    if (m_motu_model == MOTU_MODEL_828MkI) {
+        // The earlier MOTUs handle this differently.
+        unsigned int mask, shift, g1mode = 0;
+        reg = ReadRegister(MOTU_G1_REG_CONFIG);
+        mask = (dir==MOTU_DIR_IN)?MOTU_G1_OPT_IN_MODE_MASK:MOTU_G1_OPT_OUT_MODE_MASK;
+        shift = (dir==MOTU_DIR_IN)?MOTU_G1_OPT_IN_MODE_BIT0:MOTU_G1_OPT_OUT_MODE_BIT0;
+        switch (mode) {
+            case MOTU_OPTICAL_MODE_OFF: g1mode = MOTU_G1_OPTICAL_OFF; break;
+            case MOTU_OPTICAL_MODE_ADAT: g1mode = MOTU_G1_OPTICAL_ADAT; break;
+            // See comment in getOpticalMode() about mode ambiguity
+            // case MOTU_OPTICAL_MODE_TOSLINK: g1mode = MOTU_G1_OPTICAL_TOSLINK; break;
+        }
+        reg = (reg & ~mask) | (g1mode << shift);
+        return WriteRegister(MOTU_G1_REG_CONFIG, reg);
+    }
+
+    reg = ReadRegister(MOTU_REG_ROUTE_PORT_CONF);
-
-    // Set up the optical control register value according to the current

trunk/libffado/src/motu/motu_avdevice.h

@@ -35 +35 @@
-
-#include "motu_controls.h"
+#include "motu_mark3_controls.h"
-
-#define MOTU_BASE_ADDR               0xfffff0000000ULL
@@ -88 +89 @@
-#define MOTU_REG_INPUT_GAIN_PHINV1 0x0c74
-#define MOTU_REG_INPUT_GAIN_PHINV2 0x0c78
+
+/* Device register definitions for the earliest generation devices */
+#define MOTU_G1_REG_CONFIG         0x0b00
+#define MOTU_G1_REG_ISOCTRL        0x0b10
+
+/* There's an unknown subtlety regarding the optical mode of the "generation
+ * 1" devices such as the 828Mk1.  It seems that the same configuration
+ * register setting is used for "off" and "adat" modes.  There must be more
+ * to this though because the number of audio channels sent presumedly
+ * changes when adat mode is selected; there must be some way that the
+ * device deduces the mode.
+ */
+#define MOTU_G1_OPT_IN_MODE_MASK   0x8000
+#define MOTU_G1_OPT_IN_MODE_BIT0       15
+#define MOTU_G1_OPT_OUT_MODE_MASK  0x4000
+#define MOTU_G1_OPT_OUT_MODE_BIT0      14
+#define MOTU_G1_OPTICAL_OFF        0x0000
+#define MOTU_G1_OPTICAL_TOSLINK    0x0001
+#define MOTU_G1_OPTICAL_ADAT       0x0000
+
+#define MOTU_G1_RATE_MASK          0x0004
+#define MOTU_G1_RATE_44100         0x0000
+#define MOTU_G1_RATE_48000         0x0004
+
+#define MOTU_G1_CLKSRC_MASK        0x0003
+#define MOTU_G1_CLKSRC_INTERNAL    0x0000
+#define MOTU_G1_CLKSRC_ADAT_9PIN   0x0001
+#define MOTU_G1_CLKSRC_SPDIF       0x0002
+#define MOTU_G1_CLKSRC_UNCHANGED   MOTU_CLKSRC_UNCHANGED
+
+#define MOTU_G1_MONIN_MASK         0x3f00
+#define MOTU_G1_MONIN_L_SRC_MASK   0x0600
+#define MOTU_G1_MONIN_R_SRC_MASK   0x3000
+#define MOTU_G1_MONIN_L_MUTE_MASK  0x0100  // Yes, the sense of these 2 bits
+#define MOTU_G1_MONIN_R_EN_MASK    0x0800  //   really are reversed
+#define MOTU_G1_MONIN_L_MUTE       0x0100
+#define MOTU_G1_MONIN_L_ENABLE     0x0000
+#define MOTU_G1_MONIN_R_MUTE       0x0000
+#define MOTU_G1_MONIN_R_ENABLE     0x0800
+#define MOTU_G1_MONIN_L_CH1        0x0000
+#define MOTU_G1_MONIN_L_CH3        0x0020
+#define MOTU_G1_MONIN_L_CH5        0x0040
+#define MOTU_G1_MONIN_L_CH7        0x0060
+#define MOTU_G1_MONIN_R_CH2        0x0000
+#define MOTU_G1_MONIN_R_CH4        0x1000
+#define MOTU_G1_MONIN_R_CH6        0x2000
+#define MOTU_G1_MONIN_R_CH8        0x3000
+
+/* Mark3 device registers - these don't have MOTU_BASE_ADDR as the base
+ * address so for now we'll define them as absolute addresses.
+ */
+#define MOTU_MARK3_REG_MIXER     0xffff00010000LL
-
-/* Port Active Flags (ports declaration) */
@@ -122 +175 @@
-
-enum EMotuModel {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-};
-
@@ -148 +202 @@
-};
-
+// Structures used for pre-Mark3 device mixer definitions
-struct MixerCtrl {
-    const char *name, *label, *desc;
@@ -153 +208 @@
-    unsigned int dev_register;
-};
-
-struct MatrixMixBus {
-    const char *name;
-    unsigned int address;
-};
-
-struct MatrixMixChannel {
-    const char *name;
@@ -164 +217 @@
-    unsigned int addr_ofs;
-};
-
-struct MotuMixer {
-    const MixerCtrl *mixer_ctrl;
@@ -174 +226 @@
-};
-
+// Structures used for devices which use the "Mark3" mixer protocol
+struct MotuMark3Mixer {
+};
+
-struct DevicePropertyEntry {
-    const PortEntry* port_entry;
-    unsigned int n_port_entries;
-    signed int MaxSampleRate;
+    // A device will set at most one of the *mixer fields
-    const struct MotuMixer *mixer;
+    const struct MotuMark3Mixer *m3mixer;
-    // Others features can be added here like MIDI port presence.
-};
+
+extern const DevicePropertyEntry DevicesProperty[];
-
-/* Macro to calculate the size of an array */
@@ -244 +304 @@
-private:
-    bool buildMixerAudioControls(void);
+    bool buildMark3MixerAudioControls(void);
-    bool addPort(Streaming::StreamProcessor *s_processor,
-        char *name,

trunk/libffado/src/motu/motu_controls.cpp

@@ -301 +301 @@
-    if (v > 0x80)
-      v = 0x80;
-l
+
-      row, col, val, v);
-    reg = getCellRegister(row,col);
@@ -331 +331 @@
-    val = m_parent.ReadRegister(reg) & 0xff;
-
-l
+
-      row, col, val);
-    return val;
@@ -353 +353 @@
-      v = 0x80;
-
-l
+
-      row, col, val, v);
-    reg = getCellRegister(row,col);
@@ -387 +387 @@
-    val = ((val >> 8) & 0xff) - 0x40;
-
-l
+
-      row, col, val);
-    return val;
@@ -414 +414 @@
-    uint32_t v, reg;
-
-l
+
-      row, col, val, val==0?0:1);
-    reg = getCellRegister(row,col);
@@ -460 +460 @@
-    val = (val & m_value_mask) != 0;
-
-l
+
-      row, col, val);
-    return val;

trunk/libffado/src/motu/motu_controls.h

@@ -23 +23 @@
- *
- */
+
+/* DBus controls used with devices which utilise a pre-Mark3 mixer interface */
-
-#include "debugmodule/debugmodule.h"

trunk/libffado/src/motu/motu_mixerdefs.cpp

@@ -254 +254 @@
-};
-
+const MatrixMixBus MixerBuses_8pre[] = {
+    {"Mix 1", 0x4000, },
+    {"Mix 2", 0x4100, },
+    {"Mix 3", 0x4200, },
+    {"Mix 4", 0x4300, },
+};
+
+const MatrixMixChannel MixerChannels_8pre[] = {
+    {"Analog 1", MOTU_CTRL_STD_CHANNEL, 0x0000, },
+    {"Analog 2", MOTU_CTRL_STD_CHANNEL, 0x0004, },
+    {"Analog 3", MOTU_CTRL_STD_CHANNEL, 0x0008, },
+    {"Analog 4", MOTU_CTRL_STD_CHANNEL, 0x000c, },
+    {"Analog 5", MOTU_CTRL_STD_CHANNEL, 0x0010, },
+    {"Analog 6", MOTU_CTRL_STD_CHANNEL, 0x0014, },
+    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, },
+    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, },
+    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0020, },
+    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x0024, },
+    {"ADAT 3", MOTU_CTRL_STD_CHANNEL, 0x0028, },
+    {"ADAT 4", MOTU_CTRL_STD_CHANNEL, 0x002c, },
+    {"ADAT 5", MOTU_CTRL_STD_CHANNEL, 0x0030, },
+    {"ADAT 6", MOTU_CTRL_STD_CHANNEL, 0x0034, },
+    {"ADAT 7", MOTU_CTRL_STD_CHANNEL, 0x0038, },
+    {"ADAT 8", MOTU_CTRL_STD_CHANNEL, 0x003c, },
+};
+
+const MixerCtrl MixerCtrls_8pre[] = {
+    {"Mix1/Mix_", "Mix 1 ", "", MOTU_CTRL_STD_MIX, 0x0c20, },
+    {"Mix2/Mix_", "Mix 2 ", "", MOTU_CTRL_STD_MIX, 0x0c24, },
+    {"Mix3/Mix_", "Mix 3 ", "", MOTU_CTRL_STD_MIX, 0x0c28, },
+    {"Mix4/Mix_", "Mix 4 ", "", MOTU_CTRL_STD_MIX, 0x0c2c, },
+
+    /* For phones source control, "register" is currently unused */
+    {"Control/Phones_", "Phones source", "", MOTU_CTRL_PHONES_SRC, 0},
+
+    /* For optical mode controls, the "register" is used to indicate direction */
+    {"Control/OpticalIn_mode", "Optical input mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_IN},
+    {"Control/OpticalOut_mode", "Optical output mode ", "", MOTU_CTRL_OPTICAL_MODE, MOTU_CTRL_DIR_OUT},
+};
+
-const MotuMixer Mixer_Traveler = MOTUMIXER(
-    MixerCtrls_Traveler, MixerBuses_Traveler, MixerChannels_Traveler);
@@ -266 +306 @@
-    MixerCtrls_896HD, MixerBuses_896HD, MixerChannels_896HD);
-
+const MotuMixer Mixer_8pre = MOTUMIXER(
+    MixerCtrls_8pre, MixerBuses_8pre, MixerChannels_8pre);
+
-}

trunk/libffado/src/motu/motu_mixerdefs.h

@@ -38 +38 @@
-extern const MotuMixer Mixer_828Mk2;
-extern const MotuMixer Mixer_896HD;
+extern const MotuMixer Mixer_8pre;
-
-}

trunk/libffado/src/SConscript

@@ -150 +150 @@
-        motu/motu_avdevice.cpp \
-        motu/motu_controls.cpp \
+        motu/motu_mark3_controls.cpp \
+        motu/motu_mixerdefs.cpp \
+        motu/motu_mark3_mixerdefs.cpp \
+        motu/motu_mixer.cpp \
-        libstreaming/motu/MotuPort.cpp \
-        libstreaming/motu/MotuPortInfo.cpp \

trunk/libffado/support/dbus/SConscript

@@ -39 +39 @@
-if not env.GetOption( "clean" ):
-    env.MergeFlags( env["DBUS1_FLAGS"] )
+    env.MergeFlags( env['LIBRAW1394_FLAGS'] )
-    if not env['SERIALIZE_USE_EXPAT']:
-        env.MergeFlags( env['LIBXML26_FLAGS'] )

trunk/libffado/support/firmware/fireworks-downloader.cpp

@@ -23 +23 @@
- */
-
+#include "fbtypes.h"
-#include "downloader.h"
-
@@ -214 +215 @@
-
-    if (node_id < 0) {
-llX
+"PRIX64"
-        return -1;
-    }

trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py

@@ -628 +628 @@
-            self.optical_out_mode.setEnabled(False)
-
-does
- == MOTU_MODEL_896HD
+and 8pre do
+==MOTU_MODEL_896HD or self.model==MOTU_MODEL_8PRE
-            self.optical_in_mode.removeItem(2)
-            self.optical_out_mode.removeItem(2)

trunk/libffado/support/mixer-qt4/ffado/mixer/phase88.ui

@@ -1 @@
-
+
+
- <comment>Copyright (C) 2005-2008 by Pieter Palmers
-        
@@ -18 +19 @@
-</comment>
- <class>Phase88ControlUI</class>
- 
- 
+
+
-   <rect>
-    <x>0</x>
@@ -27 +28 @@
-   </rect>
-  </property>
- 
+
-   <string>Terratec Phase 88 Control</string>
-  </property>
- 
- 
- 
- 
+
+
+
+
-      <string>Mixer bus output:</string>
-     </property>
- 
+
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
- 
- 
-
- 
+
+
+
+
-       <string>S/PDIF Out</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>Line Out 1/2</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>Line Out 3/4</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>Line Out 5/6</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>Line Out 7/8</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>None</string>
-      </property>
@@ -75 +76 @@
-    </widget>
-   </item>
- 
- 
- 
+
+
+
-      <string>Hardware Mixer</string>
-     </property>
- 
+
-      <item>
- 
- 
- 
- 
+
+
+
+
-           <string>1/2</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
+
+
+
-           <string>3/4</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
+
+
+
-           <string>5/6</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
+
+
+
-           <string>7/8</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
+
+
+
-           <string>S/PDIF</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
+
+
+
-           <string>WavePlay</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
+
+
+
-           <string>Master</string>
-          </property>
- 
+
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
-
-
-
-
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+
+
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
-
-
-
-
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+
+
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
-
-
-
-
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+
+
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
-
-
-
-
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+
+
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
-
-
-
-
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+
+
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
-
-
-
-
- 
- 
- 
-vsizetype="Expanding" hsizetype="Expanding" 
+
+
+
+
+
+
+
+
+hsizetype="Expanding" vsizetype="Expanding"
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
- 
+
-           <number>0</number>
-          </property>
- 
+
-           <number>32767</number>
-          </property>
- 
-
-
- 
+
+
+
+
-           <number>1000</number>
-          </property>
- 
+
-           <enum>Qt::Vertical</enum>
-          </property>
- 
+
-           <number>10000</number>
-          </property>
@@ -354 +355 @@
-    </widget>
-   </item>
- 
- 
- 
+
+
+
-      <string>Waveplay Channel Source</string>
-     </property>
- 
+
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
- 
- 
-
- 
+
+
+
+
-       <string>S/PDIF</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>CH 1/2</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>CH 3/4</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>CH5/6</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>CH7/8</string>
-      </property>
@@ -393 +394 @@
-    </widget>
-   </item>
- 
- 
- 
+
+
+
-      <string>In 7/8 Input Select</string>
-     </property>
- 
+
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-
-
-
-
+
+
+
+
+
+
+
+
+
-       <string>Front</string>
-      </property>
-     </item>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-      <string>Sync Source</string>
-     </property>
- 
+
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
- 
- 
-
- 
+
+
+
+
-       <string>Internal</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>External</string>
-      </property>
@@ -441 +442 @@
-    </widget>
-   </item>
- 
- 
- 
+
+
+
-      <string>External Sync Source</string>
-     </property>
- 
+
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
- 
- 
-
- 
+
+
+
+
-       <string>S/PDIF</string>
-      </property>
-     </item>
-     <item>
- 
+
-       <string>WordClock</string>
-      </property>
@@ -467 +468 @@
-  </layout>
- </widget>
- 
+
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
@@ -477 +478 @@
-   <slot>switchOutAssign(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -493 +494 @@
-   <slot>switchFrontState(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -509 +510 @@
-   <slot>switchWaveInAssign(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -525 +526 @@
-   <slot>switchSyncSource(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -541 +542 @@
-   <slot>switchExtSyncSource(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -557 +558 @@
-   <slot>setVolume12(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -573 +574 @@
-   <slot>setVolume34(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -589 +590 @@
-   <slot>setVolume56(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -605 +606 @@
-   <slot>setVolume78(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -621 +622 @@
-   <slot>setVolumeMaster(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -637 +638 @@
-   <slot>setVolumeSPDIF(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>
@@ -653 +654 @@
-   <slot>setVolumeWavePlay(int)</slot>
-   <hints>
- 
-
-
-
- 
+
+
+
+
+
-     <x>20</x>
-     <y>20</y>

trunk/libffado/support/mixer-qt4/ffado/mixer/saffire.py

@@ -104 +104 @@
-    def initValues(self):
-        selected = self.samplerateselect.selected()
-
+
+
+
+
+
+
-
-        # Saffire:        0x130e010001????

trunk/libffado/support/mixer-qt4/ffado/regdialog.py

@@ +1 @@
+# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2005-2008 by Pieter Palmers
@@ -34 +35 @@
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">
-You are running this version of FFADO for the first time with this device. </p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If FFADO is useful to you, please consider a donation through <a href="http://www.ffado.org/?q=donations ">http://www.ffado.org/?q=donations</a>.</p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">
-In order to collect usage statistics we would like to send some information about your system to ffado.org.

trunk/libffado/tests/streaming/test-ipcclient.cpp

@@ -195 +195 @@
-
-    printMessage("Testing shared memory streaming IPC\n");
-d, nb_buffers %d, playback %d, capture %
+ld, nb_buffers %ld, playback %ld, capture %l
-                 arguments.period, arguments.nb_buffers,
-                 arguments.playback,

trunk/libffado/tests/streaming/teststreaming-ipc.cpp

@@ -287 +287 @@
-    }
-
-
+l
-    setDebugLevel(arguments.verbose);
-
@@ -308 +308 @@
-
-    debugOutput(DEBUG_LEVEL_NORMAL, "FFADO streaming test application (3)\n");
-d, nb_buffers %d, playback %d, capture %
+ld, nb_buffers %ld, playback %ld, capture %l
-                 arguments.period, arguments.nb_buffers,
-                 arguments.playback,
@@ -374 +374 @@
-    printMessage("Device channel count: %d capture, %d playback\n",
-                 nb_in_channels, nb_out_channels);
-d capture, %
+ld capture, %l
-                 arguments.capture, arguments.playback);
-
-    if(arguments.playback > nb_out_channels) {
-
+l
-                   arguments.playback, nb_out_channels);
-        return -1;
-    }
-    if(arguments.capture > nb_in_channels) {
-
+l
-                   arguments.capture, nb_in_channels);
-        return -1;
@@ -460 +460 @@
-    // enter the loop
-    debugOutput(DEBUG_LEVEL_NORMAL,
-d, OUT: %
+ld, OUT: %l
-                arguments.capture, arguments.playback);
-

trunk/libffado/tests/streaming/teststreaming3.cpp

@@ -262 +262 @@
-    }
-
-
+(int)
-    setDebugLevel(arguments.verbose);
-

trunk/libffado/tests/systemtests/gen-loadpulses.cpp

@@ -33 +33 @@
-#include <argp.h>
-
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
-#include <inttypes.h>
-
@@ -157 +160 @@
-    debugOutput(DEBUG_LEVEL_INFO, "System Load pulse generator\n");
-    debugOutput(DEBUG_LEVEL_INFO, " Arguments:\n");
-
-
-
-
-
-
+l
+l
+l
+l
+
+l
-    set_realtime_priority(arguments.rtprio);
-
@@ -185 +188 @@
-        int64_t usecs_late = toc - sleep_time;
-        if(usecs_late > 1000) {
-lld
+"PRId64"
-        }
-
-        // try and detect lockup ()
-        if(usecs_late > 100000) {
-lld
+"PRId64"
-            // force exit, since this is a loop out of control
-            run=0;

trunk/libffado/tests/systemtests/test-clock_nanosleep.cpp

@@ -23 +23 @@
-
-#include "debugmodule/debugmodule.h"
+#include "libutil/Time.h"
-
-// needed for clock_nanosleep
@@ -69 +70 @@
-    ts.tv_nsec = (wake_at_usec % (1000000LL)) * 1000LL;
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-lld sec, %lld
+"PRId64" sec, %"PRId64"
-                (int64_t)ts.tv_sec, (int64_t)ts.tv_nsec);
-    int err = clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &ts, NULL);
@@ -105 +106 @@
-        wake_at += SLEEP_PERIOD_USECS;
-        
-
+
+
+
-        
-        pthread_testcancel();

trunk/libffado/tests/systemtests/test-isorecv-1.cpp

@@ -188 +188 @@
-    }
-
-
+(int) 
-    int ret = -1;
-    do
@@ -226 +226 @@
-    }
-
-
+(int)
-    set_realtime_priority(arguments.rtprio);
-

trunk/libffado/tests/systemtests/test-isoxmit-1.cpp

@@ -233 +233 @@
-    }
-
-
+(int) 
-    setDebugLevel(arguments.verbose);
-
@@ -244 +244 @@
-    }
-
-
+(int)
-    int ret = -1;
-    do
@@ -269 +269 @@
-    raw1394_set_bus_reset_handler(handle, myResetHandler);
-
-
+(int)
-    set_realtime_priority(arguments.rtprio);
-

trunk/libffado/tests/systemtests/test-sysload.cpp

@@ -33 +33 @@
-#include <argp.h>
-
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
-#include <inttypes.h>
-
@@ -157 +160 @@
-    debugOutput(DEBUG_LEVEL_INFO, "Simple RT system loader\n");
-    debugOutput(DEBUG_LEVEL_INFO, " Arguments:\n");
-
-
-
-
-
-
+l
+l
+l
+l
+
+l
-    set_realtime_priority(arguments.rtprio);
-
@@ -187 +190 @@
-        int64_t usecs_late = toc - sleep_time;
-        if(usecs_late > 1000) {
-lld
+"PRId64"
-        }
-
-        // try and detect lockup ()
-        if(usecs_late > 100000) {
-lld
+"PRId64"
-            // force exit, since this is a loop out of control
-            run=0;

trunk/libffado/tests/test-bufferops.cpp

@@ -30 +30 @@
-
-#include "libutil/SystemTimeSource.h"
+#include "libutil/Time.h"
+
-#include <inttypes.h>
-
@@ -86 +88 @@
-        byteSwapToBus(buffer_1, nb_quadlets);
-        elapsed = Util::SystemTimeSource::getCurrentTimeAsUsecs() - start;
-llu
+"PRI_FFADO_MICROSECS_T"
-        
-    }
@@ -154 +156 @@
-        convertFromInt24AndLabelAsMBLA(buffer_1, nb_quadlets);
-        elapsed = Util::SystemTimeSource::getCurrentTimeAsUsecs() - start;
-llu
+"PRI_FFADO_MICROSECS_T"
-    }
-
@@ -236 +238 @@
-        convertFromFloatAndLabelAsMBLA(buffer_1, nb_quadlets);
-        elapsed = Util::SystemTimeSource::getCurrentTimeAsUsecs() - start;
-llu
+"PRI_FFADO_MICROSECS_T"
-    }
-

trunk/libffado/tests/test-dice-eap.cpp

@@ -271 +271 @@
-    e = NULL;
-    eap.unlockControl();
-
-    int cnt = 0;
-
-    while(run && arguments.counts != 0) {

trunk/libffado/tests/test-ffado.cpp

@@ -351 +351 @@
-
-            int devices_on_bus = m_deviceManager->getNbDevices();
-ld, devices_on_bus = %d\n", 
+d, devices_on_bus = %d\n", (int)
-
-            for(i=0;i<devices_on_bus;i++) {
@@ -443 +443 @@
-        service.setVerboseLevel(arguments.verbose);
-        if ( !service.initialize( arguments.port ) ) {
-ld\n", 
+d\n", (int)
-            return exitfunction(-1);
-        }
@@ -455 +455 @@
-        
-        if (!service.setSplitTimeoutUsecs(nodeid, usecs)) {
-l
-
+
+(int)
-            return exitfunction(-1);
-        }
@@ -466 +466 @@
-        service.setVerboseLevel(arguments.verbose);
-        if ( !service.initialize( arguments.port ) ) {
-ld\n", 
+d\n", (int)
-            return exitfunction(-1);
-        }
@@ -478 +478 @@
-        int usecs = service.getSplitTimeoutUsecs(nodeid);
-        if (usecs < 0) {
-l
-
-
-
-l
-
+
+(int)
+
+
+
+(int)
-
-        return exitfunction(0);
@@ -511 +511 @@
-        uint64_t result_rcv = sytRecvToFullTicks(syt_timestamp, rcv_cycle, ctr_now);
-        uint64_t result_xmt = sytXmitToFullTicks(syt_timestamp, rcv_cycle, ctr_now);
-llX %010llu  XMT: 0x%010llX %010llu CTR: %010llu
+"PRIX64" %010"PRIu64"  XMT: 0x%010"PRIX64" %010"PRIu64" CTR: %010"PRIu64"
-               result_rcv, result_rcv, result_xmt, result_xmt, CYCLE_TIMER_TO_TICKS(ctr_now));
-

trunk/libffado/tests/test-focusrite.cpp

@@ -183 +183 @@
-            }
-            if (!retval) {
-llX
+"PRIX64"
-            } else {
-                value = CondSwapFromBus32(value);

trunk/libffado/tests/test-ieee1394service.cpp

@@ -165 +165 @@
-    }
-    debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                this, ctr,
-                (unsigned int)TICKS_TO_SECS( ctr ),
@@ -171 +171 @@
-                (unsigned int)TICKS_TO_OFFSET( ctr ) );
-    debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                this, ctr_dll,
-                (unsigned int)TICKS_TO_SECS( ctr_dll ),
@@ -200 +200 @@
-    }
-    debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu64"
-                ((int64_t)abs_diff==diff?" ":"-"), abs_diff, (unsigned int)TICKS_TO_SECS( abs_diff ),
-                (unsigned int)TICKS_TO_CYCLES( abs_diff ), (unsigned int)TICKS_TO_OFFSET( abs_diff ) );
-    if (abs_diff > DIFF_CONSIDERED_LARGE) {
-lld
-
-llu
+"PRId64"
+
+"PRIu64"
-                    this, ctr,
-                    (unsigned int)TICKS_TO_SECS( ctr ),
@@ -212 +212 @@
-                    (unsigned int)TICKS_TO_OFFSET( ctr ) );
-        debugOutput ( DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                    this, ctr_dll,
-                    (unsigned int)TICKS_TO_SECS( ctr_dll ),
@@ -221 +221 @@
-    diff = diffTicks(ctr, ctr_prev);
-    if (diff < 0) {
-llu - %llu = %lld
+"PRId64" - %"PRId64" = %"PRId64"
-                     this, ctr, ctr_prev, diff);
-        debugOutput ( DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                    this, ctr,
-                    (unsigned int)TICKS_TO_SECS( ctr ),
@@ -230 +230 @@
-                    (unsigned int)TICKS_TO_OFFSET( ctr ) );
-        debugOutput ( DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                    this, ctr_prev,
-                    (unsigned int)TICKS_TO_SECS( ctr_prev ),
@@ -238 +238 @@
-    diff = diffTicks(ctr_dll, ctr_dll_prev);
-    if (diff < 0) {
-llu - %llu = %lld
+"PRId64" - %"PRId64" = %"PRId64"
-                     this, ctr_dll, ctr_dll_prev, diff);
-        debugOutput ( DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                    this, ctr_dll,
-                    (unsigned int)TICKS_TO_SECS( ctr_dll ),
@@ -247 +247 @@
-                    (unsigned int)TICKS_TO_OFFSET( ctr_dll ) );
-        debugOutput ( DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                    this, ctr_dll_prev,
-                    (unsigned int)TICKS_TO_SECS( ctr_dll_prev ),
@@ -268 +268 @@
-                    (unsigned int)CYCLE_TIMER_GET_OFFSET( tmp_orig ) );
-        debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-llu
+"PRIu32"
-                    this, tmp_ticks,
-                    (unsigned int)TICKS_TO_SECS( tmp_ticks ),

trunk/libffado/tests/test-scs.cpp

@@ -325 +325 @@
-        virtual void operator() (byte_t *buff, size_t len) {
-            if (m_ready) {
-
+z
-    
-                for (size_t s=0; s < len; s++) {

trunk/libffado/tests/test-timestampedbuffer.cpp

@@ -346 +346 @@
-
-                if (timestamp != ts_head) {
-llu != %011llu
-
-    
+"PRIu64" != %011"PRIu64"
+       cycle, 
+
-                }
-
@@ -418 +418 @@
-            }
-
-
-
-
+
+
+
+
+
-                ffado_timestamp_t ts_head_tmp, ts_tail_tmp;
-                uint64_t ts_head, ts_tail;
@@ -434 +436 @@
-                ts_tail=(uint64_t)ts_tail_tmp;
-                debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                        ts_head,fc_head);
-                debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                        ts_tail,fc_tail);
-
@@ -449 +451 @@
-                ts_tail=(uint64_t)ts_tail_tmp;
-                debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                        ts_head,fc_head);
-                debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                        ts_tail,fc_tail);
-
@@ -523 +525 @@
-            }
-
-
+
+
+
-
-            if(diff>0) {
@@ -539 +543 @@
-                ts_tail=(uint64_t)ts_tail_tmp;
-                debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                        ts_head,fc_head);
-                debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                        ts_tail,fc_tail);
-
@@ -557 +561 @@
-                    ts_tail=(uint64_t)ts_tail_tmp;
-                    debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                            ts_head,fc_head);
-                    debugOutput(DEBUG_LEVEL_NORMAL,
-llu
+"PRIu64"
-                            ts_tail,fc_tail);
-                }