Changeset 1139

Timestamp:

05/08/08 08:11:35 (15 years ago)

Author:

holin

Message:

at least on T.C. Konnekts, strings seem to be stored as little endian quads

Files:

• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (9 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (4 diffs)

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -1258 +1258 @@
-    char namestring[DICE_TX_NAMES_SIZE+1];
-
-
+Swapped
-                        (fb_quadlet_t *)namestring, DICE_TX_NAMES_SIZE)) {
-        debugError("Could not read TX name string \n");
@@ -1273 +1273 @@
-    char namestring[DICE_RX_NAMES_SIZE+1];
-
-
+Swapped
-                        (fb_quadlet_t *)namestring, DICE_RX_NAMES_SIZE)) {
-        debugError("Could not read RX name string \n");
@@ -1288 +1288 @@
-    char namestring[DICE_CLOCKSOURCENAMES_SIZE+1];
-
-
-  
+Swapped
+
-        debugError("Could not read CLOCKSOURCE name string \n");
-        return names;
@@ -1302 +1302 @@
-    char namestring[DICE_NICK_NAME_SIZE+1];
-
-
+Swapped
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not read nickname string \n");
@@ -1317 +1317 @@
-    strncpy(namestring, name.c_str(), DICE_NICK_NAME_SIZE);
-
-
+Swapped
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not write nickname string \n");
@@ -1543 +1543 @@
-
-bool
+DiceAvDevice::readRegBlockSwapped(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08llX, length %u\n",
+        offset, length);
+
+    if(offset >= DICE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016llX\n", offset);
+        return false;
+    }
+
+    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
+    fb_nodeid_t nodeId=getNodeId() | 0xFFC0;
+
+    if(!get1394Service().read( nodeId, addr, length/4, data ) ) {
+        debugError("Could not read from node 0x%04X addr 0x%012llX\n", nodeId, addr);
+        return false;
+    }
+
+    for(unsigned int i=0;i<length/4;i++) {
+        *(data+i)=ByteSwap32(*(data+i));
+    }
+
+    return true;
+}
+
+bool
+DiceAvDevice::writeRegBlockSwapped(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08llX, length: %u\n",
+        offset, length);
+
+    if(offset >= DICE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016llX\n", offset);
+        return false;
+    }
+
+    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
+    fb_nodeid_t nodeId=getNodeId() | 0xFFC0;
+
+    fb_quadlet_t data_out[length/4];
+
+    for(unsigned int i=0;i<length/4;i++) {
+        data_out[i]=ByteSwap32(*(data+i));
+    }
+
+    if(!get1394Service().write( nodeId, addr, length/4, data_out ) ) {
+        debugError("Could not write to node 0x%04X addr 0x%012llX\n", nodeId, addr);
+        return false;
+    }
+
+    return true;
+}
+
+bool
-DiceAvDevice::readGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading global register offset 0x%04llX\n", offset);
@@ -1575 +1627 @@
-    fb_nodeaddr_t offset_gl=globalOffsetGen(offset, length);
-    return writeRegBlock(m_global_reg_offset + offset_gl, data, length);
+}
+
+bool
+DiceAvDevice::readGlobalRegBlockSwapped(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading global register block offset 0x%04llX, length %u bytes\n",
+        offset, length);
+
+    fb_nodeaddr_t offset_gl=globalOffsetGen(offset, length);
+    return readRegBlockSwapped(m_global_reg_offset + offset_gl, data, length);
+}
+
+bool
+DiceAvDevice::writeGlobalRegBlockSwapped(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing global register block offset 0x%04llX, length %u bytes\n",
+        offset, length);
+
+    fb_nodeaddr_t offset_gl=globalOffsetGen(offset, length);
+    return writeRegBlockSwapped(m_global_reg_offset + offset_gl, data, length);
-}
-
@@ -1628 +1698 @@
-    fb_nodeaddr_t offset_tx=txOffsetGen(i, offset, length);
-    return writeRegBlock(m_tx_reg_offset + offset_tx, data, length);
+}
+
+bool
+DiceAvDevice::readTxRegBlockSwapped(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading rx register block offset 0x%04llX, length %u bytes\n",
+        offset, length);
+
+    fb_nodeaddr_t offset_tx=txOffsetGen(i, offset, length);
+    return readRegBlockSwapped(m_tx_reg_offset + offset_tx, data, length);
-}
-
@@ -1697 +1776 @@
-}
-
+bool
+DiceAvDevice::readRxRegBlockSwapped(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading rx register block offset 0x%04llX, length %u bytes\n",
+        offset, length);
+
+    fb_nodeaddr_t offset_rx=rxOffsetGen(i, offset, length);
+    return readRegBlockSwapped(m_rx_reg_offset + offset_rx, data, length);
+}
+
-fb_nodeaddr_t
-DiceAvDevice::rxOffsetGen(unsigned int i, fb_nodeaddr_t offset, size_t length) {

trunk/libffado/src/dice/dice_avdevice.h

@@ -149 +149 @@
-    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    bool readRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    bool writeRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-
-    bool readGlobalReg(fb_nodeaddr_t, fb_quadlet_t *);
@@ -154 +156 @@
-    bool readGlobalRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeGlobalRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    bool readGlobalRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    bool writeGlobalRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    fb_nodeaddr_t globalOffsetGen(fb_nodeaddr_t, size_t);
-
@@ -160 +164 @@
-    bool readTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    bool writeTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
+    bool readTxRegBlockSwapped(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    fb_nodeaddr_t txOffsetGen(unsigned int, fb_nodeaddr_t, size_t);
-
@@ -166 +171 @@
-    bool readRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    bool writeRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
+    bool readRxRegBlockSwapped(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    fb_nodeaddr_t rxOffsetGen(unsigned int, fb_nodeaddr_t, size_t);
-