usb: Handle CRC errors on control OUT.

Author: zyp

deps/luna

@@ -61,22 +61,11 @@ def handle_dnload(self, m):
 
         last_addr = Signal(24)
 
-        #endpoint_number_matches  = (tokenizer.endpoint == self._endpoint_number)
-        #targeting_endpoint       = endpoint_number_matches & tokenizer.is_out
-        #okay_to_receive          = targeting_endpoint & expected_pid_match & ~overflow
-        #targeting_endpoint       = endpoint_number_matches & tokenizer.is_out
-        #expected_pid_match       = (interface.rx_pid_toggle == expected_data_toggle)
-
         m.d.comb += [
             fifo.write_data.eq(rx.payload),
-            #fifo.write_en.eq(okay_to_receive & rx.next & rx.valid),
             fifo.write_en.eq(rx.next & rx.valid),
 
-            # We'll keep data if our packet finishes with a valid CRC and no overflow; and discard it otherwise.
-            #fifo.write_commit    .eq(targeting_endpoint & boundary_detector.complete_out & ~overflow),
-            #fifo.write_discard   .eq(targeting_endpoint & (boundary_detector.invalid_out | (boundary_detector.complete_out & overflow))),
-            #fifo.write_commit.eq(interface.rx_complete),
-            #fifo.write_discard.eq(interface.rx_invalid),
+            fifo.write_discard.eq(interface.rx_invalid),
             fifo.write_commit.eq(interface.rx_ready_for_response),
 
             self.source.data.eq(fifo.read_data),

orbtrace/dfu.py

@@ -16,14 +16,15 @@ def handle_write(self, m, address):
         w = self.axi_lite.w
         b = self.axi_lite.b
 
+        data = Array(Signal(8) for i in range(4))
+        idx = Signal(range(5))
+
         m.d.comb += [
             w.strb.eq(0b1111),
+            w.data.eq(Cat(data)),
             b.ready.eq(1),
         ]
 
-        data = Array(Signal(8) for i in range(3))
-        idx = Signal(range(4))
-
         with m.FSM(domain = 'usb') as fsm:
 
             with m.State('IDLE'):
@@ -39,26 +40,25 @@ def handle_write(self, m, address):
                     m.next = 'RECEIVE'
 
             with m.State('RECEIVE'):
-                with m.If(self.interface.rx.valid & self.interface.rx.next):
-                    with m.If(idx < 3):
-                        m.d.usb += [
-                            data[idx].eq(self.interface.rx.payload),
-                            idx.eq(idx + 1),
-                        ]
+                with m.If(self.interface.rx.valid & self.interface.rx.next & (idx < 4)):
+                    m.d.usb += [
+                        data[idx].eq(self.interface.rx.payload),
+                        idx.eq(idx + 1),
+                    ]
+
+                with m.If(self.interface.rx_ready_for_response):
+                    m.d.comb += self.interface.handshakes_out.ack.eq(1)
+                    m.next = 'WRITE'
 
-                    with m.Else():
-                        m.d.usb += w.data.eq(Cat(data, self.interface.rx.payload))
-                        m.next = 'WRITE'
+                with m.If(self.interface.rx_invalid):
+                    m.d.usb += idx.eq(0)
 
             with m.State('WRITE'):
                 m.d.comb += w.valid.eq(1)
 
                 with m.If(w.ready):
                     m.next = 'IDLE'
 
-        with m.If(self.interface.rx_ready_for_response):
-            m.d.comb += self.interface.handshakes_out.ack.eq(1)
-
         with m.If(self.interface.status_requested):
             m.d.comb += self.send_zlp()