Changeset 2068

Timestamp:

03/06/12 03:27:42 (9 years ago)

Author:

adi

Message:

DICE: add DICE firmware utility

Peter Hinkel has contributed a DICE firmware utility.

I'll add it as is, any modifications will come later.

Files:

• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (4 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (6 diffs)
• trunk/libffado/src/dice/dice_firmware_loader.cpp (added)
• trunk/libffado/src/dice/dice_firmware_loader.h (added)
• trunk/libffado/src/SConscript (modified) (1 diff)
• trunk/libffado/tests/dice-firmware-utility.cpp (added)
• trunk/libffado/tests/SConscript (modified) (1 diff)

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -1639 +1639 @@
-
-bool
+Device::readRegFL (fb_nodeaddr_t offset, fb_quadlet_t *result) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08"PRIX64"\n", offset);
+
+    if(offset >= DICE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016"PRIX64"\n", offset);
+        return false;
+    }
+
+    fb_nodeid_t nodeId = getNodeId() | 0xFFC0;
+
+    if(!get1394Service().read_quadlet(nodeId, offset, result)) {
+        debugError("Could not read from node 0x%04X addr 0x%12"PRIX64"\n", nodeId, offset);
+        return false;
+    }
+
+    *result = CondSwapFromBus32(*result);
+
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08"PRIX32"\n", *result);
+
+    return true;
+}
+
+bool
-Device::writeReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08"PRIX64", data: 0x%08"PRIX32"\n",
@@ -1653 +1676 @@
-    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) {
-        debugError("Could not write to node 0x%04X addr 0x%12"PRIX64"\n", nodeId, addr);
+        return false;
+    }
+    return true;
+}
+
+bool
+Device::writeRegFL(fb_nodeaddr_t offset, fb_quadlet_t data) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08"PRIX64", data: 0x%08"PRIX32"\n",
+        offset, data);
+
+    if(offset >= DICE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%012"PRIX64"\n", offset);
+        return false;
+    }
+
+    fb_nodeid_t nodeId = getNodeId() | 0xFFC0;
+
+    if(!get1394Service().write_quadlet( nodeId, offset, CondSwapToBus32(data) ) ) {
+        debugError("Could not write to node 0x%04X addr 0x%12"PRIX64"\n", nodeId, offset);
-        return false;
-    }
@@ -1703 +1745 @@
-
-bool
+Device::readRegBlockFL(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERBOSE,
+                "Reading base register offset 0x%08"PRIX64", length %zd, to %p\n",
+                offset, length, data);
+    const int blocksize_quads = 512/4;
+
+    if(offset >= DICE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%012"PRIX64"\n", offset);
+        return false;
+    }
+
+    fb_nodeid_t nodeId = getNodeId() | 0xFFC0;
+    int quads_done = 0;
+    int length_quads = (length+3)/4; // round to next full quadlet
+    while(quads_done < length_quads) {
+        fb_nodeaddr_t curr_addr = offset + quads_done*4;
+        fb_quadlet_t *curr_data = data + quads_done;
+        int quads_todo = length_quads - quads_done;
+        debugOutput(DEBUG_LEVEL_VERBOSE, "reading addr: 0x%012"PRIX64", %d quads to %p\n", curr_addr, quads_todo, curr_data);
+
+        if (quads_todo > blocksize_quads) {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "Truncating read from %d to %d quadlets\n", quads_todo, blocksize_quads);
+            quads_todo = blocksize_quads;
+        }
+        #ifdef DEBUG
+        if (quads_todo < 0) {
+            debugError("BUG: quads_todo < 0: %d\n", quads_todo);
+        }
+        #endif
+
+        if(!get1394Service().read( nodeId, curr_addr, quads_todo, curr_data ) ) {
+            debugError("Could not read %d quadlets from node 0x%04X addr 0x%012"PRIX64"\n", quads_todo, nodeId, curr_addr);
+            return false;
+        }
+        quads_done += quads_todo;
+    }
+
+    byteSwapFromBus(data, length/4);
+    return true;
+}
+
+bool
-Device::writeRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08"PRIX64", length: %zd\n",
@@ -1746 +1830 @@
-
-bool
+Device::writeRegBlockFL(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08"PRIX64", length: %zd\n",
+        offset, length);
+    const int blocksize_quads = 512/4;
+
+    if(offset >= DICE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%012"PRIX64"\n", offset);
+        return false;
+    }
+
+    fb_quadlet_t data_out[length/4];
+    memcpy(data_out, data, length);
+    byteSwapToBus(data_out, length/4);
+
+    fb_nodeid_t nodeId = getNodeId() | 0xFFC0;
+    int quads_done = 0;
+    int length_quads = (length+3)/4;
+    while(quads_done < length_quads) {
+        fb_nodeaddr_t curr_addr = offset + quads_done*4;
+        fb_quadlet_t *curr_data = data_out + quads_done;
+        int quads_todo = length_quads - quads_done;
+        if (quads_todo > blocksize_quads) {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "Truncating write from %d to %d quadlets\n", quads_todo, blocksize_quads);
+            quads_todo = blocksize_quads;
+        }
+        #ifdef DEBUG
+        if (quads_todo < 0) {
+            debugError("BUG: quads_todo < 0: %d\n", quads_todo);
+        }
+        #endif
+
+        if(!get1394Service().write( nodeId, curr_addr, quads_todo, curr_data ) ) {
+            debugError("Could not write %d quadlets to node 0x%04X addr 0x%012"PRIX64"\n", quads_todo, nodeId, curr_addr);
+            return false;
+        }
+        quads_done += quads_todo;
+    }
+
+    return true;
+}
+
+bool
-Device::readGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading global register offset 0x%04"PRIX64"\n", offset);

