Changeset 436 for branches/streaming-rework/src/libieee1394

Timestamp:

03/11/07 12:50:16 (14 years ago)

Author:

pieterpalmers

Message:

- fixed verbose level setting
- debugged DICE code, works with EVM

Files:

• branches/streaming-rework/src/libieee1394/ieee1394service.cpp (modified) (4 diffs)
• branches/streaming-rework/src/libieee1394/ieee1394service.h (modified) (3 diffs)

branches/streaming-rework/src/libieee1394/ieee1394service.cpp

@@ -214 +214 @@
-}
-
+fb_octlet_t
+Ieee1394Service::byteSwap_octlet(fb_octlet_t value) {
+    #if __BYTE_ORDER == __BIG_ENDIAN
+        return value;
+    #elif __BYTE_ORDER == __LITTLE_ENDIAN
+        fb_octlet_t value_new;
+        fb_quadlet_t *in_ptr=reinterpret_cast<fb_quadlet_t *>(&value);
+        fb_quadlet_t *out_ptr=reinterpret_cast<fb_quadlet_t *>(&value_new);
+        *(out_ptr+1)=htonl(*(in_ptr));
+        *(out_ptr)=htonl(*(in_ptr+1));
+        return value_new;
+    #else
+        #error Unknown endiannes
+    #endif
+}
+
-bool 
-Ieee1394Service::lockCompareSwap64(  fb_nodeid_t nodeId,
@@ -222 +238 @@
-{
-    #ifdef DEBUG
-Y_VERBOSE,"lockCompareSwap64: node 0x%X, addr = 0x%016
+BOSE,"lockCompareSwap64: node 0x%X, addr = 0x%016ll
-                nodeId, addr);
-Y_VER
+
-                compare_value, swap_value);
+    fb_octlet_t buffer;
+    if(!read_octlet( nodeId, addr,&buffer )) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Could not read owner register\n");
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Owner register before = 0x%016llX\n", buffer);
+    }
+    
+    buffer=0x123456789ABCDEF0LL;
+        debugOutput(DEBUG_LEVEL_VERBOSE,"before byteswap = 0x%016llX\n", buffer);
+    buffer=byteSwap_octlet(buffer);
+        debugOutput(DEBUG_LEVEL_VERBOSE,"after byteswap = 0x%016llX\n", buffer);
+    
+    
-    #endif
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -272 +317 @@
-{
-    avc1394_transaction_block_close( m_handle );
-    return true;
-}
-
-bool
-Ieee1394Service::setVerbose( int verboseLevel )
-{
-    setDebugLevel(verboseLevel);
-    return true;
-}
@@ -796 +834 @@
-    return ntohl(buffer);
-}
+
+void
+Ieee1394Service::setVerboseLevel(int l) 
+{
+    setDebugLevel(l);
+}

branches/streaming-rework/src/libieee1394/ieee1394service.h

@@ -124 +124 @@
-     * the content of \ref addr equals \ref compare_with
-     *
+     * @note takes care of endiannes
+     *
-     * @param nodeId target node ID
-     * @param addr address within target node address space
@@ -147 +149 @@
-    raw1394handle_t getHandle() {return m_handle;};
-
-    bool setVerbose( int verboseLevel );
-    int getVerboseLevel();
-
@@ -240 +241 @@
-    arm_handler_vec_t m_armHandlers;
-    
+    fb_octlet_t byteSwap_octlet(fb_octlet_t value);
+    
+public:
+    void setVerboseLevel(int l);
+private:
-    DECLARE_DEBUG_MODULE;
-};