Changeset 529

Timestamp:

08/20/07 13:27:46 (16 years ago)

Author:

wagi

Message:

- saveCache and loadFromCache interface added to IAvDevice
- current implenetation of saveCache and loadFromCache moved to bebob
- config parser added for loading vendor and model ids from a file instead hardcoded (not finished yet)

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (10 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.h (modified) (6 diffs)
• trunk/libffado/src/bebob/bebob_configparser.cpp (added)
• trunk/libffado/src/bebob/bebob_configparser.h (added)
• trunk/libffado/src/devicemanager.cpp (modified) (5 diffs)
• trunk/libffado/src/devicemanager.h (modified) (2 diffs)
• trunk/libffado/src/iavdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/iavdevice.h (modified) (1 diff)
• trunk/libffado/src/Makefile.am (modified) (2 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -40 +40 @@
-#include <iostream>
-#include <sstream>
+#include <unistd.h>
+#include <sys/stat.h>
-
-namespace BeBoB {
@@ -133 +135 @@
-    unsigned int vendorId = configRom.getNodeVendorId();
-    unsigned int modelId = configRom.getModelId();
+
+    ConfigParser configParser( "/home/wagi/src/libffado/src/bebob/ffado_driver_bebob.txt" );
-
-    for ( unsigned int i = 0;
@@ -815 +819 @@
-
-int
- Ieee1394Service& ieee1394Service, int nodeId 
-
-ieee
+
+
+*m_p
-    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
-
+m_
-    extStreamFormatCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Input,
-                                                    PlugAddress::ePAM_Unit,
-                                                    unitPlugAddress ) );
-
-
+m_
-    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
-    extStreamFormatCmd.setVerbose( true );
@@ -849 +853 @@
-
-int
-
-
-
-
-
+
+
+
-    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
-
+m_
-    extPlugInfoCmd.setPlugAddress( PlugAddress( ePlugDirection,
-                                                PlugAddress::ePAM_Unit,
-                                                unitPlugAddress ) );
-
+m_
-    extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
-    extPlugInfoCmd.setVerbose( true );
@@ -886 +888 @@
-
-int
-
-
-
-
+
+
+
-    SignalUnitAddress signalUnitAddr;
-    signalUnitAddr.m_plugId = 0x01;
-    signalSourceCmd.setSignalDestination( signalUnitAddr );
-
+m_
-    signalSourceCmd.setSubunitType( AVCCommand::eST_Unit  );
-    signalSourceCmd.setSubunitId( 0xff );
@@ -923 +924 @@
-
-int
- Ieee1394Service& ieee1394Service, int nodeId 
+
-{
-    // create a unique configuration id.
-    int id = 0;
- ieee1394Service, nodeId 
-ieee1394Service, nodeId, 
-ieee1394Service, nodeId, 
- ieee1394Service, nodeId 
+
+
+
+
-
-    return id;
@@ -1489 +1490 @@
-AvDevice::serializeSyncInfoVector( Glib::ustring basePath,
-                                   Util::IOSerialize& ser,
-
+ const
-{
-    bool result = true;
@@ -1516 +1517 @@
-AvDevice::deserializeSyncInfoVector( Glib::ustring basePath,
-                                     Util::IODeserialize& deser,
-                                     AvDevice& avDevice,
-                                     SyncInfoVector& vec )
-{
@@ -1540 +1540 @@
-        if ( result ) {
-            SyncInfo syncInfo;
-avDevice.getPlugManager().
-avDevice.getPlugManager().
+m_pPlugManager->
+m_pPlugManager->
-            syncInfo.m_description = description;
-
@@ -1598 +1598 @@
-    result &= serializeOptions( basePath + "Options", ser );
-
-//    
+    //
-
-    return result;
-}
-
-
+
-AvDevice::deserialize( Glib::ustring basePath,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/libffado/src/bebob/bebob_avdevice.h

@@ -31 +31 @@
-#include "libavc/avc_extended_cmd_generic.h"
-
+#include "bebob/bebob_configparser.h"
-#include "bebob/bebob_avplug.h"
-#include "bebob/bebob_avdevice_subunit.h"
@@ -52 +53 @@
-namespace BeBoB {
-
-struct VendorModelEntry {
-    unsigned int vendor_id;
-    unsigned int model_id;
-    char *vendor_name;
-    char *model_name;
-};
-
-class AvDevice : public IAvDevice {
-public:
@@ -69 +63 @@
-
-    static bool probe( ConfigRom& configRom );
-
+
+
-    virtual bool discover();
-
@@ -118 +113 @@
-    bool setActiveSync( const SyncInfo& syncInfo );
-
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static AvDevice* deserialize( Glib::ustring basePath,
-                                  Util::IODeserialize& deser,
-                  Ieee1394Service& ieee1394Service );
-    AvDeviceSubunitAudio* getAudioSubunit( subunit_id_t subunitId )
-        { return dynamic_cast<AvDeviceSubunitAudio*>(
@@ -167 +158 @@
-                                           std::string syncDescription );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-protected:
@@ -189 +183 @@
-    SyncInfoVector            m_syncInfos;
-    SyncInfo*                 m_activeSyncInfo;
-struct VendorModelEntry*
+VendorModelEntry*       
-    GenericMixer*             m_Mixer;
-

trunk/libffado/src/devicemanager.cpp

@@ -63 +63 @@
-#include <iostream>
-#include <sstream>
-#include <unistd.h>
-#include <sys/stat.h>
-
-using namespace std;
@@ -224 +222 @@
-            }
-
-
-
-
-
-
-
-
-
-
+
-            if ( avDevice ) {
-                debugOutput( DEBUG_LEVEL_NORMAL,
@@ -238 +228 @@
-                             nodeId );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -267 +260 @@
-                }
-
-
-
-
-
+
+
-                }
-
@@ -499 +490 @@
-    return true;
-}
-
-bool
-DeviceManager::buildCache()
-{
-    bool result = true;
-    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
-          it != m_avDevices.end();
-          ++it )
-    {
-        IAvDevice* pAvDevice = *it;
-        result &= saveCache( pAvDevice );
-    }
-
-    return result;
-}
-
-Glib::ustring
-DeviceManager::getCachePath()
-{
-    Glib::ustring cachePath;
-    char* pCachePath;
-    if ( asprintf( &pCachePath, "%s/cache/libffado/",  CACHEDIR ) < 0 ) {
-        debugError( "Could not create path string for cache pool (trying '/var/cache/libffado' instead)\n" );
-        cachePath == "/var/cache/libffado/";
-    } else {
-        cachePath = pCachePath;
-        free( pCachePath );
-    }
-    return cachePath;
-}
-
-bool
-DeviceManager::saveCache( IAvDevice* pAvDevice )
-{
-    // so far only BeBoB based devices needed a cache for speed up.
-    BeBoB::AvDevice* pBeBoBDevice = reinterpret_cast<BeBoB::AvDevice*>( pAvDevice );
-    if ( !pBeBoBDevice ) {
-        return true;
-    }
-    // FIXME: the above test doesn't have the desired effect - MOTU devices
-    // are still allowed to proceed.  Therefore for the moment include a
-    // further check.
-    // If the device isn't a BeBoB device we can't assume it will accept AVC
-    // commands (for example, trying to send AVC commands to a MOTU via
-    // libiec61883 gives an endless stream of "send oops" messages). 
-    // Therefore only proceed if the device is a known BeBoB device.
-    if (!BeBoB::AvDevice::probe(pAvDevice->getConfigRom())) {
-        return true;
-    }
-
-    // the path looks like this:
-    // PATH_TO_CACHE + GUID + CONFIGURATION_ID
-
-    Glib::ustring sDevicePath = getCachePath() + pAvDevice->getConfigRom().getGuidString();
-    struct stat buf;
-    if ( stat( sDevicePath.c_str(), &buf ) == 0 ) {
-        if ( !S_ISDIR( buf.st_mode ) ) {
-            debugError( "\"%s\" is not a directory\n",  sDevicePath.c_str() );
-            return false;
-        }
-    } else {
-        if (  mkdir( sDevicePath.c_str(), S_IRWXU | S_IRWXG ) != 0 ) {
-            debugError( "Could not create \"%s\" directory\n", sDevicePath.c_str() );
-            return false;
-        }
-    }
-
-    char* configId;
-    asprintf(&configId, "%08x", BeBoB::AvDevice::getConfigurationId( *m_1394Service,
-                                                                     pAvDevice->getNodeId() ) );
-    if ( !configId ) {
-        debugError( "Could not create id string\n" );
-        return false;
-    }
-    Glib::ustring sFileName = sDevicePath + "/" + configId + ".xml";
-    free( configId );
-    debugOutput( DEBUG_LEVEL_NORMAL, "filename %s\n", sFileName.c_str() );
-
-    Util::XMLSerialize ser( sFileName );
-    return pBeBoBDevice->serialize( "", ser );
-}
-
-IAvDevice*
-DeviceManager::loadFromCache( const ConfigRom& configRom )
-{
-    Glib::ustring sDevicePath = getCachePath() + configRom.getGuidString();
-    char* configId;
-    // If the device isn't a BeBoB device we can't assume it will accept AVC
-    // commands (for example, trying to send AVC commands to a MOTU via
-    // libiec61883 gives an endless stream of "send oops" messages). 
-    // Therefore only proceed if the device is a known BeBoB device.
-    if (!BeBoB::AvDevice::probe((ConfigRom&)configRom)) {
-        return false;
-    }
-    asprintf(&configId, "%08x",
-    BeBoB::AvDevice::getConfigurationId(*m_1394Service,
-    configRom.getNodeId()) );
-    if ( !configId ) {
-        debugError( "could not create id string\n" );
-        return false;
-    }
-    Glib::ustring sFileName = sDevicePath + "/" + configId + ".xml";
-    free( configId );
-    debugOutput( DEBUG_LEVEL_NORMAL, "filename %s\n", sFileName.c_str() );
-
-    Util::XMLDeserialize deser( sFileName, m_verboseLevel );
-
-    BeBoB::AvDevice* pBeBoBDevice = BeBoB::AvDevice::deserialize( "",
-                                                                  deser,
-                                                                  *m_1394Service );
-    if ( pBeBoBDevice ) {
-        debugOutput( DEBUG_LEVEL_NORMAL, "could create valid bebob driver from %s\n", sFileName.c_str() );
-        pBeBoBDevice->getConfigRom().setNodeId( configRom.getNodeId() );
-    }
-
-    return pBeBoBDevice;
-}
-

trunk/libffado/src/devicemanager.h

@@ -69 +69 @@
-    unsigned int getAvDeviceCount();
-
-    bool buildCache();
-    IAvDevice* loadFromCache( const ConfigRom& configRom );
-
-    Streaming::StreamProcessor *getSyncSource();
-
@@ -78 +75 @@
-                                   int id );
-    IAvDevice* getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ) );
-
-
-    Glib::ustring getCachePath();
-    bool saveCache( IAvDevice* pAvDevice );
-
-protected:

trunk/libffado/src/iavdevice.cpp

@@ -60 +60 @@
-
-bool
+IAvDevice::loadFromCache()
+{
+    return false;
+}
+
+bool
+IAvDevice::saveCache()
+{
+    return false;
+}
+
+bool
-IAvDevice::setId( unsigned int id)
-{
@@ -68 +80 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Set id to %s...\n", idstr.str().c_str());
-
-
+
-    retval=setOption("id",idstr.str());
-    if (retval) {

trunk/libffado/src/iavdevice.h

@@ -56 +56 @@
-    /// Returns the ConfigRom object of the device node.
-    ConfigRom& getConfigRom() const;
+
+    /**
+     * @brief Called by DeviceManager to load device model from cache.
+     *
+     * This function is called before discover in order to speed up
+     * system initializing.
+     *
+     * @returns true if device was cached and successfully loaded from cache
+     */
+    virtual bool loadFromCache();
+
+    /**
+     * @brief Called by DeviceManager to allow device driver to save a cache version
+     * of the current configuration.
+     *
+     * @returns true if caching was successful. False doesn't mean an error just,
+     * the driver was unable to store the configuration
+     */
+    virtual bool saveCache();
-
-    /**

trunk/libffado/src/Makefile.am

@@ -51 +51 @@
-        devicemanager.h fbtypes.h iavdevice.h threads.h bebob/bebob_avdevice.h \
-        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \
-
+bebob/bebob_configparser.h 
-        bebob/GenericMixer.h \
-        maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h \
@@ -136 +136 @@
-            bebob/bebob_dl_mgr.cpp \
-            bebob/bebob_functionblock.cpp \
+            bebob/bebob_configparser.cpp \
-            bebob/GenericMixer.cpp \
-            maudio/maudio_avdevice.cpp