summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
inline | side by side (from parent 1:
0eb16a7)
The usb_signalling PD should not care about packets, only symbols and bits.
The new (fixed) usb_packet PD constructs packets out of individual bits now.
- 'BIT', <bit>
- 'STUFF BIT', None
- 'EOP', None
- 'BIT', <bit>
- 'STUFF BIT', None
- 'EOP', None
<sym>:
- 'J', 'K', 'SE0', or 'SE1'
<sym>:
- 'J', 'K', 'SE0', or 'SE1'
<bit>:
- 0 or 1
- Note: Symbols like SE0, SE1, and the J that's part of EOP don't yield 'BIT'.
<bit>:
- 0 or 1
- Note: Symbols like SE0, SE1, and the J that's part of EOP don't yield 'BIT'.
-
-<packet>:
- - A string consisting of '1' and '0' characters, e.g. '11010100'.
- - The packet contains only "real" bits, no stuff bits (and no SOF/EOP).
'''
# Low-/full-speed symbols.
'''
# Low-/full-speed symbols.
'signalling': ['Signalling', 'full-speed'],
}
annotations = [
'signalling': ['Signalling', 'full-speed'],
}
annotations = [
['sop', 'Start of packet (SOP)'],
['eop', 'End of packet (EOP)'],
['bit', 'Bit'],
['stuffbit', 'Stuff bit'],
['sop', 'Start of packet (SOP)'],
['eop', 'End of packet (EOP)'],
['bit', 'Bit'],
['stuffbit', 'Stuff bit'],
self.ss_sop = None
self.ss_block = None
self.samplenum = 0
self.ss_sop = None
self.ss_block = None
self.samplenum = 0
self.syms = []
self.bitrate = None
self.bitwidth = None
self.syms = []
self.bitrate = None
self.bitwidth = None
def putpm(self, data):
s, h = self.samplenum, self.halfbit
def putpm(self, data):
s, h = self.samplenum, self.halfbit
- self.put(self.ss_block - h, self.samplenum + h, self.out_proto, data)
+ self.put(self.ss_block - h, s + h, self.out_proto, data)
def putm(self, data):
s, h = self.samplenum, self.halfbit
def putm(self, data):
s, h = self.samplenum, self.halfbit
- self.put(self.ss_block - h, self.samplenum + h, self.out_ann, data)
+ self.put(self.ss_block - h, s + h, self.out_ann, data)
def putpb(self, data):
s, h = self.samplenum, self.halfbit
def putpb(self, data):
s, h = self.samplenum, self.halfbit
def handle_bit(self, sym, b):
if self.consecutive_ones == 6 and b == '0':
def handle_bit(self, sym, b):
if self.consecutive_ones == 6 and b == '0':
- # Stuff bit. Don't add to the packet, reset self.consecutive_ones.
self.putpb(['STUFF BIT', None])
self.putb([4, ['SB: %s/%s' % (sym, b)]])
self.consecutive_ones = 0
else:
self.putpb(['STUFF BIT', None])
self.putb([4, ['SB: %s/%s' % (sym, b)]])
self.consecutive_ones = 0
else:
- # Normal bit. Add it to the packet, update self.consecutive_ones.
+ # Normal bit (not a stuff bit).
self.putpb(['BIT', b])
self.putb([3, ['%s/%s' % (sym, b)]])
self.putpb(['BIT', b])
self.putb([3, ['%s/%s' % (sym, b)]])
if b == '1':
self.consecutive_ones += 1
else:
if b == '1':
self.consecutive_ones += 1
else:
self.set_new_target_samplenum()
self.oldsym = sym
if self.syms[-2:] == ['SE0', 'J']:
self.set_new_target_samplenum()
self.oldsym = sym
if self.syms[-2:] == ['SE0', 'J']:
- # Got an EOP, i.e. we now have a full packet.
self.putpm(['EOP', None])
self.putm([2, ['EOP']])
self.putpm(['EOP', None])
self.putm([2, ['EOP']])
- self.ss_block = self.ss_sop
- self.putpm(['PACKET', self.packet])
- self.putm([5, ['PACKET: %s' % self.packet]])
- self.bitnum, self.packet, self.syms, self.state = 0, '', [], 'IDLE'
+ self.bitnum, self.syms, self.state = 0, [], 'IDLE'
self.consecutive_ones = 0
def get_bit(self, sym):
self.consecutive_ones = 0
def get_bit(self, sym):