Changeset 4649

Timestamp:

09/16/08 05:02:47 (5 years ago)

Author:

werner

Message:

Highlights:

• added CRC7 checking and SDIO R5 SPI response decoding
• more decoding bugs fixed

Details:

• lib/crc.py (crc): CRC7 and CRC16 calculation
• lib/decode.py (d_sdio_cmd, d_crc7_msb): verify CRC7 in SDIO commands
• lib/decode.py (d_sdio_r5_spi): decoder for SDIO R5 response in SPI mode
• lib/decode.py (d_sdio_cmd): flag undefined start and stop bits
• lib/decode.py (decode_address): CIS pointer length is three bytes, not just one
• lib/decode.py (decode_address): added decoding of Function Basic Registers one
• lib/decode.py (d_sdio_cmd): unknown arguments were incorrectly treated as invalid
• demo/dxplore.py: digitizing the analog wave is a waste of time

Location:

developers/werner/ahrt/host/tmc

Files:

• demo/dxplore.py (modified) (3 diffs)
• lib/crc.py (added)
• lib/decode.py (modified) (9 diffs)
• setup.py (modified) (1 diff)

developers/werner/ahrt/host/tmc/demo/dxplore.py

@@ -28 +28 @@
 
 dig = []
-for wv in w:
+for wv in w[1:]:
     dig.append(wv.digitize(0.5))
 
-min = dig[1].sample_step()
-for d in dig[2:]:
+min = dig[0].sample_step()
+for d in dig[1:]:
     step = d.sample_step()
     if step is not None and step < min:
@@ -38 +38 @@
 
 da = []
-for d in dig[1:]:
+for d in dig:
     a = d.sample(min)
 #    print len(a)
@@ -45 +45 @@
 
 da.reverse()
-dxplore(da, dig[1].start(), min, argv[1])
+dxplore(da, dig[0].start(), min, argv[1])

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

@@ -1 @@
-#!/usr/bin/python
+#
+# decode.py - Data stream decoders
+#
+# Copyright (C) 2008 by OpenMoko, Inc.
+# Written by Werner Almesberger <werner@openmoko.org>
+# All Rights Reserved
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+
+
+import tmc.crc
+
+
+# One CRC instance can be shared by all decoders
+
+g_crc = tmc.crc.crc()
 
 
@@ -53 +72 @@
 
 def decode_address(addr):
+
+    # CCCR
     if addr < 0x14:
         return (
             "Rev", "SDR", "IOE", "IOR",
             "IEN", "INT", "Abr", "Bus",
-            "Cap", "CIS", "Sus", "Sel",
-            "EXF", "RDY", "BSZ", "BSZ",
-            "PWR", "HSp")[addr]
+            "Cap", "CIS", "CIS", "CIS",
+            "Sus", "Sel", "EXF", "RDY",
+            "BSZ", "BSZ", "PWR", "HSp")[addr]
+
+    # FBR
+    if addr >= 0x100 and addr < 0x800 and (addr & 0xff) < 0x112:
+        return ("F%d" % (addr >> 8))+(
+            "FIC", "EFC", "Pwr", "RFU",
+            "RFU", "RFU", "RFU", "RFU",
+            "RFU", "CIS", "CIS", "CIS",
+            "CSA", "CSA", "CSA", "DCA",
+            "BSZ", "BSZ")[addr & 0xff]
+          
     return None
 
@@ -96 +127 @@
 
 
+def d_crc7_msb(payload):
+    crc = 0
+    while len(payload):
+        v = 0
+        for b in range(0, 8):
+            if payload[0] == "X":
+                return None
+            v = (v << 1) | payload.pop(0)
+        crc = g_crc.crc7(crc, [v])
+    return crc
+
+
 def d_sdio_cmd(bits, stop = False):
     if bits[0]:
@@ -105 +148 @@
         del bits[0]
 
+    # We access the payload as soon as the CRC has been read, but possibly
+    # before we also have the stop bit.
+
+    if len(bits) >= 47:
+        payload = bits[0:40]
+
     if len(bits) == 0:
         return s
@@ -112 +161 @@
     if len(bits) == 0:
         return s
-    if bits[0]:
+    if bits[0] and bits[0] != "X":
         s += ">"
     else:
@@ -139 +188 @@
     arg = d_msb(bits[0:32])
     if cmd is None or arg is None:
-        arg = None
-    else:
-        arg = decode_arg(cmd, arg)
-    if arg is None:
-        s += "("+d_byte_msb(bits)+")"
-        if stop:
-            return s
-    else:
-        s += "("+arg+")"
+        arg_pretty = None
+    else:
+        arg_pretty = decode_arg(cmd, arg)
+    if arg_pretty is None:
+        s += "("+d_byte_msb(bits[0:32])+")"
+        if stop and arg is None:
+            return s
+    else:
+        s += "("+arg_pretty+")"
     del bits[0:32]
 
@@ -160 +209 @@
             return s
     else:
-        s += "CRC%02x" % crc
+        s += "CRC%02X" % crc
+        check = d_crc7_msb(payload)
+        if check is None:
+            s += "?"
+        elif check != crc:
+            s += "/%02X" % check
     del bits[0:7]
 
     if len(bits) == 0:
         return s
-    s += ("?", "]")[bits[0]]
+    if bits[0] and bits[0] != "X":
+        s += "]"
+    else:
+        s += "?"
     del bits[0]
 
@@ -183 +240 @@
 def d_sdio_resp_sd(bits):
     return "SDIO"
+
+
+def d_sdio_r5_spi(bits, stop = False):
+    if bits[0]:
+        s = "~"
+    else:
+        s = ""
+
+    while len(bits) and bits[0]:
+        del bits[0]
+
+    if len(bits) == 0:
+        return s
+    s += "["
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "Prm"
+    else:
+        s += "-"
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "???"
+        if stop:
+            return s
+    else:
+        s += "-"
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "Fn#"
+    else:
+        s += "-"
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "Crc"
+    else:
+        s += "-"
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "Cmd"
+    else:
+        s += "-"
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "???"
+        if stop:
+            return s
+    else:
+        s += "-"
+    del bits[0]
+
+    if len(bits) == 0:
+        return s
+    if bits[0]:
+        s += "Idl"
+    else:
+        s += "-"
+    del bits[0]
+
+    s += d_byte_msb(bits[0:8])
+    if len(bits) >= 8:
+        s += "]"
+    if len(bits) > 8 and not stop:
+        s += "|"+d_bits(bits[8:])
+
+    return s
 
 
@@ -192 +332 @@
     ( "SDIO RESP (SD)",         d_sdio_resp_sd ),
     ( "SDIO RESP (SPI)",        d_sdio_resp_spi ),
+    ( "SDIO R5 (SPI)",          d_sdio_r5_spi ),
 ]

developers/werner/ahrt/host/tmc/setup.py

@@ -6 +6 @@
     py_modules = [ "tmc.instrument",
         "tmc.wave", "tmc.trigger", "tmc.shape",
-        "tmc.decode", "tmc.dxplore",
+        "tmc.crc", "tmc.decode", "tmc.dxplore",
         "tmc.meter", "tmc.scope", "tmc.power", "tmc.function" ],
     package_dir = { "tmc": "lib" },