Changeset 4882

Timestamp:

01/05/09 08:12:13 (4 years ago)

Author:

werner

Message:

Found an old uncommitted change.

• lib/decode.py (d_sdio_cmd): only display the CRC if there's a problem with it
• lib/decode.py (d_usb_dp): separate stream decoder for batch processing
• lib/decode.py (usb_sof): invoke crc5 with correct arguments

File:

• developers/werner/ahrt/host/tmc/lib/decode.py (modified) (4 diffs)

developers/werner/ahrt/host/tmc/lib/decode.py

@@ -215 +215 @@
             return s
     else:
-        s += "CRC%02X" % crc
         check = d_crc7_msb(payload)
-        if check is None:
-            s += "?"
-        elif check != crc:
-            s += "/%02X" % check
+        if check is None or check == crc:
+            s += "CRC%02X" % crc
+            if check is None:
+                s += "?"
+            elif check != crc:
+                s += "/%02X" % check
     del bits[0:7]
 
@@ -384 +385 @@
     s = "%03X" % frame
 
-    expect = g_crc.crc5(frame, 11) ^ 0x1f
+    expect = g_crc.crc5(0x1f, frame, 11) ^ 0x1f
 
     crc = usb_field(raw, 5)
@@ -523 +524 @@
 
 
-def d_usb_dp(bits):
-    if d_usb_dm not in d_table:
-        return d_usb(bits)
-
-    dp = bits
-    dm = d_table[d_usb_dm]
+def d_usb_stream(dp, dm):
     s = ""
 
@@ -555 +551 @@
 
 
+def d_usb_dp(bits):
+    if d_usb_dm in d_table:
+        return d_usb_stream(bits, d_table[d_usb_dm])
+    else:
+        return d_usb(bits)
+
 def d_usb_dm(bits):
     if d_usb_dp in d_table: