Changeset 276

Timestamp:

06/27/06 14:46:41 (17 years ago)

Author:

wagi

Message:

2006-06-27 Daniel Wagner <wagi@monom.org>

• configure.ac: Version bump to 1.1.0
  
• remove bebob_light code
  
• downloader various improvements
  
• ConfigRom::isAvcDevice() removed. Device probe code added.
  Each device driver class can check if it supports a device.
  

Files:

• branches/libfreebob-downloader/ChangeLog (modified) (1 diff)
• branches/libfreebob-downloader/configure.ac (modified) (1 diff)
• branches/libfreebob-downloader/src/bebob/bebob_avdevice.cpp (modified) (3 diffs)
• branches/libfreebob-downloader/src/bebob/bebob_avdevice.h (modified) (2 diffs)
• branches/libfreebob-downloader/src/bebob/bebob_dl_bcd.cpp (modified) (3 diffs)
• branches/libfreebob-downloader/src/bebob/bebob_dl_bcd.h (modified) (2 diffs)
• branches/libfreebob-downloader/src/bebob/bebob_dl_codes.cpp (modified) (2 diffs)
• branches/libfreebob-downloader/src/bebob/bebob_dl_codes.h (modified) (1 diff)
• branches/libfreebob-downloader/src/bebob/bebob_dl_mgr.cpp (modified) (23 diffs)
• branches/libfreebob-downloader/src/bebob_light/bebob_light_avdevice.cpp (deleted)
• branches/libfreebob-downloader/src/bebob_light/bebob_light_avdevice.h (deleted)
• branches/libfreebob-downloader/src/bebob_light/bebob_light_avdevicesubunit.cpp (deleted)
• branches/libfreebob-downloader/src/bebob_light/bebob_light_avdevicesubunit.h (deleted)
• branches/libfreebob-downloader/src/bebob_light/bebob_light_avplug.cpp (deleted)
• branches/libfreebob-downloader/src/bebob_light/bebob_light_avplug.h (deleted)
• branches/libfreebob-downloader/src/bounce/bounce_avdevice.cpp (modified) (1 diff)
• branches/libfreebob-downloader/src/configrom.cpp (modified) (6 diffs)
• branches/libfreebob-downloader/src/configrom.h (modified) (3 diffs)
• branches/libfreebob-downloader/src/devicemanager.cpp (modified) (6 diffs)
• branches/libfreebob-downloader/src/devicemanager.h (modified) (2 diffs)

branches/libfreebob-downloader/ChangeLog

@@ +1 @@
+2006-06-27  Daniel Wagner  <wagi@monom.org>
+
+        * configure.ac: Version bump to 1.1.0
+        * remove bebob_light code
+        * downloader various improvements
+        * ConfigRom::isAvcDevice() removed. Device probe code added. 
+        Each device driver class can check if it supports a device.
+
-2006-06-21  Daniel Wagner  <wagi@monom.org>
-

branches/libfreebob-downloader/configure.ac

@@ -23 +23 @@
-
-m4_define(freebob_major_version, 1)
-0
+1
-m4_define(freebob_micro_version, 0)
-

branches/libfreebob-downloader/src/bebob/bebob_avdevice.cpp

@@ -39 +39 @@
-IMPL_DEBUG_MODULE( AvDevice, AvDevice, DEBUG_LEVEL_NORMAL );
-
-
-
-
-
+
+
+
+
+
+
-    , m_nodeId( nodeId )
-    , m_verboseLevel( verboseLevel )
@@ -52 +54 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::AvDevice (NodeID %d)\n",
-                 nodeId );
-
-    m_configRom = new ConfigRom( m_1394Service, m_nodeId );
-    m_configRom->initialize();
-}
-
-AvDevice::~AvDevice()
-{
-    delete m_configRom;
-    for ( AvDeviceSubunitVector::iterator it = m_subunits.begin();
-          it != m_subunits.end();
@@ -90 +88 @@
-{
-    return *m_configRom;
+}
+
+struct VendorModelEntry {
+    unsigned int vendor_id;
+    unsigned int model_id;
+};
+
+static VendorModelEntry supportedDeviceList[] =
+{
+    {0x000d6c, 0x00010060},  // M-Audio, Audiophile
+    {0x0007f5, 0x00010048},  // BridgeCo, RD Audio1
+};
+
+bool
+AvDevice::probe( ConfigRom& configRom )
+{
+    unsigned int vendorId = configRom.getNodeVendorId();
+    unsigned int modelId = configRom.getModelId();
+
+    for ( unsigned int i = 0;
+          i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) );
+          ++i )
+    {
+        if ( ( supportedDeviceList[i].vendor_id == vendorId )
+             && ( supportedDeviceList[i].model_id == modelId ) )
+        {
+            return true;
+        }
+    }
+
+    return false;
-}
-

