Merge pull request #126 from ronyrus/bugfix/USBDevice_speed

gateware.usb2: USBDevice should have only one 'speed' signal
greatscottgadgets · Nov 19, 2021 · adfd104 · adfd104
2 parents 4ab2b38 + ae31798
commit adfd104
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/luna/gateware/usb/usb2/device.py b/luna/gateware/usb/usb2/device.py
@@ -217,9 +217,6 @@ def elaborate(self, platform):
         # Stores the device's current configuration. Defaults to unconfigured.
         configuration = Signal(8, reset=0)
 
-        # Stores the device's current speed (a USBSpeed value).
-        speed         = Signal(2, reset=USBSpeed.FULL)
-
 
         #
         # Internal interconnections.
@@ -271,8 +268,8 @@ def elaborate(self, platform):
             data_crc.rx_valid       .eq(self.utmi.rx_valid),
 
             # Connect our state signals to our subordinate components.
-            token_detector.speed    .eq(speed),
-            timer.speed             .eq(speed)
+            token_detector.speed    .eq(self.speed),
+            timer.speed             .eq(self.speed)
         ]
 
         #
@@ -293,7 +290,7 @@ def elaborate(self, platform):
             handshake_detector.detected                .connect(endpoint_collection.handshakes_in),
 
             # Device state.
-            endpoint_collection.speed                  .eq(speed),
+            endpoint_collection.speed                  .eq(self.speed),
             endpoint_collection.active_config          .eq(configuration),
             endpoint_collection.active_address         .eq(address),