Changeset 1535

Timestamp:

04/12/09 06:51:07 (14 years ago)

Author:

ppalmers

Message:

add support for the FCA-202, and possibly other Oxford FW-92x devices

Files:

• trunk/libffado/configuration (modified) (1 diff)
• trunk/libffado/SConstruct (modified) (3 diffs)
• trunk/libffado/src/debugmodule/debugmodule.cpp (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (1 diff)
• trunk/libffado/src/devicemanager.cpp (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (19 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/libavc/audiosubunit/avc_audiosubunit.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/audiosubunit/avc_audiosubunit.h (modified) (1 diff)
• trunk/libffado/src/libavc/audiosubunit/avc_descriptor_audio.cpp (added)
• trunk/libffado/src/libavc/audiosubunit/avc_descriptor_audio.h (added)
• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (5 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp-oxford (added)
• trunk/libffado/src/libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp (added)
• trunk/libffado/src/libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.h (added)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h (modified) (2 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/Configuration.h (modified) (1 diff)
• trunk/libffado/src/oxford (added)
• trunk/libffado/src/oxford/oxford_device.cpp (added)
• trunk/libffado/src/oxford/oxford_device.h (added)
• trunk/libffado/src/SConscript (modified) (7 diffs)
• trunk/libffado/tests/test-focusrite.cpp (modified) (3 diffs)

trunk/libffado/configuration

@@ -263 +263 @@
-    driver = 2;
-    xmit_max_cycles_early_transmit = 2;
+},
+{
+    vendorid = 0x1564;
+    modelid = 0xFC22;
+    vendorname = "Behringer";
+    modelname = "FCA202";
+    driver = 4;
-},
-{

trunk/libffado/SConstruct

@@ -62 +62 @@
-        BoolOption( "ENABLE_BEBOB", "Enable/Disable the bebob part.", True ),
-        BoolOption( "ENABLE_FIREWORKS", "Enable/Disable the ECHO Audio FireWorks AV/C part.", True ),
+        BoolOption( "ENABLE_OXFORD", "Enable/Disable support for the Oxford Semiconductor AV/C platform.", True ),
-        BoolOption( "ENABLE_MOTU", "Enable/Disable the MOTU part.", True ),
-        BoolOption( "ENABLE_DICE", "Enable/Disable the DICE part.", True ),
@@ -338 +339 @@
-        env['ENABLE_BEBOB'] = True
-        env['ENABLE_FIREWORKS'] = True
+        env['ENABLE_OXFORD'] = True
-        env['ENABLE_MOTU'] = True
-        env['ENABLE_DICE'] = True
@@ -347 +349 @@
-env['ENABLE_BOUNCE'] = False
-
-
+
+
+
-        env['ENABLE_GENERICAVC'] = True
-

trunk/libffado/src/debugmodule/debugmodule.cpp

@@ -673 +673 @@
-        name[0]=0;
-        getFunctionName(m_backtrace_buffer[j], name, 64);
- 
+\n
-    }
-    chars_written += snprintf(m_backtrace_strbuffer + chars_written, MB_BUFFERSIZE-chars_written, "\n");

trunk/libffado/src/debugmodule/debugmodule.h

@@ -34 +34 @@
-#include <iostream>
-#include <semaphore.h>
+
+#define FFADO_ASSERT(x) { \
+    if(!(x)) { \
+        m_debugModule.print( DebugModule::eDL_Fatal,        \
+                                __FILE__,                   \
+                                __FUNCTION__,               \
+                                __LINE__,                   \
+                                "Assertion failed...\n");      \
+        debugPrintBacktrace( 10 ); \
+        DebugModuleManager::instance()->flush(); \
+        assert(x); \
+    }}
-
-typedef short debug_level_t;

trunk/libffado/src/devicemanager.cpp

@@ -52 +52 @@
-#ifdef ENABLE_FIREWORKS
-    #include "fireworks/fireworks_device.h"
+#endif
+
+#ifdef ENABLE_OXFORD
+    #include "oxford/oxford_device.h"
-#endif
-
@@ -941 +945 @@
-#endif
-
+#ifdef ENABLE_OXFORD
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Oxford FW90x...\n" );
+    if ( Oxford::Device::probe( getConfiguration(), *configRom, generic ) ) {
+        return Oxford::Device::createDevice( *this, std::auto_ptr<ConfigRom>( configRom ) );
+    }
+#endif
+
-// we want to try the non-generic AV/C platforms before trying the generic ones
-#ifdef ENABLE_GENERICAVC

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -46 +46 @@
-#include <libraw1394/csr.h>
-
-using namespace AVC;
-
-namespace GenericAVC {
-
@@ -81 +79 @@
-    if(generic) {
-        // check if we have a music subunit
-
-
+AVC::
+::AVC
-        subUnitInfoCmd.m_page = 0;
-        subUnitInfoCmd.setNodeId( configRom.getNodeId() );
@@ -91 +89 @@
-        }
-        for ( int i = 0; i < subUnitInfoCmd.getNrOfValidEntries(); ++i ) {
-
+AVC::
-                = subUnitInfoCmd.m_table[i].m_subunit_type;
-
+AVC::
-        }
-
@@ -203 +201 @@
-int
-AvDevice::getSamplingFrequency( ) {
-
+AVC::
-    if ( !inputPlug ) {
-        debugError( "setSampleRate: Could not retrieve iso input plug 0\n" );
-        return false;
-    }
-
+AVC::
-    if ( !outputPlug ) {
-        debugError( "setSampleRate: Could not retrieve iso output plug 0\n" );
@@ -241 +239 @@
-        return true;
-    } else {
-
+AVC::
-        if ( !plug ) {
-            debugError( "setSampleRate: Could not retrieve iso input plug 0\n" );
@@ -253 +251 @@
-        }
-
-
+AVC::
-        if ( !plug ) {
-            debugError( "setSampleRate: Could not retrieve iso output plug 0\n" );
@@ -280 +278 @@
-    Util::MutexLockHelper lock(m_DeviceMutex);
-
-
+AVC::
-    if ( !plug ) {
-        debugError( "Could not retrieve iso input plug 0\n" );
@@ -292 +290 @@
-    }
-
-
+AVC::
-    if ( !plug ) {
-        debugError( "Could not retrieve iso output plug 0\n" );
@@ -333 +331 @@
-    Util::MutexLockHelper lock(m_DeviceMutex);
-
-
-
+AVC::
+AVC::
-        0,
-        0xff,
-        0xff,
-
-
-
+AVC::
+AVC::
+AVC::
-    if ( !syncMSUInputPlugs.size() ) {
-        // there exist devices which do not have a sync plug
@@ -362 +360 @@
-bool
-AvDevice::setActiveClockSource(ClockSource s) {
-Plug *src=
+AVC::Plug *src = 
-    if (!src) {
-        debugError("Could not find plug with id %d\n", s.id);
@@ -413 +411 @@
-    // now figure out what type this is
-    switch(si.m_source->getPlugType()) {
-
+AVC::
-            s.type=eCT_SytMatch;
-            break;
-
-
+AVC::
+AVC::
-                s.type=eCT_SytStream; // this is logical
-
+AVC::
-                s.type=eCT_Internal; // this assumes some stuff
-
+AVC::
-                std::string plugname=si.m_source->getName();
-                s.description=plugname;
@@ -434 +432 @@
-            }
-            break;
-
-
+AVC::
+AVC::
-                std::string plugname=si.m_source->getName();
-                s.description=plugname;
@@ -519 +517 @@
-    // get plugs
-
-
+AVC::
-    if ( !inputPlug ) {
-        debugError( "setSampleRate: Could not retrieve iso input plug 0\n" );
-        return false;
-    }
-
+AVC::
-    if ( !outputPlug ) {
-        debugError( "setSampleRate: Could not retrieve iso output plug 0\n" );
@@ -665 +663 @@
-    }
-
-
-
+AVC::
+AVC::
-          it != clusterInfos.end();
-          ++it )
-    {
-
-
-
-
+AVC::
+
+AVC::
+AVC::
-              it != channelInfos.end();
-              ++it )
-        {
-
+AVC::
-            std::ostringstream portname;
-
@@ -684 +682 @@
-            Streaming::Port *p=NULL;
-            switch(clusterInfo->m_portType) {
-
-
-
-
-
+AVC::
+AVC::
+AVC::
+AVC::
+AVC::
-                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding audio channel %s (pos=0x%02X, loc=0x%02X)\n",
-                    channelInfo->m_name.c_str(), channelInfo->m_streamPosition, channelInfo->m_location);
@@ -701 +699 @@
-                break;
-
-
+AVC::
-                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding MIDI channel %s (pos=0x%02X, loc=0x%02X)\n",
-                    channelInfo->m_name.c_str(), channelInfo->m_streamPosition, processor->getPortCount(Streaming::Port::E_Midi));
@@ -719 +717 @@
-
-                break;
-
-
-
-
-
+AVC::
+AVC::
+AVC::
+AVC::
+AVC::
-                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding digital audio channel %s (pos=0x%02X, loc=0x%02X)\n",
-                    channelInfo->m_name.c_str(), channelInfo->m_streamPosition, channelInfo->m_location);
@@ -736 +734 @@
-                break;
-
-
+AVC::
-            default:
-            // unsupported
@@ -743 +741 @@
-
-            if (!p) {
-
+ 
-            }
-         }

trunk/libffado/src/genericavc/avc_avdevice.h

@@ -53 +53 @@
-    static bool probe( Util::Configuration&, ConfigRom& configRom, bool generic = false );
-    virtual bool discover();
-    bool discoverGeneric();
-    static FFADODevice * createDevice( DeviceManager& d, std::auto_ptr<ConfigRom>( configRom ));
-
@@ -90 +89 @@
-
-protected:
+    bool discoverGeneric();
-    virtual bool addPlugToProcessor( AVC::Plug& plug, Streaming::StreamProcessor *processor,
-                             Streaming::AmdtpAudioPort::E_Direction direction);

trunk/libffado/src/libavc/audiosubunit/avc_audiosubunit.cpp

@@ -27 +27 @@
-
-#include "../audiosubunit/avc_function_block.h"
-
+
-
-#include <sstream>
@@ -37 +37 @@
-SubunitAudio::SubunitAudio( Unit& unit, subunit_t id )
-    : Subunit( unit, eST_Audio, id )
+    , m_identifier_descriptor ( new AVCAudioIdentifierDescriptor( &unit, this ) )
-{
-}
@@ -59 +60 @@
-    }
-
+    // load the descriptor (if not already loaded)
+//     m_identifier_descriptor->setVerboseLevel(DEBUG_LEVEL_VERY_VERBOSE);
+//     if (m_identifier_descriptor != NULL) {
+//         if(!m_identifier_descriptor->load()) {
+//             debugWarning("Could not load Audio Subunit Identifier descriptor\n");
+//         }
+//     }
+
-    return true;
-}

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

@@ -59 +59 @@
-                                         Util::IODeserialize& deser ) { return true; }
-
+    class AVCAudioIdentifierDescriptor*  m_identifier_descriptor;
+
-};
-

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

@@ -288 +288 @@
-Plug::discoverNoOfChannels()
-{
+    if (m_nrOfChannels == 0) {
+        // not discovered yet, get from ext stream format
+        ExtendedStreamFormatCmd extStreamFormatCmd =
+            setPlugAddrToStreamFormatCmd( ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommand );
+        extStreamFormatCmd.setVerbose( getDebugLevel() );
+    
+        if ( !extStreamFormatCmd.fire() ) {
+            debugError( "stream format command failed\n" );
+            return false;
+        }
+    
+        if ( ( extStreamFormatCmd.getStatus() ==  ExtendedStreamFormatCmd::eS_NoStreamFormat )
+            || ( extStreamFormatCmd.getStatus() ==  ExtendedStreamFormatCmd::eS_NotUsed ) )
+        {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                        "No stream format information available\n" );
+            return true;
+        }
+    
+        if ( !extStreamFormatCmd.getFormatInformation() ) {
+            debugOutput(DEBUG_LEVEL_NORMAL, "No stream format information for plug found -> skip\n" );
+            return true;
+        }
+    
+        if ( extStreamFormatCmd.getFormatInformation()->m_root
+            != FormatInformation::eFHR_AudioMusic  )
+        {
+            debugOutput(DEBUG_LEVEL_NORMAL, "Format hierarchy root is not Audio&Music -> skip\n" );
+            return true;
+        }
+    
+        FormatInformation* formatInfo =
+            extStreamFormatCmd.getFormatInformation();
+        FormatInformationStreamsCompound* compoundStream
+            = dynamic_cast< FormatInformationStreamsCompound* > (
+                formatInfo->m_streams );
+        if ( compoundStream ) {
+            unsigned int nb_channels = 0;
+            for ( int i = 1;
+                i <= compoundStream->m_numberOfStreamFormatInfos;
+                ++i )
+            {
+                StreamFormatInfo* streamFormatInfo =
+                    compoundStream->m_streamFormatInfos[ i - 1 ];
+    
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                            "number of channels = %d, stream format = %d\n",
+                            streamFormatInfo->m_numberOfChannels,
+                            streamFormatInfo->m_streamFormat );
+                // FIXME: might not be correct to sum all
+                nb_channels += streamFormatInfo->m_numberOfChannels;
+            }
+            m_nrOfChannels = nb_channels;
+        }
+        return true;
+    } else {
+        // already got the nb channels from somewhere else
+        return true;
+    }
+}
+
+bool
+Plug::discoverChannelPosition()
+{
-
-    return true;
@@ -293 +357 @@
-
-bool
-Position
+Name
-{
-
@@ -300 +364 @@
-
-bool
-Plug::discoverChannelName()
-{
-
-    return true;
-}
-
-bool
-Plug::discoverClusterInfo()
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return true;
-}
@@ -372 +450 @@
-                            "No matching cluster "
-                            "info found for index %d\n",  i );
-
+//
-            }
-            StreamFormatInfo* streamFormatInfo =
@@ -382 +460 @@
-                         streamFormatInfo->m_streamFormat );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -533 +533 @@
-    } else {
-        #ifdef DEBUG
-NORMAL
+VERBOSE
-                    "raw1394_read failed: node 0x%hX, addr = 0x%016llX, length = %u\n",
-                    nodeId, addr, length);

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -625 +625 @@
-                                m_receive_mode,
-                                m_irq_interval)) {
-sation
+zation (PACKET_PER_BUFFER)
-            debugFatal("  %s\n",strerror(errno));
-            return false;

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -792 +792 @@
-        }
-
+        // apparently a too small value causes issues too
+        if(max_packet_size < 200) max_packet_size = 200;
+
-        // the interrupt/wakeup interval prediction of raw1394 is a mess...
-        int irq_interval = (packets_per_period-1) / min_interrupts_per_period;

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