branches/libfreebob-downloader/src/bebob/bebob_avdevice.h

@@ -42 +42 @@
-class AvDevice : public IAvDevice {
-public:
-
+
+
-              int nodeId,
-              int verboseLevel );
-    virtual ~AvDevice();
-
+    static bool probe( ConfigRom& configRom );
-    virtual bool discover();
-    virtual ConfigRom& getConfigRom() const;
@@ -95 +97 @@
-    bool checkSyncConnections( AvPlugVector& plhs, AvPlugVector& prhs );
-protected:
+    std::auto_ptr<ConfigRom>( m_configRom );
-    Ieee1394Service* m_1394Service;
-    ConfigRom*       m_configRom;
-    int              m_nodeId;
-    int              m_verboseLevel;

branches/libfreebob-downloader/src/bebob/bebob_dl_bcd.cpp

@@ -99 +99 @@
-    , m_softwareId( 0 )
-    , m_softwareVersion( 0 )
+    , m_hardwareId( 0 )
+    , m_vendorOUI( 0 )
-    , m_imageBaseAddress( 0 )
-    , m_imageLength( 0 )
@@ -200 +202 @@
-        return false;
-    }
+    if ( !read( 0x20, &m_hardwareId ) ) {
+        return false;
+    }
+    if ( !read( 0x24, &m_vendorOUI ) ) {
+        return false;
+    }
-    if ( !read( 0x30, &m_imageOffset ) ) {
-        return false;
@@ -360 +368 @@
-    printf( "\tBCD File Version\t%d\n", m_bcd_version );
-    printf( "\tSoftware Date:\t\t%s, %s\n",
-
+ 
-            makeTime( m_softwareTime ).c_str() );
-    printf( "\tSoftware Version:\t0x%08x\n", m_softwareVersion );
-    printf( "\tSoftware Id:\t\t0x%08x\n", m_softwareId );
+    printf( "\tHardware ID:\t\t0x%08x\n", m_hardwareId );
+    printf( "\tVendor OUI:\t\t0x%08x\n", m_vendorOUI );
-    printf( "\tImage Offset:\t\t0x%08x\n", m_imageOffset );
-    printf( "\tImage Base Address:\t0x%08x\n", m_imageBaseAddress );

branches/libfreebob-downloader/src/bebob/bebob_dl_bcd.h

@@ -46 +46 @@
-        fb_quadlet_t getSoftwareVersion() const
-            { return m_softwareVersion; }
-
+
+
+
+
+
-        fb_quadlet_t getImageBaseAddress() const
-            { return m_imageBaseAddress; }
@@ -86 +90 @@
-        fb_quadlet_t m_softwareId;
-        fb_quadlet_t m_softwareVersion;
+        fb_quadlet_t m_hardwareId;
+        fb_quadlet_t m_vendorOUI;
+            
-
-        fb_quadlet_t m_imageBaseAddress;

branches/libfreebob-downloader/src/bebob/bebob_dl_codes.cpp

@@ -170 +170 @@
-    bool result = CommandCodes::serialize( se );
-
-    fb_quadlet_t tmp;
-    result &= se.write( m_object,  "CommandCodesDownloadStart: object" );
-tmp = m_date >> 32;
-result &= se.write( tmp,       "CommandCodesDownloadStart: date high"
-tmp = m_date & 0xffffffff
-result &= se.write( tmp,       "CommandCodesDownloadStart: date low" );
-tmp = m_time >> 32;
-result &= se.write( tmp   ,    "CommandCodesDownloadStart: time high"
-tmp = m_time & 0xffffffff
-result &= se.write( tmp,       "CommandCodesDownloadStart: time low" );
+for (  unsigned int i = 0; i < sizeof( m_date ); ++i ) {
+    fb_byte_t* tmp = ( fb_byte_t* )( &m_date
+    result &= se.write( tmp[i], "CommandCodesDownloadStart: date" )
+}
+for (  unsigned int i = 0; i < sizeof( m_date ); ++i ) {
+    fb_byte_t* tmp = ( fb_byte_t* )( &m_time
+    result &= se.write( tmp[i], "CommandCodesDownloadStart: time" )
+}
-    result &= se.write( m_id,      "CommandCodesDownloadStart: id" );
-    result &= se.write( m_version, "CommandCodesDownloadStart: version" );
@@ -315 +314 @@
-}
-
+////////////////////////////////
+
+BeBoB::CommandCodesGo::CommandCodesGo( fb_quadlet_t protocolVersion,
+                                             EStartMode startMode )
+    : CommandCodes( protocolVersion, eCmdC_Go, sizeof( m_startMode ), 1, 1 )
+    , m_startMode( startMode )
+{
+}
+
+BeBoB::CommandCodesGo::~CommandCodesGo()
+{
+}
+
+bool
+BeBoB::CommandCodesGo::serialize( IOSSerialize& se )
+{
+    bool result = CommandCodes::serialize( se );
+    result &= se.write( m_startMode, "CommandCodesGo: start mode" );
+
+    return result;
+}
+
+bool
+BeBoB::CommandCodesGo::deserialize( IISDeserialize& de )
+{
+    bool result = CommandCodes::deserialize( de );
+    result &= de.read( &m_resp_validCRC );
+
+    return result;
+}

branches/libfreebob-downloader/src/bebob/bebob_dl_codes.h

@@ -279 +279 @@
-    };
-
+    /////////////////////////
+
+    class CommandCodesGo : public CommandCodes {
+    public:
+        enum EStartMode {
+            eSM_Application = 0,
+            eSM_Debugger = 2,
+        };
+
+        CommandCodesGo( fb_quadlet_t protocolVersion, EStartMode startMode );
+        virtual ~CommandCodesGo();
+
+        virtual bool serialize( IOSSerialize& se );
+        virtual bool deserialize( IISDeserialize& de );
+
+        EStartMode getStartMode() const
+            { return static_cast<EStartMode>( m_startMode ); }
+        bool setStartMode( EStartMode startMode )
+            { m_startMode = startMode; return true; }
+
+        fb_quadlet_t getRespIsValidCRC() const
+            { return m_resp_validCRC; }
+
+    private:
+        fb_quadlet_t m_startMode;
+        fb_quadlet_t m_resp_validCRC;
+    };
+
+
+
-};
-#endif

branches/libfreebob-downloader/src/bebob/bebob_dl_mgr.cpp

@@ -76 +76 @@
-    memset( &m_cachedInfoRegs, 0, sizeof( m_cachedInfoRegs ) );
-
-
+*
-    // XXX throw exception if initialize fails!
-    m_configRom->initialize();
@@ -214 +214 @@
-    using namespace std;
-
+    printf( "parse BCD file\n" );
-    std::auto_ptr<BCD> bcd = std::auto_ptr<BCD>( new BCD( filename ) );
-    if ( !bcd.get() ) {
@@ -220 +221 @@
-        return false;
-    }
-
-    if ( !bcd->parse() ) {
-        debugError( "downloadFirmware: BCD parsing failed\n" );
@@ -226 +226 @@
-    }
-
+    printf( "prepare for download (start bootloader)\n" );
-    if ( !startBootloaderCmd() ) {
-        debugError( "downloadFirmware: Could not start bootloader\n" );
-        return false;
-    }
-
-
-
-
-
-
-
-
-
-
+
+
-    if ( !downloadObject( *bcd, eOT_Application ) ) {
-        debugError( "downloadFirmware: Firmware download failed\n" );
@@ -245 +238 @@
-    }
-
+    printf( "start downloading protocol for CnE\n" );
-    if ( !downloadObject( *bcd, eOT_CnE ) ) {
-        debugError( "downloadFirmware: CnE download failed\n" );
@@ -250 +244 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
-    if ( !startApplicationCmd() ) {
-        debugError( "downloadFirmware: Could not restart application\n" );
@@ -266 +264 @@
-    using namespace std;
-
+    printf( "parse BCD file\n" );
-    std::auto_ptr<BCD> bcd = std::auto_ptr<BCD>( new BCD( filename ) );
-    if ( !bcd.get() ) {
@@ -272 +271 @@
-        return false;
-    }
-
-    if ( !bcd->parse() ) {
-        debugError( "downloadCnE: BCD parsing failed\n" );
@@ -278 +276 @@
-    }
-
+    printf( "prepare for download (start bootloader)\n" );
-    if ( !startBootloaderCmd() ) {
-        debugError( "downloadCnE: Could not start bootloader\n" );
-        return false;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    if ( !downloadObject( *bcd, eOT_CnE ) ) {
-        debugError( "downloadCnE: CnE download failed\n" );
@@ -299 +288 @@
-    }
-
+    printf( "setting CnE to factory default settings\n" );
-    if ( !initializeConfigToFactorySettingCmd() ) {
-
-
-
-
-
-
-
-
+
+
+
+
+
-    if ( !startApplicationCmd() ) {
-        debugError( "downloadCnE: Could not restart application\n" );
@@ -363 +350 @@
-    // bootloader erases the flash, have to wait until is ready
-    // to answer our next request
+    printf( "wait unitl flash ereasing has terminated\n" );
-    sleep( 20 );
-
@@ -380 +368 @@
-    fb_quadlet_t address = 0;
-    bool result = true;
-
+
+
-    while ( imageLength > 0 ) {
-        unsigned int blockSize = imageLength > maxBlockSize ?
@@ -412 +401 @@
-            break;
-        }
-0
+
-
-        if ( !readResponse( ccBlock ) ) {
@@ -434 +423 @@
-        }
-
-
-
+
+
+
+
-        }
-
@@ -443 +434 @@
-        i++;
-    }
+    printf( "%10d/%d bytes downloaded\n",
+            downloadedBytes, totalBytes );
-
-    if ( !result ) {
@@ -456 +449 @@
-    }
-
+    printf( "wait for transaction completion\n" );
-    sleep( 10 );
-
@@ -478 +472 @@
-        }
-    }
+    printf( "download protocol successfuly completed\n" );
-    return result;
-}
@@ -488 +483 @@
-        return false;
-    }
-
-    waitForBusReset();
-    if ( !cacheInfoRegisters( MaxRetries ) ) {
-        debugError( "programGUID: Could not read info registers\n" );
-        return false;
-    }
-
-    // wait for bootloader finish startup sequence
-    // there is no way to find out when it has finished
-    sleep( 10 );
-
-    if ( !programGUIDCmd( guid ) ) {
@@ -609 +594 @@
-    }
-
+    waitForBusReset();
+    if ( !cacheInfoRegisters( MaxRetries ) ) {
+        debugError( "startBootloaderCmd: Could not read info registers\n" );
+        return false;
+    }
+
+    // wait for bootloader finish startup sequence
+    // there is no way to find out when it has finished
+    sleep( 10 );
+
-    return true;
-}
@@ -615 +610 @@
-BeBoB::BootloaderManager::startApplicationCmd()
-{
-Reset
-Reset
+Go
+Go
-    if ( !writeRequest( cmd ) ) {
-        debugError( "startApplicationCmd: writeRequest failed\n" );
@@ -634 +629 @@
-    }
-
+    sleep( 1 );
+
-    return true;
-}
@@ -646 +643 @@
-    }
-
+    sleep( 1 );
+
-    return true;
-}
@@ -658 +657 @@
-    }
-
-
-
+
+
+
+

