Changeset 271

Timestamp:

06/21/06 14:49:06 (16 years ago)

Author:

wagi

Message:

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

• freebob-downloader first version added
  

Files:

• branches/libfreebob-downloader/ChangeLog (modified) (1 diff)
• branches/libfreebob-downloader/src/bebob/bebob_dl_bcd.cpp (added)
• branches/libfreebob-downloader/src/bebob/bebob_dl_bcd.h (added)
• branches/libfreebob-downloader/src/bebob/bebob_dl_codes.cpp (added)
• branches/libfreebob-downloader/src/bebob/bebob_dl_codes.h (added)
• branches/libfreebob-downloader/src/bebob/bebob_dl_mgr.cpp (added)
• branches/libfreebob-downloader/src/bebob/bebob_dl_mgr.h (added)
• branches/libfreebob-downloader/src/configrom.cpp (modified) (5 diffs)
• branches/libfreebob-downloader/src/configrom.h (modified) (2 diffs)
• branches/libfreebob-downloader/src/freebob-downloader.cpp (added)
• branches/libfreebob-downloader/src/libfreebobavc/ieee1394service.cpp (modified) (5 diffs)
• branches/libfreebob-downloader/src/libfreebobavc/ieee1394service.h (modified) (6 diffs)
• branches/libfreebob-downloader/src/libfreebobavc/serialize.cpp (modified) (1 diff)
• branches/libfreebob-downloader/src/Makefile.am (modified) (3 diffs)
• branches/libfreebob-downloader/src/threads.h (added)

branches/libfreebob-downloader/ChangeLog

@@ +1 @@
+2006-06-21  Daniel Wagner  <wagi@monom.org>
+
+        * freebob-downloader first version added
+
-2006-06-10  Daniel Wagner  <wagi@monom.org>
-

branches/libfreebob-downloader/src/configrom.cpp

@@ -26 +26 @@
-
-#include <iostream>
+#include <iomanip>
-
-using namespace std;
@@ -61 +62 @@
-    , m_vendorName( "" )
-    , m_modelName( "" )
+    , m_vendorId( 0 )
+    , m_modelId( 0 )
+    , m_isIsoResourceManager( false )
+    , m_isCycleMasterCapable( false )
+    , m_isSupportIsoOperations( false )
+    , m_isBusManagerCapable( false )
+    , m_cycleClkAcc( 0 )
+    , m_maxRec( 0 )
+    , m_nodeVendorId( 0 )
+    , m_chipIdHi( 0 )
+    , m_chipIdLow( 0 )
-    , m_vendorNameKv( 0 )
-    , m_modelNameKv( 0 )
@@ -90 +102 @@
-    }
-
+    // Process Bus_Info_Block
+    m_isIsoResourceManager = m_csr->bus_info_data[2] >> 31;
+    m_isCycleMasterCapable = ( m_csr->bus_info_data[2] >> 30 ) & 0x1;
+    m_isSupportIsoOperations = ( m_csr->bus_info_data[2] >> 29 ) & 0x1;
+    m_isBusManagerCapable = ( m_csr->bus_info_data[2] >> 28 ) & 0x1;
+    m_cycleClkAcc = ( m_csr->bus_info_data[2] >> 16 ) & 0xff;
+    m_maxRec = ( m_csr->bus_info_data[2] >> 12 ) & 0xf;
+    m_nodeVendorId = ( m_csr->bus_info_data[3] >> 8 );
+    m_chipIdHi = ( m_csr->bus_info_data[3] ) & 0xff;
+    m_chipIdLow = m_csr->bus_info_data[4];
+
+    // Process Root Directory
-    processRootDirectory(m_csr);
-
@@ -180 +204 @@
-    struct config_csr_info* csr_info = (struct config_csr_info*) private_data;
-
-
-
-length
-
+!
+ 
+ length/4
+ 
-    {
-        //debugOutput( DEBUG_LEVEL_VERBOSE, "ConfigRom: Read failed\n");
@@ -354 +378 @@
-    return m_vendorName;
-}
+
+bool
+ConfigRom::updatedNodeId()
+{
+    for ( fb_nodeid_t nodeId = 0;
+          nodeId < m_1394Service->getNodeCount();
+          ++nodeId )
+    {
+        struct config_csr_info csr_info;
+        csr_info.service = m_1394Service;
+        csr_info.nodeId = 0xffc0 | nodeId;
+
+        struct csr1212_csr* csr =
+            csr1212_create_csr( &configrom_csr1212_ops,
+                                5 * sizeof(fb_quadlet_t),   // XXX Why 5 ?!?
+                                &csr_info );
+
+        if (!csr || csr1212_parse_csr( csr ) != CSR1212_SUCCESS) {
+            if (csr) {
+                csr1212_destroy_csr(csr);
+            }
+            return false;
+        }
+
+
+        octlet_t guid =
+            ((u_int64_t)CSR1212_BE32_TO_CPU(csr->bus_info_data[3]) << 32)
+            | CSR1212_BE32_TO_CPU(csr->bus_info_data[4]);
+
+        if ( guid == m_guid ) {
+            if ( nodeId != m_nodeId ) {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "Device with GUID 0%08x%08x changed node id "
+                             "from %d to %d\n",
+                             m_guid >> 32,
+                             m_guid & 0xffffffff,
+                             m_nodeId,
+                             nodeId );
+                m_nodeId = nodeId;
+            }
+            return true;
+        }
+    }
+
+    debugOutput( DEBUG_LEVEL_NORMAL,
+                 "Device with GUID 0x%08x%08x could not be found on "
+                 "the bus anymore (removed?)\n",
+                 m_guid >> 32,
+                 m_guid & 0xffffffff );
+    return false;
+}
+
+void
+ConfigRom::printConfigRom() const
+{
+    using namespace std;
+    cout << "Config ROM" << endl;
+    cout << "\tCurrent Node Id:\t" << getNodeId() << endl;
+    cout << "\tGUID:\t\t\t0x" << setfill( '0' ) << setw( 16 ) << hex << getGuid() << endl;
+    cout << "\tVendor Name:\t\t" << getVendorName() << endl;
+    cout << "\tModel Name:\t\t" << getModelName() << endl;
+}
+
+unsigned short
+ConfigRom::getAsyMaxPayload() const
+{
+    // XXX use pow instead
+    return 1 << ( m_maxRec + 1 );
+}