trunk/libffado/src/dice/dice_avdevice.h

@@ -24 +24 @@
-#ifndef DICEDEVICE_H
-#define DICEDEVICE_H
+
+#include "dice_firmware_loader.h"
-
-#include "ffadotypes.h"
@@ -78 +80 @@
-
-    virtual void showDevice();
+
+    virtual bool deleteImgFL(const char*, bool v = true);
+    virtual bool flashDiceFL(const char*, const char* image = "dice");
+    virtual bool dumpFirmwareFL(const char*);
+    virtual bool showDiceInfoFL();
+    virtual bool showImgInfoFL();
+    virtual bool testDiceFL(int);
+    virtual DICE_FL_INFO_PARAM* showFlashInfoFL(bool v = true);
+    virtual bool showAppInfoFL();
-
-    virtual bool setSamplingFrequency( int samplingFrequency );
@@ -174 +185 @@
-    bool prepareSP (unsigned int, const Streaming::Port::E_Direction direction_requested);
-    void setRXTXfuncs (const Streaming::Port::E_Direction direction);
+
-    // quadlet read/write routines
-    bool readReg(fb_nodeaddr_t, fb_quadlet_t *);
@@ -179 +191 @@
-    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+
+    // quadlet read/write firmware loader routines
+    bool readRegFL(fb_nodeaddr_t, fb_quadlet_t *);
+    bool writeRegFL(fb_nodeaddr_t, fb_quadlet_t);
+    bool readRegBlockFL(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    bool writeRegBlockFL(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-
-    bool readGlobalReg(fb_nodeaddr_t, fb_quadlet_t *);
@@ -230 +248 @@
-    #define DICE_NOTIFIER_BASE_ADDRESS 0x0000FFFFE0000000ULL
-    #define DICE_NOTIFIER_BLOCK_LENGTH 4
+
-    class Notifier : public Ieee1394Service::ARMHandler
-    {
@@ -248 +267 @@
-
-}
-
+
-#endif

trunk/libffado/src/SConscript

@@ -161 +161 @@
-dice_source = env.Split( '\
-        dice/dice_avdevice.cpp \
+        dice/dice_firmware_loader.cpp \
-        dice/dice_eap.cpp \
-        dice/focusrite/focusrite_eap.cpp \

trunk/libffado/tests/SConscript

@@ -76 +76 @@
-if env['ENABLE_DICE']:
-        apps.update( { "test-dice-eap" : "test-dice-eap.cpp" } )
+        apps.update( { "dice-firmware-utility" : "dice-firmware-utility.cpp" } )
-
-for app in apps.keys():