branches/libfreebob-downloader/src/bounce/bounce_avdevice.cpp

@@ -47 +47 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Bounce::BounceDevice (NodeID %d)\n",
-                 nodeId );
-
+*
-    m_configRom->initialize();
-}

branches/libfreebob-downloader/src/configrom.cpp

@@ -30 +30 @@
-using namespace std;
-
-NORMAL
+VERBOSE
-
-static int busRead( struct csr1212_csr* csr,
@@ -55 +55 @@
-//-------------------------------------------------------------
-
-*
-
+&
+&
-    , m_nodeId( nodeId )
-    , m_avcDevice( false )
@@ -103 +103 @@
-
-    // Process Bus_Info_Block
-m_csr->bus_info_data[2]
-m_csr->bus_info_data[2]
-m_csr->bus_info_data[2]
-m_csr->bus_info_data[2]
-m_csr->bus_info_data[2]
-m_csr->bus_info_data[2]
-m_csr->bus_info_data[3]
-m_csr->bus_info_data[3]
-m_csr->bus_info_data[4]
+CSR1212_BE32_TO_CPU(m_csr->bus_info_data[2] )
+CSR1212_BE32_TO_CPU(m_csr->bus_info_data[2] )
+CSR1212_BE32_TO_CPU(m_csr->bus_info_data[2] )
+CSR1212_BE32_TO_CPU(m_csr->bus_info_data[2] )
+CSR1212_BE32_TO_CPU(m_csr->bus_info_data[2] )
+CSR1212_BE32_TO_CPU( m_csr->bus_info_data[2] )
+CSR1212_BE32_TO_CPU( m_csr->bus_info_data[3] )
+CSR1212_BE32_TO_CPU( m_csr->bus_info_data[3] )
+CSR1212_BE32_TO_CPU( m_csr->bus_info_data[4] )
-
-    // Process Root Directory
@@ -173 +173 @@
-}
-
-const bool
-ConfigRom::isAvcDevice() const
-{
-    return m_avcDevice;
-}
-
-// XXX This might work only for the M-Audio Audiophile
-// but can easily extended.
-#define VENDOR_ID_MAUDIO    0x00000d6c
-#define MODEL_ID_MAUDIO_BOOTLOADER 0x00010060
-
-const bool
-ConfigRom::isBootloader() const
-{
-    if ( ( m_vendorId == VENDOR_ID_MAUDIO )
-         && ( m_modelId == MODEL_ID_MAUDIO_BOOTLOADER ) )
-    {
-        return true;
-    }
-    return false;
-}
-
-static int
-busRead( struct csr1212_csr* csr,
@@ -434 +412 @@
-{
-    using namespace std;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -444 +432 @@
-ConfigRom::getAsyMaxPayload() const
-{
-
+?
-    return 1 << ( m_maxRec + 1 );
-}

branches/libfreebob-downloader/src/configrom.h

@@ -33 +33 @@
-class ConfigRom {
- public:
-*
+&
-    virtual ~ConfigRom();
-
-    bool initialize();
-
-    const bool isAvcDevice() const;
-    const bool isBootloader() const;
-    const fb_nodeid_t getNodeId() const;
-    const fb_octlet_t getGuid() const;
@@ -57 +55 @@
-        { return m_maxRec; }
-    unsigned short getAsyMaxPayload() const;
+
+    fb_quadlet_t getNodeVendorId() const
+        { return m_nodeVendorId; }
+    unsigned int getModelId() const
+        { return m_modelId; }
-
-    bool updatedNodeId();
@@ -83 +86 @@
-    fb_byte_t        m_cycleClkAcc;
-    fb_byte_t        m_maxRec;
-unsigned short
+fb_quadlet_t  
-    fb_byte_t        m_chipIdHi;
-    fb_quadlet_t     m_chipIdLow;

branches/libfreebob-downloader/src/devicemanager.cpp

@@ -1 @@
-
+ 
- * Copyright (C) 2005,06 by Daniel Wagner
- *
@@ -28 +28 @@
-#include "debugmodule/debugmodule.h"
-#include "bebob/bebob_avdevice.h"
-#include "bebob_light/bebob_light_avdevice.h"
-#include "bounce/bounce_avdevice.h"
-
@@ -40 +39 @@
-    : m_1394Service( 0 )
-{
-    m_probeList.push_back( probeBeBoB );
-    // m_probeList.push_back( probeBounce );
-}
-
@@ -93 +90 @@
-          ++nodeId )
-    {
-
-
-
+
+
+
+
+
-            // the config rom is missing. So this might be just
-a
+this
-            // be there is a real software problem on our side.
-            // This should be handled more carefuly.
@@ -107 +106 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -137 +137 @@
-
-IAvDevice*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-

branches/libfreebob-downloader/src/devicemanager.h

@@ -34 +34 @@
-typedef std::vector< IAvDevice* >::iterator IAvDeviceVectorIterator;
-
-
-
-
+
-
-class DeviceManager{
@@ -57 +55 @@
-
-protected:
-
-
+
+
+
-
-protected:
-    Ieee1394Service* m_1394Service;
-    IAvDeviceVector  m_avDevices;
-    ProbeFunctionVector m_probeList;
-
-    DECLARE_DEBUG_MODULE;