Changeset 630

Timestamp:

09/08/07 09:19:40 (16 years ago)

Author:

wagi

Message:

Some more fixing of the cashing code. The loading is still disabled because it seems not to work right. But at least it doesn't crash anymore. Some further debugging is
needed.

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (12 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.h (modified) (1 diff)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.h (modified) (3 diffs)
• trunk/libffado/src/libavc/general/avc_unit.cpp (modified) (12 diffs)
• trunk/libffado/src/libavc/general/avc_unit.h (modified) (4 diffs)
• trunk/libffado/src/libutil/cmd_serialize.cpp (modified) (5 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -57 +57 @@
-                    std::auto_ptr< ConfigRom >( configRom ) )
-    : GenericAVC::AvDevice( ieee1394service, configRom )
-NULL
+0
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::AvDevice (NodeID %d)\n",
@@ -65 +65 @@
-AvDevice::~AvDevice()
-{
-
-
-
+
-}
-
@@ -78 +76 @@
-    GenericAVC::VendorModel vendorModel( SHAREDIR "/ffado_driver_bebob.txt" );
-    if ( vendorModel.parse() ) {
-        vendorModel.printTable();
-        return vendorModel.isPresent( vendorId, modelId );
-    }
@@ -143 +140 @@
-    // this removes the mixer if it already exists
-    // note: a mixer self-registers to it's parent
-
-
-
-
-
+
+
+
-    if(getAudioSubunit(0) == NULL) {
-        debugWarning("Could not find audio subunit, mixer not available.\n");
-NULL
+0
-    } else {
-        m_Mixer = new Mixer(*this);
@@ -221 +216 @@
-{
-    ExtendedStreamFormatCmd extStreamFormatCmd( *m_p1394Service );
-
-
+
-    extStreamFormatCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Input,
-                                                    PlugAddress::ePAM_Unit,
@@ -335 +329 @@
-}
-
-
-template <typename T> bool serializeVector( Glib::ustring path,
-                                            Util::IOSerialize& ser,
-                                            const T& vec )
-{
-    bool result = true; // if vec.size() == 0
-    int i = 0;
-    for ( typename T::const_iterator it = vec.begin(); it != vec.end(); ++it ) {
-        std::ostringstream strstrm;
-        strstrm << path << i;
-        result &= ( *it )->serialize( strstrm.str() + "/", ser );
-        i++;
-    }
-    return result;
-}
-
-template <typename T, typename VT> bool deserializeVector( Glib::ustring path,
-                                                           Util::IODeserialize& deser,
-                                                           Unit& avDevice,
-                                                           VT& vec )
-{
-    int i = 0;
-    bool bFinished = false;
-    do {
-        std::ostringstream strstrm;
-        strstrm << path << i << "/";
-        T* ptr = T::deserialize( strstrm.str(),
-                                 deser,
-                                 avDevice );
-        if ( ptr ) {
-            vec.push_back( ptr );
-            i++;
-        } else {
-            bFinished = true;
-        }
-    } while ( !bFinished );
-
-    return true;
-}
-
-bool
-AvDevice::serialize( Glib::ustring basePath,
-                     Util::IOSerialize& ser ) const
-{
-
-    bool result;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    return result;
-}
-
-
+
-AvDevice::deserialize( Glib::ustring basePath,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -446 +352 @@
-    Glib::ustring cachePath;
-    char* pCachePath;
-
+
+
+
+
+
+
+
+
-        debugError( "Could not create path string for cache pool (trying '/var/cache/libffado' instead)\n" );
-        cachePath == "/var/cache/libffado/";
@@ -459 +372 @@
-AvDevice::loadFromCache()
-{
-
+
+
+
+
-
-    char* configId;
@@ -472 +388 @@
-    debugOutput( DEBUG_LEVEL_NORMAL, "filename %s\n", sFileName.c_str() );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    bool result = deserialize( "", deser );
@@ -480 +407 @@
-    }
-
-
-
+
-}
-
@@ -491 +417 @@
-    string tmp_path = getCachePath() + m_pConfigRom->getGuidString();
-
-
+
+
-    vector<string> tokens;
-    tokenize( tmp_path, tokens, "/" );
@@ -499 +426 @@
-          ++it )
-    {
-
-
-
-
-
-
-
-
+
-
-        struct stat buf;

trunk/libffado/src/bebob/bebob_avdevice.h

@@ -87 +87 @@
-
-public:
-
-
-
-
+
+
+
-    int getConfigurationIdSampleRate();
-    int getConfigurationIdNumberOfChannel( AVC::PlugAddress::EPlugDirection ePlugDirection );

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -96 +96 @@
-        unsigned int vendorId = m_pConfigRom->getNodeVendorId();
-        unsigned int modelId = m_pConfigRom->getModelId();
-
+
-        GenericAVC::VendorModel vendorModel( SHAREDIR "/ffado_driver_genericavc.txt" );
-        if ( vendorModel.parse() ) {
-            m_model = vendorModel.find( vendorId, modelId );
-        }
-
+
-        if (!GenericAVC::VendorModel::isValid(m_model)) {
-            return false;
@@ -591 +591 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/src/genericavc/avc_avdevice.h

@@ -54 +54 @@
-    virtual bool discover();
-    static FFADODevice * createDevice( Ieee1394Service& ieee1394Service,
-
-
+
+
+
+
+
-    virtual void setVerboseLevel(int l);
-    virtual void showDevice();
@@ -71 +74 @@
-    virtual bool startStreamByIndex(int i);
-    virtual bool stopStreamByIndex(int i);
-
+
-    // redefinition to resolve ambiguity
-    virtual Ieee1394Service& get1394Service()
-        { return FFADODevice::get1394Service(); };
- 
+
-        { return FFADODevice::getConfigRom(); };
-
+
-protected:
-    virtual bool addPlugToProcessor( AVC::Plug& plug, Streaming::StreamProcessor *processor,
@@ -84 +87 @@
-                                   AVC::Plug::EPlugDirection direction,
-                                   AVC::ESamplingFrequency samplingFrequency );*/
-
+
-    struct VendorModelEntry m_model;
-
+
-    // streaming stuff
-    typedef std::vector< Streaming::StreamProcessor * > StreamProcessorVector;
-    StreamProcessorVector m_receiveProcessors;
-    StreamProcessorVector m_transmitProcessors;
-
+
-    DECLARE_DEBUG_MODULE;
-};

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

@@ -103 +103 @@
-}
-
- 
+
-Unit::createSubunit(Unit& unit,
-                    ESubunitType type,
- 
+
-{
-    Subunit* s=NULL;
@@ -222 +222 @@
-                return false;
-            }
-
+
-            subunit->setVerboseLevel(getDebugLevel());
-
+
-            if ( !subunit->discover() ) {
-                debugError( "enumerateSubUnits: Could not discover "
@@ -236 +236 @@
-                m_subunits.push_back( subunit );
-            }
-
+
-            break;
-        case eST_Music:
@@ -244 +244 @@
-                return false;
-            }
-
+
-            subunit->setVerboseLevel(getDebugLevel());
-
+
-            if ( !subunit->discover() ) {
-                debugError( "enumerateSubUnits: Could not discover "
@@ -633 +633 @@
-
-    }
-
+
-    PlugVector syncExternalInputPlugs = getPlugsByType( m_externalPlugs,
-                                                    Plug::eAPD_Input,
@@ -809 +809 @@
-}
-
-
-
-
+
+
+
+
+
-{
-    bool result = true; // if vec.size() == 0
@@ -824 +826 @@
-}
-
-
-
-
-
+
+
+
+
+
+
-{
-    int i = 0;
@@ -850 +854 @@
-bool
-Unit::serializeSyncInfoVector( Glib::ustring basePath,
-    
-    const SyncInfoVector& vec )
+
+const SyncInfoVector& vec ) const
-{
-    bool result = true;
@@ -877 +881 @@
-bool
-Unit::deserializeSyncInfoVector( Glib::ustring basePath,
-    
-    
+
+
-{
-    int i = 0;
@@ -933 +937 @@
-bool
-Unit::serialize( Glib::ustring basePath,
-
-
-
+
+
-    bool result;
-    result  = ser.write( basePath + "m_verboseLevel_unit", getDebugLevel() );
+    result &= serializeVector( basePath + "Subunit", ser, m_subunits );
+    result &= serializeVector( basePath + "plugConnections", ser, m_plugConnections );
-    result &= m_pPlugManager->serialize( basePath + "Plug", ser ); // serialize all av plugs
-
-
-
-
-
+
+
-    int i = 0;
-    for ( SyncInfoVector::const_iterator it = m_syncInfos.begin();
@@ -962 +964 @@
-bool
-Unit::deserialize( Glib::ustring basePath,
-
-
+
-{
-    bool result;
-
+
-    int verboseLevel;
-    result  = deser.read( basePath + "m_verboseLevel_unit", verboseLevel );
-    setDebugLevel( verboseLevel );
-
-
+
+
+
+
+
+
-    m_pPlugManager = PlugManager::deserialize( basePath + "Plug", deser, *this );
-
-    return false;
-}
-
+
+if ( !m_pPlugManager )
+    return false;
+
-    result &= deserializePlugUpdateConnections( basePath + "Plug", deser, m_pcrPlugs );
-    result &= deserializePlugUpdateConnections( basePath + "Plug", deser, m_externalPlugs );
@@ -983 +988 @@
-    result &= deserializeSyncInfoVector( basePath + "SyncInfo", deser, m_syncInfos );
-
-
-    unsigned int i;
-    result &= deser.read( basePath + "m_activeSyncInfo", i );

trunk/libffado/src/libavc/general/avc_unit.h

@@ -60 +60 @@
-    /// Returns the ConfigRom
-    virtual ConfigRom& getConfigRom() const = 0;
-
+
-    /// Discovers the unit's internals
-    virtual bool discover();
@@ -90 +90 @@
-    virtual const SyncInfo* getActiveSyncInfo() const
-        { return m_activeSyncInfo; }
-
+
-    virtual bool setActiveSync( const SyncInfo& syncInfo );
-
-
-
-
-
+
+
+
-    SubunitAudio* getAudioSubunit( subunit_id_t subunitId )
-        { return dynamic_cast<SubunitAudio*>(
@@ -133 +132 @@
-                                           std::string syncDescription );
-    virtual Plug* getSyncPlug( int maxPlugId, Plug::EPlugDirection );
-
+
-    unsigned int getNrOfSubunits( subunit_type_t subunitType ) const;
-    PlugConnection* getPlugConnection( Plug& srcPlug ) const;
@@ -152 +151 @@
-
-    bool serializeSyncInfoVector( Glib::ustring basePath,
-       
-       const SyncInfoVector& vec )
+
+const SyncInfoVector& vec ) const
-    bool deserializeSyncInfoVector( Glib::ustring basePath,
-       
-       
+
+
-protected:
-    SubunitVector             m_subunits;

trunk/libffado/src/libutil/cmd_serialize.cpp

@@ -41 +41 @@
-CoutSerializer::write( byte_t d, const char* name )
-{
-
+-40.
-    m_cnt += sizeof( byte_t );
-
@@ -50 +50 @@
-CoutSerializer::write( uint16_t d, const char* name )
-{
-
+-40.
-    m_cnt += sizeof( uint16_t );
-
@@ -59 +59 @@
-CoutSerializer::write( quadlet_t d, const char* name )
-{
-
+-40.
-    m_cnt += sizeof( quadlet_t );
-    return true;
@@ -67 +67 @@
-CoutSerializer::write( const char * v, size_t len, const char* name )
-{
-
+-40.
-    m_cnt += len;
-    return true;
@@ -145 +145 @@
-    byte_t hi = (value & 0xFF00) >> 8;
-    byte_t lo = value & 0xFF;
-
+
-    bool result = false;
-    if ( isCurPosValid() ) {