r4882 - developers/werner/ahrt/host/tmc/lib

[werner at docs.openmoko.org]

Author: werner
Date: 2009-01-05 08:12:13 +0100 (Mon, 05 Jan 2009)
New Revision: 4882

Modified:
   developers/werner/ahrt/host/tmc/lib/decode.py
Log:
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



Modified: developers/werner/ahrt/host/tmc/lib/decode.py
===================================================================
--- developers/werner/ahrt/host/tmc/lib/decode.py	2008-12-31 13:44:25 UTC (rev 4881)
+++ developers/werner/ahrt/host/tmc/lib/decode.py	2009-01-05 07:12:13 UTC (rev 4882)
@@ -214,12 +214,13 @@
 	if stop:
 	    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]
 
     if len(bits) == 0:
@@ -383,7 +384,7 @@
 	return ""
     s = "%03X" % frame
 
-    expect = g_crc.crc5(frame, 11) ^ 0x1f
+    expect = g_crc.crc5(0x1f, frame, 11) ^ 0x1f
 
     crc = usb_field(raw, 5)
     if crc is None:
@@ -522,12 +523,7 @@
     return s
 
 
-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 = ""
 
     packet = []
@@ -554,6 +550,12 @@
     return s
 
 
+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:
 	return ""