- # IDCODE is a read-only register which is always accessible.
- # IR == IDCODE: The device ID code is shifted out via DR next.
-
- s = self.samplenums
- s.reverse()
- id_hex, ver, part, manuf, res = decode_device_id_code(bits[:-1])
- self.putf(0, 0, [1, ['Reserved (BS TAP)', 'BS', 'B']])
- self.putf(1, 1, [1, ['Reserved', 'Res', 'R']])
- self.putf(2, 12, [1, ['Manufacturer: %s' % manuf, 'Manuf', 'M']])
- self.putf(13, 28, [1, ['Part: %s' % part, 'Part', 'P']])
- self.putf(29, 32, [1, ['Version: %s' % ver, 'Version', 'V']])
-
- self.ss = s[1][0]
- self.putx([2, ['IDCODE: %s (ver=%s, part=%s, manuf=%s, res=%s)' % \
- decode_device_id_code(bits[:-1])]])
+ bits = bits[1:]
+
+ id_hex, manuf, ver, part = decode_device_id_code(bits)
+ cc = '0x%x' % int('0b' + bits[-12:-8], 2)
+ ic = '0x%x' % int('0b' + bits[-7:-1], 2)
+
+ self.putf(0, 0, [1, ['Reserved', 'Res', 'R']])
+ self.putf(8, 11, [0, ['Continuation code: %s' % cc, 'CC', 'C']])
+ self.putf(1, 7, [0, ['Identity code: %s' % ic, 'IC', 'I']])
+ self.putf(1, 11, [1, ['Manufacturer: %s' % manuf, 'Manuf', 'M']])
+ self.putf(12, 27, [1, ['Part: %s' % part, 'Part', 'P']])
+ self.putf(28, 31, [1, ['Version: %s' % ver, 'Version', 'V']])
+ self.putf(32, 32, [1, ['BYPASS (BS TAP)', 'BS', 'B']])
+
+ self.putx([2, ['IDCODE: %s (%s: %s/%s)' % \
+ decode_device_id_code(bits)]])