X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fsdcard_sd%2Fpd.py;h=32a25aea185c22933bb1f2271b0a29de5d9f6068;hb=1e9dfe605f11ce2535a740e20555bbc439c0fc1a;hp=d0e72d278257d7bd2d5ac6c74a3f018c6db57cdd;hpb=a32575cd7fc63447f4ba8bdb27e8e73ba5ae3cc0;p=libsigrokdecode.git

diff --git a/decoders/sdcard_sd/pd.py b/decoders/sdcard_sd/pd.py
index d0e72d2..32a25ae 100644
--- a/decoders/sdcard_sd/pd.py
+++ b/decoders/sdcard_sd/pd.py
@@ -181,7 +181,7 @@ class Decoder(srd.Decoder):
         # Handle command.
         s = 'ACMD' if self.is_acmd else 'CMD'
         self.cmd_str = '%s%d (%s)' % (s, self.cmd, self.cmd_name(self.cmd))
-        if self.cmd in (0, 2, 3, 6, 7, 8, 9, 10, 13, 41, 51, 55):
+        if hasattr(self, 'handle_%s%d' % (s.lower(), self.cmd)):
             self.state = St['HANDLE_CMD%d' % self.cmd]
         else:
             self.state = St.HANDLE_CMD999
@@ -346,7 +346,7 @@ class Decoder(srd.Decoder):
         self.putf(8, 134, [Ann.F_ARG, ['Argument', 'Arg', 'A']])
         self.putf(135, 135, [Ann.F_END, ['End bit', 'End', 'E']])
         self.putf(8, 134, [Ann.DECODED_F, ['CID/CSD register', 'CID/CSD', 'C']])
-        self.putf(0, 135, [55, ['R2']])
+        self.putf(0, 135, [Ann.R2, ['R2']])
         self.token, self.state = [], St.GET_COMMAND_TOKEN
 
     def handle_response_r3(self, cmd):