Replace the hardcoded value with the last cmd used. I'd think the whole
ACMD handling could be simplified if we make further use of this new
variable. But for now, let's keep it simple and make it work.
Signed-off-by: Wolfram Sang <redacted>
self.token = []
self.is_acmd = False # Indicates CMD vs. ACMD
self.cmd = None
self.token = []
self.is_acmd = False # Indicates CMD vs. ACMD
self.cmd = None
self.arg = None
def start(self):
self.arg = None
def start(self):
self.out_ann, data)
def putc(self, cmd, desc):
self.out_ann, data)
def putc(self, cmd, desc):
self.putt([cmd, ['%s: %s' % (self.cmd_str, desc), self.cmd_str,
self.cmd_str.split(' ')[0]]])
self.putt([cmd, ['%s: %s' % (self.cmd_str, desc), self.cmd_str,
self.cmd_str.split(' ')[0]]])
- def putr(self, cmd, desc):
- self.putt([cmd, ['Reply: %s' % desc]])
+ def putr(self, desc):
+ self.putt([self.last_cmd, ['Reply: %s' % desc]])
def reset(self):
self.cmd, self.arg = None, None
def reset(self):
self.cmd, self.arg = None, None
if not self.get_token_bits(cmd, 48):
return
self.handle_common_token_fields()
if not self.get_token_bits(cmd, 48):
return
self.handle_common_token_fields()
self.puta(0, 31, [136, ['Card status', 'Status', 'S']])
for i in range(32):
self.putbit(8 + i, [card_status[31 - i]])
self.puta(0, 31, [136, ['Card status', 'Status', 'S']])
for i in range(32):
self.putbit(8 + i, [card_status[31 - i]])
return
self.handle_common_token_fields()
self.puta(0, 31, [136, ['Card status', 'Status', 'S']])
return
self.handle_common_token_fields()
self.puta(0, 31, [136, ['Card status', 'Status', 'S']])
self.token, self.state = [], 'GET COMMAND TOKEN'
def handle_response_r2(self, cmd):
self.token, self.state = [], 'GET COMMAND TOKEN'
def handle_response_r2(self, cmd):
# - Bits[00:00]: End bit (always 1)
if not self.get_token_bits(cmd, 48):
return
# - Bits[00:00]: End bit (always 1)
if not self.get_token_bits(cmd, 48):
return
# Annotations for each individual bit.
for bit in range(len(self.token)):
self.putf(bit, bit, [128, ['%d' % self.token[bit][2]]])
# Annotations for each individual bit.
for bit in range(len(self.token)):
self.putf(bit, bit, [128, ['%d' % self.token[bit][2]]])
self.handle_common_token_fields()
self.puta(0, 15, [136, ['Card status bits', 'Status', 'S']])
self.puta(16, 31, [136, ['Relative card address', 'RCA', 'R']])
self.handle_common_token_fields()
self.puta(0, 15, [136, ['Card status bits', 'Status', 'S']])
self.puta(16, 31, [136, ['Relative card address', 'RCA', 'R']])
self.token, self.state = [], 'GET COMMAND TOKEN'
def handle_response_r7(self, cmd):
self.token, self.state = [], 'GET COMMAND TOKEN'
def handle_response_r7(self, cmd):
return
self.handle_common_token_fields()
return
self.handle_common_token_fields()
# Arg[31:12]: Reserved bits (all-zero)
self.puta(12, 31, [136, ['Reserved', 'Res', 'R']])
# Arg[31:12]: Reserved bits (all-zero)
self.puta(12, 31, [136, ['Reserved', 'Res', 'R']])