Changeset 689

Timestamp:

11/03/07 08:12:39 (15 years ago)

Author:

ppalmers

Message:

more echo firmware work

Files:

• trunk/libffado/src/fireworks/fireworks_device.cpp (modified) (1 diff)
• trunk/libffado/src/fireworks/fireworks_firmware.cpp (modified) (7 diffs)
• trunk/libffado/src/fireworks/fireworks_firmware.h (modified) (5 diffs)
• trunk/libffado/support/firmware/fireworks-downloader.cpp (added)
• trunk/libffado/support/firmware/SConscript (modified) (1 diff)

trunk/libffado/src/fireworks/fireworks_device.cpp

@@ -63 +63 @@
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "This is a FireWorks::Device\n");
+    if ( !m_efc_discovery_done) {
+        if (!discoverUsingEFC()) {
+            debugError("EFC discovery failed\n");
+        }
+    }
+    m_HwInfo.showEfcCmd();
+    
-    GenericAVC::AvDevice::showDevice();
-}

trunk/libffado/src/fireworks/fireworks_firmware.cpp

@@ -30 +30 @@
-#include <string>
-#include <sstream>
+#include <iostream>
+#include <fstream>
-
-using namespace std;
+
+template <class T>
+bool from_string(T& t, 
+                 const std::string& s, 
+                 std::ios_base& (*f)(std::ios_base&))
+{
+  std::istringstream iss(s);
+  return !(iss >> f >> t).fail();
+}
-
-// These classes provide support for reading/writing the firmware on
-// echo fireworks based devices
-namespace FireWorks {
+
-IMPL_DEBUG_MODULE( Firmware, Firmware, DEBUG_LEVEL_NORMAL );
-IMPL_DEBUG_MODULE( FirmwareUtil, FirmwareUtil, DEBUG_LEVEL_NORMAL );
@@ -42 +54 @@
-
-// some generic string generation functions
-
+Firmware::
-    switch (type) {
-        case eDT_DspCode:
@@ -59 +71 @@
-}
-
+const enum Firmware::eDatType Firmware::intToeDatType(int type) {
+    switch (type) {
+        case (int)eDT_DspCode: return eDT_DspCode;
+        case (int)eDT_IceLynxCode: return eDT_IceLynxCode;
+        case (int)eDT_Data: return eDT_Data;
+        case (int)eDT_FPGACode: return eDT_FPGACode;
+        case (int)eDT_DeviceName: return eDT_DeviceName;
+        default:
+            return eDT_Invalid;
+    }
+}
+
-Firmware::Firmware()
+: m_Type ( eDT_Invalid )
+, m_flash_offset_address ( 0 )
+, m_length_quads ( 0 )
+, m_CRC32 ( 0 )
+, m_checksum ( 0 )
+, m_version ( 0 )
+, m_append_crc ( false )
+, m_footprint_quads ( 0 )
+, m_data( NULL )
-{
-}
@@ -65 +98 @@
-Firmware::~Firmware()
-{
+    if (m_data) delete[] m_data;
-}
-
@@ -72 +106 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "Firmware from %s\n", m_filename.c_str());
-    debugOutput(DEBUG_LEVEL_NORMAL, " Type                 : %s\n", eDatTypeToString(m_Type));
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Append CRC           : %s\n", (m_append_crc?"Yes":"No"));
-
-
+
-}
-
@@ -86 +125 @@
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Loading firmware from file %s\n", filename.c_str());
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    m_filename =  filename;
-    return false;
@@ -93 +241 @@
-
-// the firmware loader helper class
-, FireWorks::Firmware& f
+
-: m_Parent(p)
-, m_Firmware(f)
-{
-}

trunk/libffado/src/fireworks/fireworks_firmware.h

@@ -38 +38 @@
-namespace FireWorks {
-
-_VALUES              {1651,1,0,0,0}
-NB_MAGIC_VALUES           5
+                     "1651 1 0 0 0"
+MAGIC_LENGTH_BYTES        14
-
-
-
+
+
+
+
+
-
-BYTES     (384*1024 + ECHO_FIRMWARE_HEADER_LENGTH_BYTES
-QUADLETS  (ECHO_FIRMWARE_HEADER_LENGTH_BYTES / 4
+QUADLETS  ((384 * 1024) / 4
+BYTES     (ECHO_FIRMWARE_FILE_MAX_LENGTH_QUADLETS * 12 + ECHO_FIRMWARE_HEADER_LENGTH_BYTES
-
-class Firmware
@@ -59 +62 @@
-    };
-    static const char *eDatTypeToString(const enum eDatType target);
-
+
-public:
-    Firmware();
@@ -67 +70 @@
-
-    virtual void show();
+    virtual void setVerboseLevel(int l)
+        {setDebugLevel(l);};
-
-protected:
@@ -82 +87 @@
-    uint32_t            m_footprint_quads;
-
+    std::string         m_magic;
+    uint32_t            m_header[ECHO_FIRMWARE_HEADER_LENGTH_QUADLETS];
+    uint32_t            *m_data;
+
-private:
-    DECLARE_DEBUG_MODULE;
@@ -90 +99 @@
-
-public:
-
-
+
-    virtual ~FirmwareUtil();
-
-    virtual void show();
+    virtual void setVerboseLevel(int l)
+        {setDebugLevel(l);};
-
-protected:
-    FireWorks::Device&          m_Parent;
-    FireWorks::Firmware&        m_Firmware;
-private:
-    DECLARE_DEBUG_MODULE;

trunk/libffado/support/firmware/SConscript

@@ -30 +30 @@
-    installapps += [ "bridgeco-downloader" ]
-
+if env['ENABLE_FIREWORKS']:
+    apps["fireworks-downloader"] = "fireworks-downloader.cpp"
+    installapps += [ "fireworks-downloader" ]
-
-for app in apps.keys():