Changeset 688
- Timestamp:
- 11/03/07 05:31:51 (16 years ago)
- Files:
-
- trunk/libffado/SConstruct (modified) (1 diff)
- trunk/libffado/src/bebob-sync.cpp (deleted)
- trunk/libffado/src/bebob/bebob_dl_codes.h (modified) (2 diffs)
- trunk/libffado/src/bebob/bebob_dl_mgr.h (modified) (2 diffs)
- trunk/libffado/src/fireworks/fireworks_firmware.cpp (added)
- trunk/libffado/src/fireworks/fireworks_firmware.h (added)
- trunk/libffado/src/SConscript (modified) (2 diffs)
- trunk/libffado/support/firmware (added)
- trunk/libffado/support/firmware/bridgeco-downloader.cpp (moved) (moved from trunk/libffado/src/bridgeco-downloader.cpp) (1 diff)
- trunk/libffado/support/firmware/SConscript (added)
- trunk/libffado/support/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/SConstruct
r640 r688 232 232 Default( 'external' ) 233 233 Default( 'src' ) 234 Default( 'support' ) 234 235 if env['BUILD_TESTS']: 235 236 Default( 'tests' ) trunk/libffado/src/bebob/bebob_dl_codes.h
r618 r688 21 21 * MA 02110-1301 USA 22 22 */ 23 24 #ifdef ENABLE_BEBOB25 26 23 #ifndef BEBOB_DL_CODES_H 27 24 #define BEBOB_DL_CODES_H … … 316 313 }; 317 314 #endif 318 319 #endif //#ifdef ENABLE_BEBOBtrunk/libffado/src/bebob/bebob_dl_mgr.h
r445 r688 55 55 bool programGUID( octlet_t guid ); 56 56 57 void busresetHandler();57 void busresetHandler(); 58 58 59 Ieee1394Service* get1394Serivce() const60 { return m_ieee1394service; }59 Ieee1394Service* get1394Serivce() const 60 { return m_ieee1394service; } 61 61 62 bool setForceOperations( bool enabled )63 { m_forceEnabled = enabled; return true; }62 bool setForceOperations( bool enabled ) 63 { m_forceEnabled = enabled; return true; } 64 64 65 bool setStartBootloader( bool bStartBootloader )66 { m_bStartBootloader = bStartBootloader; return true; }67 protected:68 enum EObjectType {69 eOT_Application,70 eOT_CnE71 };65 bool setStartBootloader( bool bStartBootloader ) 66 { m_bStartBootloader = bStartBootloader; return true; } 67 protected: 68 enum EObjectType { 69 eOT_Application, 70 eOT_CnE 71 }; 72 72 73 void waitForBusReset();73 void waitForBusReset(); 74 74 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 ); 77 77 78 78 bool programGUIDCmd( octlet_t guid ); 79 bool startBootloaderCmd();79 bool startBootloaderCmd(); 80 80 bool startApplicationCmd(); 81 81 bool initializePersParamCmd(); … … 115 115 info_register_t m_cachedInfoRegs; 116 116 117 pthread_mutex_t m_mutex;118 pthread_cond_t m_cond;117 pthread_mutex_t m_mutex; 118 pthread_cond_t m_cond; 119 119 120 Functor* m_functor;120 Functor* m_functor; 121 121 122 bool m_forceEnabled;123 bool m_bStartBootloader;122 bool m_forceEnabled; 123 bool m_bStartBootloader; 124 124 125 DECLARE_DEBUG_MODULE;125 DECLARE_DEBUG_MODULE; 126 126 }; 127 127 } trunk/libffado/src/SConscript
r665 r688 109 109 fireworks/fireworks_device.cpp \ 110 110 fireworks/fireworks_control.cpp \ 111 fireworks/fireworks_firmware.cpp \ 111 112 fireworks/efc/efc_avc_cmd.cpp \ 112 113 fireworks/efc/efc_cmd.cpp \ 113 114 fireworks/efc/efc_cmds_hardware.cpp \ 114 115 fireworks/efc/efc_cmds_hardware_ctrl.cpp \ 116 fireworks/efc/efc_cmds_flash.cpp \ 115 117 fireworks/efc/efc_cmds_mixer.cpp \ 116 118 fireworks/efc/efc_cmds_monitor.cpp \ … … 250 252 installapps = [] 251 253 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 258 254 for app in apps.keys(): 259 255 env2.Program( target=app, source = env.Split( apps[app] ) ) trunk/libffado/support/firmware/bridgeco-downloader.cpp
r445 r688 22 22 */ 23 23 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" 26 26 27 27 #include "libieee1394/configrom.h" trunk/libffado/support/SConscript
r561 r688 18 18 # 19 19 20 env.SConscript( dirs= "mixer", exports="env" )20 env.SConscript( dirs=["mixer","firmware"], exports="env" ) 21 21