branches/libfreebob-downloader/src/configrom.h

@@ -44 +44 @@
-    const std::string getModelName() const;
-    const std::string getVendorName() const;
+    bool isIsoResourseManager() const
+        { return m_isIsoResourceManager; }
+    bool isCycleMasterCapable() const
+        { return m_isCycleMasterCapable; }
+    bool isSupportsIsoOperations() const
+        { return m_isSupportIsoOperations; }
+    bool isBusManagerCapable() const
+        { return m_isBusManagerCapable; }
+    fb_byte_t getCycleClockAccurancy() const
+        { return m_cycleClkAcc; }
+    fb_byte_t getMaxRec() const
+        { return m_maxRec; }
+    unsigned short getAsyMaxPayload() const;
-
+    bool updatedNodeId();
+
+    void printConfigRom() const;
-
- protected:
@@ -61 +77 @@
-    unsigned int     m_vendorId;
-    unsigned int     m_modelId;
+    bool             m_isIsoResourceManager;
+    bool             m_isCycleMasterCapable;
+    bool             m_isSupportIsoOperations;
+    bool             m_isBusManagerCapable;
+    fb_byte_t        m_cycleClkAcc;
+    fb_byte_t        m_maxRec;
+    unsigned short   m_nodeVendorId;
+    fb_byte_t        m_chipIdHi;
+    fb_quadlet_t     m_chipIdLow;
-
-    /* only used during parsing */

branches/libfreebob-downloader/src/libfreebobavc/ieee1394service.cpp

