## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
##
import sigrokdecode as srd
- 'ADDR', <addr>
- 'EP', <ep>
- 'CRC5', <crc5>
+ - 'CRC5 ERROR', <crc5>
- 'CRC16', <crc16>
+ - 'CRC16 ERROR', <crc16>
- 'EOP', <eop>
- 'FRAMENUM', <framenum>
- 'DATABYTE', <databyte>
# Special
'00111100': ['PRE', 'Host-issued preamble; enables downstream bus traffic to low-speed devices'],
- '00111100': ['ERR', 'Split transaction error handshake'],
+ #'00111100': ['ERR', 'Split transaction error handshake'],
'00011110': ['SPLIT', 'HS split transaction token'],
'00101101': ['PING', 'HS flow control probe for a bulk/control EP'],
'00001111': ['Reserved', 'Reserved PID'],
def reverse_number(num, count):
out = list(count * '0')
for i in range(0, count):
- if (num >> i & 1):
- out[i] = '1';
+ if num >> i & 1:
+ out[i] = '1'
return int(''.join(out), 2)
def calc_crc5(bitstr):
crc5 = 0x1f
for bit in bitstr:
crc5 <<= 1
- if (int(bit) != (crc5 >> 5)):
+ if int(bit) != (crc5 >> 5):
crc5 ^= poly5
crc5 &= 0x1f
crc5 ^= 0x1f
crc16 = 0xffff
for bit in bitstr:
crc16 <<= 1
- if (int(bit) != (crc16 >> 16)):
+ if int(bit) != (crc16 >> 16):
crc16 ^= poly16
crc16 &= 0xffff
crc16 ^= 0xffff
return reverse_number(crc16, 16)
class Decoder(srd.Decoder):
- api_version = 2
+ api_version = 3
id = 'usb_packet'
name = 'USB packet'
longname = 'Universal Serial Bus (LS/FS) packet'
license = 'gplv2+'
inputs = ['usb_signalling']
outputs = ['usb_packet']
+ tags = ['PC']
options = (
{'id': 'signalling', 'desc': 'Signalling',
'default': 'full-speed', 'values': ('full-speed', 'low-speed')},
)
def __init__(self):
+ self.reset()
+
+ def reset(self):
self.bits = []
self.packet = []
self.packet_summary = ''
self.packet.append(pid)
self.packet_summary += pidname
- if pidname in ('OUT', 'IN', 'SOF', 'SETUP', 'PRE', 'PING'):
+ if pidname in ('OUT', 'IN', 'SOF', 'SETUP', 'PING'):
if len(packet) < 32:
self.putp([28, ['Invalid packet (shorter than 32 bits)']])
return
crc5 = bitstr_to_num(packet[27:31 + 1])
crc5_calc = calc_crc5(packet[16:27])
self.ss, self.es = self.bits[27][1], self.bits[31][2]
- if (crc5 == crc5_calc):
+ if crc5 == crc5_calc:
self.putpb(['CRC5', crc5])
self.putb([6, ['CRC5: 0x%02X' % crc5, 'CRC5', 'C']])
else:
crc16 = bitstr_to_num(packet[-16:])
crc16_calc = calc_crc16(packet[16:-16])
self.ss, self.es = self.bits[-16][1], self.bits[-1][2]
- if (crc16 == crc16_calc):
+ if crc16 == crc16_calc:
self.putpb(['CRC16', crc16])
self.putb([9, ['CRC16: 0x%04X' % crc16, 'CRC16', 'C']])
else:
self.packet.append(crc16)
elif pidname in ('ACK', 'NAK', 'STALL', 'NYET', 'ERR'):
pass # Nothing to do, these only have SYNC+PID+EOP fields.
+ elif pidname in ('PRE'):
+ pass # Nothing to do, PRE only has SYNC+PID fields.
else:
pass # TODO: Handle 'SPLIT' and possibly 'Reserved' packets.
(ptype, pdata) = data
# We only care about certain packet types for now.
- if ptype not in ('SOP', 'BIT', 'EOP'):
+ if ptype not in ('SOP', 'BIT', 'EOP', 'ERR'):
return
# State machine.
elif self.state == 'GET BIT':
if ptype == 'BIT':
self.bits.append([pdata, ss, es])
- elif ptype == 'EOP':
+ elif ptype == 'EOP' or ptype == 'ERR':
self.es_packet = es
self.handle_packet()
self.packet, self.packet_summary = [], ''