@@ -80 +80 @@
-    virtual ~AmdtpReceiveStreamProcessor() {};
-
-
-
-
-
+virtual 
+        
+        
+virtual 
-
-    virtual bool prepareChild();
@@ -100 +100 @@
-    bool processReadBlock(char *data, unsigned int nevents, unsigned int offset);
-
-ivate
+otected
-    void decodeAudioPortsFloat(quadlet_t *data, unsigned int offset, unsigned int nevents);
-    void decodeAudioPortsInt24(quadlet_t *data, unsigned int offset, unsigned int nevents);

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

@@ -517 +517 @@
-                return RAW1394_ISO_ERROR;
-            }
+
+            // don't process the data when waiting for a stream
+            if(m_state == ePS_WaitingForStream) {
+                return RAW1394_ISO_OK;
+            }
-        }
-

trunk/libffado/src/libutil/Configuration.h

@@ -47 +47 @@
-        eD_FireWorks = 2,
-        eD_GenericAVC = 3,
+        eD_Oxford = 4,
-        eD_MOTU = 10,
-    };

trunk/libffado/src/SConscript

@@ -36 +36 @@
-        debugmodule/debugmodule.cpp \
-        DeviceStringParser.cpp \
-        libavc/streamformat/avc_extended_stream_format.cpp \
-        libavc/musicsubunit/avc_descriptor_music.cpp \
-        libavc/musicsubunit/avc_musicsubunit.cpp \
-        libavc/audiosubunit/avc_audiosubunit.cpp \
-        libavc/audiosubunit/avc_function_block.cpp \
-        libavc/descriptors/avc_descriptor_cmd.cpp \
-        libavc/descriptors/avc_descriptor.cpp \
-        libavc/general/avc_extended_subunit_info.cpp \
-        libavc/general/avc_unit_info.cpp \
-        libavc/general/avc_generic.cpp \
-        libavc/general/avc_subunit_info.cpp \
-        libavc/general/avc_connect.cpp \
-        libavc/general/avc_signal_format.cpp \
-        libavc/general/avc_extended_cmd_generic.cpp \
-        libavc/general/avc_extended_plug_info.cpp \
-        libavc/general/avc_plug_info.cpp \
-        libavc/general/avc_unit.cpp \
-        libavc/general/avc_subunit.cpp \
-        libavc/general/avc_plug.cpp \
-        libavc/general/avc_vendor_dependent_cmd.cpp \
-        libavc/avc_definitions.cpp \
-        libavc/ccm/avc_signal_source.cpp \
-        libieee1394/ARMHandler.cpp \
-        libieee1394/configrom.cpp \
@@ -99 +77 @@
-        ffado_source.append('libutil/serialize_libxml.cpp')
-
-
-bebob_source = env.Split( '\
-        bebob/bebob_avdevice.cpp \
@@ -121 +98 @@
-        maudio/maudio_avdevice.cpp \
-' )
+
-bebob_pkgdata = env.Split( '\
-        maudio/refdesign.xml \
@@ -153 +131 @@
-' )
-
+oxford_source =  env.Split( '\
+        oxford/oxford_device.cpp \
+        libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp \
+' )
+
+oxford_pkgdata = env.Split( '\
+' )     
+
-motu_source = env.Split( '\
-        motu/motu_avdevice.cpp \
@@ -189 +175 @@
-' )
-
+libavc_source = env.Split( '\
+        libavc/streamformat/avc_extended_stream_format.cpp \
+        libavc/musicsubunit/avc_descriptor_music.cpp \
+        libavc/musicsubunit/avc_musicsubunit.cpp \
+        libavc/audiosubunit/avc_audiosubunit.cpp \
+        libavc/audiosubunit/avc_descriptor_audio.cpp \
+        libavc/audiosubunit/avc_function_block.cpp \
+        libavc/descriptors/avc_descriptor_cmd.cpp \
+        libavc/descriptors/avc_descriptor.cpp \
+        libavc/general/avc_extended_subunit_info.cpp \
+        libavc/general/avc_unit_info.cpp \
+        libavc/general/avc_generic.cpp \
+        libavc/general/avc_subunit_info.cpp \
+        libavc/general/avc_connect.cpp \
+        libavc/general/avc_signal_format.cpp \
+        libavc/general/avc_extended_cmd_generic.cpp \
+        libavc/general/avc_extended_plug_info.cpp \
+        libavc/general/avc_plug_info.cpp \
+        libavc/general/avc_unit.cpp \
+        libavc/general/avc_subunit.cpp \
+        libavc/general/avc_plug.cpp \
+        libavc/general/avc_vendor_dependent_cmd.cpp \
+        libavc/avc_definitions.cpp \
+        libavc/ccm/avc_signal_source.cpp \
+' )
-
-source = ffado_source
@@ -200 +211 @@
-        source += fireworks_source
-        pkgdata += fireworks_pkgdata
+if env['ENABLE_OXFORD']:
+        libenv.AppendUnique( CCFLAGS=["-DENABLE_OXFORD"] )
+        source += oxford_source
+        pkgdata += oxford_pkgdata
-if env['ENABLE_MOTU']:
-        libenv.AppendUnique( CCFLAGS=["-DENABLE_MOTU"] )
@@ -219 +234 @@
-if env['ENABLE_GENERICAVC']:
-        libenv.AppendUnique( CCFLAGS=["-DENABLE_GENERICAVC"] )
+        source += libavc_source
-        source += amdtp_source
-        source += genericavc_source

trunk/libffado/tests/test-focusrite.cpp

@@ -33 +33 @@
-#include "libavc/general/avc_generic.h"
-#include "libutil/Time.h"
+#include "libutil/ByteSwap.h"
-
-#include "bebob/focusrite/focusrite_cmd.h"
+#include "bebob/focusrite/focusrite_generic.h"
-using namespace BeBoB::Focusrite;
-
@@ -122 +124 @@
-        break;
-    case ARGP_KEY_END:
-
-
-
-
+
-        
-        break;
@@ -165 +164 @@
-        cmd.setVerbose( DEBUG_LEVEL_NORMAL );
-    
-28
+10
-    uint32_t old_vals[TOTAL_IDS_TO_SCAN+1];
+    m_1394Service->setVerboseLevel(DEBUG_LEVEL_INFO);
-    
-    while(1) {
-
+
+
+
+
+
+
-//             if (id==64) continue; // metering
-//             if (id==65) continue; // metering
-//             if (id==66) continue; // metering
-//             if (id==67) continue; // metering
-
-
-
-
-
-
-
-
-
-
-
+
+
-            }
-
-
-
+
+
+
+
+
+
+
+
+
-            }
-        }