Changeset 688

Show
Ignore:
Timestamp:
11/03/07 05:31:51 (16 years ago)
Author:
ppalmers
Message:

- Remove bebob sync tool, since this is now generalized into the FFADODevice API.

the sync source can be set with tests/test-ffado

- introduce a new directory for firmware tools: support/firmware
- Move the bridgeco firmware downloader to the support/firmware directory
- initial code for echo firmware downloading

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/SConstruct

    r640 r688  
    232232    Default( 'external' ) 
    233233    Default( 'src' ) 
     234    Default( 'support' ) 
    234235    if env['BUILD_TESTS']: 
    235236        Default( 'tests' ) 

  • trunk/libffado/src/bebob/bebob_dl_codes.h

    r618 r688  
    2121 * MA 02110-1301 USA 
    2222 */ 
    23  
    24 #ifdef ENABLE_BEBOB 
    25  
    2623#ifndef BEBOB_DL_CODES_H 
    2724#define BEBOB_DL_CODES_H 
    …… 
    316313}; 
    317314#endif 
    318  
    319 #endif //#ifdef ENABLE_BEBOB 

  • trunk/libffado/src/bebob/bebob_dl_mgr.h

    r445 r688  
    5555        bool programGUID( octlet_t guid ); 
    5656 
    57     void busresetHandler(); 
     57        void busresetHandler(); 
    5858 
    59     Ieee1394Service* get1394Serivce() const 
    60             { return m_ieee1394service; } 
     59        Ieee1394Service* get1394Serivce() const 
     60                { return m_ieee1394service; } 
    6161 
    62     bool setForceOperations( bool enabled ) 
    63             { m_forceEnabled = enabled; return true; } 
     62        bool setForceOperations( bool enabled ) 
     63                { m_forceEnabled = enabled; return true; } 
    6464 
    65     bool setStartBootloader( bool bStartBootloader ) 
    66         { m_bStartBootloader = bStartBootloader; return true; } 
    67     protected: 
    68     enum EObjectType { 
    69         eOT_Application, 
    70         eOT_CnE 
    71     }; 
     65        bool setStartBootloader( bool bStartBootloader ) 
     66            { m_bStartBootloader = bStartBootloader; return true; } 
     67        protected: 
     68        enum EObjectType { 
     69            eOT_Application, 
     70            eOT_CnE 
     71        }; 
    7272 
    73     void waitForBusReset(); 
     73        void waitForBusReset(); 
    7474        bool writeRequest( CommandCodes& cmd ); 
    75     bool readResponse( CommandCodes& writeRequestCmd ); 
    76     bool downloadObject( BCD& bcd, EObjectType eObject ); 
     75        bool readResponse( CommandCodes& writeRequestCmd ); 
     76        bool downloadObject( BCD& bcd, EObjectType eObject ); 
    7777 
    7878        bool programGUIDCmd( octlet_t guid ); 
    79     bool startBootloaderCmd(); 
     79        bool startBootloaderCmd(); 
    8080        bool startApplicationCmd(); 
    8181        bool initializePersParamCmd(); 
    …… 
    115115        info_register_t    m_cachedInfoRegs; 
    116116 
    117     pthread_mutex_t m_mutex; 
    118     pthread_cond_t  m_cond; 
     117        pthread_mutex_t m_mutex; 
     118        pthread_cond_t  m_cond; 
    119119 
    120     Functor*        m_functor; 
     120        Functor*        m_functor; 
    121121 
    122         bool            m_forceEnabled; 
    123     bool            m_bStartBootloader; 
     122            bool            m_forceEnabled; 
     123        bool            m_bStartBootloader; 
    124124 
    125     DECLARE_DEBUG_MODULE; 
     125        DECLARE_DEBUG_MODULE; 
    126126    }; 
    127127} 

  • trunk/libffado/src/SConscript

    r665 r688  
    109109        fireworks/fireworks_device.cpp \ 
    110110        fireworks/fireworks_control.cpp \ 
     111        fireworks/fireworks_firmware.cpp \ 
    111112        fireworks/efc/efc_avc_cmd.cpp \ 
    112113        fireworks/efc/efc_cmd.cpp \ 
    113114        fireworks/efc/efc_cmds_hardware.cpp \ 
    114115        fireworks/efc/efc_cmds_hardware_ctrl.cpp \ 
     116        fireworks/efc/efc_cmds_flash.cpp \ 
    115117        fireworks/efc/efc_cmds_mixer.cpp \ 
    116118        fireworks/efc/efc_cmds_monitor.cpp \ 
    …… 
    250252installapps = [] 
    251253 
    252 if env['ENABLE_BEBOB']: 
    253         apps["bebob-sync"] = "bebob-sync.cpp" 
    254         apps["bridgeco-downloader"] = "bridgeco-downloader.cpp" 
    255         installapps += [ "bebob-sync", "bridgeco-downloader" ] 
    256  
    257  
    258254for app in apps.keys(): 
    259255        env2.Program( target=app, source = env.Split( apps[app] ) ) 

  • trunk/libffado/support/firmware/bridgeco-downloader.cpp

    r445 r688  
    2222 */ 
    2323 
    24 #include "bebob/bebob_dl_mgr.h" 
    25 #include "bebob/bebob_dl_bcd.h" 
     24#include "src/bebob/bebob_dl_mgr.h" 
     25#include "src/bebob/bebob_dl_bcd.h" 
    2626 
    2727#include "libieee1394/configrom.h" 

  • trunk/libffado/support/SConscript

    r561 r688  
    1818# 
    1919 
    20 env.SConscript( dirs="mixer", exports="env" ) 
     20env.SConscript( dirs=["mixer","firmware"], exports="env" ) 
    2121