@@ -26 +26 @@
-
-#include <iostream>
-
-
+
+
-
-Ieee1394Service::Ieee1394Service()
-    : m_handle( 0 )
-    , m_port( -1 )
-
+
+
+
+
-}
-
-Ieee1394Service::~Ieee1394Service()
-{
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -46 +53 @@
-Ieee1394Service::initialize( int port )
-{
+    using namespace std;
+
-    m_handle = raw1394_new_handle_on_port( port );
-    if ( !m_handle ) {
@@ -57 +66 @@
-    }
-
+    m_resetHandle = raw1394_new_handle_on_port( port );
+    if ( !m_handle ) {
+        if ( !errno ) {
+            cerr << "libraw1394 not compatible" << endl;
+        } else {
+            perror( "Ieee1394Service::initialize: Could not get 1394 handle" );
+            cerr << "Is ieee1394 and raw1394 driver loaded?" << endl;
+        }
+        return false;
+    }
+
-    m_port = port;
+
+    raw1394_set_userdata( m_handle, this );
+    raw1394_set_userdata( m_resetHandle, this );
+    raw1394_set_bus_reset_handler( m_resetHandle,
+                                   this->resetHandlerLowLevel );
+    startRHThread();
+
-    return true;
-}
@@ -70 +97 @@
-Ieee1394Service::read( fb_nodeid_t nodeId,
-                       fb_nodeaddr_t addr,
-size
+length
-                       fb_quadlet_t* buffer )
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        fb_nodeaddr_t addr,
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -117 +215 @@
-    return true;
-}
+
+void
+Ieee1394Service::setVerbose( bool isVerbose )
+{
+    m_verbose = isVerbose;
+}
+
+void
+Ieee1394Service::printBuffer( size_t length, fb_quadlet_t* buffer ) const
+{
+    using namespace std;
+
+    for ( unsigned int i=0; i < length; ++i ) {
+        if ( ( i % 4 ) == 0 ) {
+            if ( i > 0 ) {
+                cout << endl;
+            }
+            cout << setfill( ' ' ) << setw( 4 ) << i*4 << ": ";
+        }
+        cout << setfill( '0' ) << setw( 8 ) << hex << buffer[i] << " ";
+    }
+    cout << endl;
+}
+
+int
+Ieee1394Service::resetHandlerLowLevel( raw1394handle_t handle,
+                                       unsigned int generation )
+{
+    raw1394_update_generation ( handle, generation );
+    Ieee1394Service* instance
+        = (Ieee1394Service*) raw1394_get_userdata( handle );
+    instance->resetHandler( generation );
+
+    return 0;
+}
+
+bool
+Ieee1394Service::resetHandler( unsigned int generation )
+{
+    m_generation = generation;
+
+    for ( reset_handler_vec_t::iterator it = m_busResetHandlers.begin();
+          it != m_busResetHandlers.end();
+          ++it )
+    {
+        Functor* func = *it;
+        ( *func )();
+    }
+
+    return true;
+}
+
+bool
+Ieee1394Service::startRHThread()
+{
+    if ( m_threadRunning ) {
+        return true;
+    }
+    pthread_mutex_lock( &m_mutex );
+    pthread_create( &m_thread, 0, rHThread, this );
+    pthread_mutex_unlock( &m_mutex );
+    m_threadRunning = true;
+
+    return true;
+}
+
+void
+Ieee1394Service::stopRHThread()
+{
+    if ( m_threadRunning ) {
+        pthread_mutex_lock (&m_mutex);
+        pthread_cancel (m_thread);
+        pthread_join (m_thread, 0);
+        pthread_mutex_unlock (&m_mutex);
+        m_threadRunning = false;
+    }
+}
+
+void*
+Ieee1394Service::rHThread( void* arg )
+{
+    Ieee1394Service* pIeee1394Service = (Ieee1394Service*) arg;
+
+    while (true) {
+        raw1394_loop_iterate (pIeee1394Service->m_resetHandle);
+        pthread_testcancel ();
+    }
+
+    return 0;
+}
+
+bool
+Ieee1394Service::addBusResetHandler( Functor* functor )
+{
+    m_busResetHandlers.push_back( functor );
+    return true;
+}
+
+bool
+Ieee1394Service::remBusResetHandler( Functor* functor )
+{
+    for ( reset_handler_vec_t::iterator it = m_busResetHandlers.begin();
+          it != m_busResetHandlers.end();
+          ++it )
+    {
+        if ( *it == functor ) {
+            m_busResetHandlers.erase( it );
+            return true;
+        }
+    }
+    return false;
+}

branches/libfreebob-downloader/src/libfreebobavc/ieee1394service.h

