)
def __init__(self):
- self.samplerate = 8e6 # None
- self.secs_per_sample = float(1) / float(self.samplerate)
+ self.samplerate = None
self.request = {}
self.request_id = 0
self.transaction_state = 'IDLE'
self.put(ss, es, self.out_ann, data)
def putb(self, ts, data):
- self.put(ts, ts, self.out_bin, data)
+ self.put(ts, ts, self.out_binary, data)
def pcap_global_header(self):
# See https://wiki.wireshark.org/Development/LibpcapFileFormat.
self.secs_per_sample = float(1) / float(self.samplerate)
def start(self):
- self.out_bin = self.register(srd.OUTPUT_BINARY)
+ self.out_binary = self.register(srd.OUTPUT_BINARY)
self.out_ann = self.register(srd.OUTPUT_ANN)
def handle_transfer(self):
def write_pcap_header(self):
if not self.wrote_pcap_header:
- self.put(0, 0, self.out_bin, (0, self.pcap_global_header()))
+ self.put(0, 0, self.out_binary, [0, self.pcap_global_header()])
self.wrote_pcap_header = True
def request_summary(self, request):
# Issue PCAP 'SUBMIT' packet.
ts = self.ts_from_samplenum(ss)
pkt = pcap_usb_pkt(request, ts, True)
- self.putb(ss, (0, pkt.record_header()))
- self.putb(ss, (0, pkt.packet()))
+ self.putb(ss, [0, pkt.record_header()])
+ self.putb(ss, [0, pkt.packet()])
if request_end == 1:
# Write annotation.
# Issue PCAP 'COMPLETE' packet.
ts = self.ts_from_samplenum(es)
pkt = pcap_usb_pkt(request, ts, False)
- self.putb(ss, (0, pkt.record_header()))
- self.putb(ss, (0, pkt.packet()))
+ self.putb(ss, [0, pkt.record_header()])
+ self.putb(ss, [0, pkt.packet()])
del self.request[(addr, ep)]
def decode(self, ss, es, data):
return
if self.transaction_state == 'TOKEN RECEIVED':
transaction_timeout = self.transaction_es
- # token length is 35 bits, timeout is 16..18 bit times (USB 2.0 7.1.19.1)
+ # Token length is 35 bits, timeout is 16..18 bit times
+ # (USB 2.0 7.1.19.1).
transaction_timeout += int((self.transaction_es - self.transaction_ss) / 2)
- if (ss > transaction_timeout):
+ if ss > transaction_timeout:
self.transaction_es = transaction_timeout
self.handshake = 'timeout'
self.handle_transfer()