@@ -1 +1 @@
-/* Ieee1394Service.cpp
-
+,06
- *
- * This file is part of FreeBoB.
@@ -23 +23 @@
-
-#include "fbtypes.h"
+#include "threads.h"
-
-#include <libraw1394/raw1394.h>
+#include <pthread.h>
+
+#include <vector>
-
-class Ieee1394Service{
@@ -49 +53 @@
-   /**
-    * read - send async read request to a node and wait for response.
-
+ (\XXX needs 0xffc0 stuff)
-    * @addr: address to read from
-    * @length: amount of data to read in quadlets
@@ -56 +60 @@
-    * This does the complete transaction and will return when it's finished.
-    *
-e
+
-    */
-    bool read( fb_nodeid_t nodeId,
-               fb_nodeaddr_t addr,
-size
+length
-               fb_quadlet_t* buffer );
-
-
+
+
+
+
+
+
+
+
+
-    * write - send async write request to a node and wait for response.
-
+ (\XXX needs 0xffc0 stuff)
-    * @addr: address to write to
-    * @length: amount of data to write in quadlets
@@ -74 +86 @@
-    * Returns: true on success or false on failure (sets errno)
-    */
-  
+
-                fb_nodeaddr_t addr,
-       
-  *
+
+* 
-
+    bool write_quadlet( fb_nodeid_t nodeId,
+                        fb_nodeaddr_t addr,
+                        fb_quadlet_t data );
+
+    bool write_octlet(  fb_nodeid_t nodeId,
+                        fb_nodeaddr_t addr,
+                        fb_octlet_t data );
-
-    fb_quadlet_t* transactionBlock( fb_nodeid_t nodeId,
@@ -86 +105 @@
-
-    bool transactionBlockClose();
-
+
+
+
+
+
+
+
+
-private:
+
+    bool startRHThread();
+    void stopRHThread();
+    static void* rHThread( void* arg );
+
+    void printBuffer( size_t length, fb_quadlet_t* buffer ) const;
+
+    static int resetHandlerLowLevel( raw1394handle_t handle,
+                                     unsigned int generation );
+    bool resetHandler( unsigned int generation );
+
-    raw1394handle_t m_handle;
+    raw1394handle_t m_resetHandle;
-    int             m_port;
+    bool            m_verbose;
+    unsigned int    m_generation;
+
+    pthread_t       m_thread;
+    pthread_mutex_t m_mutex;
+    bool            m_threadRunning;
+
+    typedef std::vector< Functor* > reset_handler_vec_t;
+    reset_handler_vec_t m_busResetHandlers;
-};
-

branches/libfreebob-downloader/src/libfreebobavc/serialize.cpp

@@ -97 +97 @@
-    bool result = false;
-    if ( isCurPosValid() ) {
-m_curPos
+( ( quadlet_t* )m_curPos )
-        m_curPos += sizeof( quadlet_t );
-        result = true;

branches/libfreebob-downloader/src/Makefile.am

@@ -35 +35 @@
-        freebob.cpp                                     \
-        xmlparser.c                                     \
+        threads.h                                       \
-        bebob/bebob_avdevice.h                          \
-        bebob/bebob_avdevice.cpp                        \
@@ -45 +46 @@
-        bebob/bebob_functionblock.h                     \
-        bebob/bebob_functionblock.cpp                   \
+        bebob/bebob_dl_mgr.h                            \
+        bebob/bebob_dl_mgr.cpp                          \
+        bebob/bebob_dl_codes.h                          \
+        bebob/bebob_dl_codes.cpp                        \
+        bebob/bebob_dl_bcd.h                            \
+        bebob/bebob_dl_bcd.cpp                          \
-        bebob_light/bebob_light_avdevice.h              \
-        bebob_light/bebob_light_avdevice.cpp            \
@@ -101 +108 @@
-
-
+bin_PROGRAMS = freebob_downloader
+
+freebob_downloader_SOURCES =    \
+        freebob-downloader.cpp
+freebob_downloader_LDADD =      \
+        libfreebob.la           \
+        $(LIBRAW1394_LIBS)      \
+        $(LIBIEC61883_LIBS)     \
+        $(LIBAVC1394_LIBS)      \
+        -lpthread