Merge pull request #268 from mossmann/vidpid

Update VID/PIDs
greatscottgadgets · Jul 4, 2024 · 160f06d · 160f06d
2 parents 5053816 + 27069e9
commit 160f06d
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 56 deletions.
diff --git a/contrib/54-luna-plugdev.rules b/contrib/54-luna-plugdev.rules
@@ -1,4 +1,5 @@
-ATTR{idVendor}=="16d0", ATTR{idProduct}=="05a5", SYMLINK+="luna%k", MODE="660", GROUP="plugdev"
-ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f3b", SYMLINK+="lunatarget%k", MODE="660", GROUP="plugdev"
-ATTR{idVendor}=="1d50", ATTR{idProduct}=="615c", SYMLINK+="apollo%k", MODE="660", GROUP="plugdev"
-ATTR{idVendor}=="1d50", ATTR{idProduct}=="615b", SYMLINK+="luna%k", MODE="660", GROUP="plugdev"
+ATTR{idVendor}=="1209", ATTR{idProduct}=="0001", SYMLINK+="luna-test1-%k", MODE="660", GROUP="plugdev"
+ATTR{idVendor}=="1209", ATTR{idProduct}=="0002", SYMLINK+="luna-test2-%k", MODE="660", GROUP="plugdev"
+ATTR{idVendor}=="1209", ATTR{idProduct}=="0003", SYMLINK+="luna-test3-%k", MODE="660", GROUP="plugdev"
+ATTR{idVendor}=="1209", ATTR{idProduct}=="0004", SYMLINK+="luna-test4-%k", MODE="660", GROUP="plugdev"
+ATTR{idVendor}=="1209", ATTR{idProduct}=="0005", SYMLINK+="luna-test5-%k", MODE="660", GROUP="plugdev"
diff --git a/contrib/54-luna-uaccess.rules b/contrib/54-luna-uaccess.rules
@@ -1,5 +1,5 @@
-ATTR{idVendor}=="16d0", ATTR{idProduct}=="05a5", SYMLINK+="luna%k", TAG+="uaccess"
-ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f3b", SYMLINK+="lunatarget%k", TAG+="uaccess"
-
-ATTR{idVendor}=="1d50", ATTR{idProduct}=="615c", SYMLINK+="apollo%k", TAG+="uaccess"
-ATTR{idVendor}=="1d50", ATTR{idProduct}=="615b", SYMLINK+="luna%k", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0001", SYMLINK+="luna-test1-%k", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0002", SYMLINK+="luna-test2-%k", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0003", SYMLINK+="luna-test3-%k", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0004", SYMLINK+="luna-test4-%k", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0005", SYMLINK+="luna-test5-%k", TAG+="uaccess"
diff --git a/examples/usb/acm_serial.py b/examples/usb/acm_serial.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 from amaranth            import Elaboratable, Module
@@ -23,7 +23,7 @@ def elaborate(self, platform):
         # Create our USB-to-serial converter.
         ulpi = platform.request(platform.default_usb_connection)
         m.submodules.usb_serial = usb_serial = \
-                USBSerialDevice(bus=ulpi, idVendor=0x16d0, idProduct=0x0f3b)
+                USBSerialDevice(bus=ulpi, idVendor=0x1209, idProduct=0x0001)
 
         m.d.comb += [
             # Place the streams into a loopback configuration...

diff --git a/examples/usb/counter_device.py b/examples/usb/counter_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -39,8 +39,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Counter/Throughput Test"

diff --git a/examples/usb/interrupt_device.py b/examples/usb/interrupt_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -37,8 +37,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Status interrupt mechanism"

diff --git a/examples/usb/isochronous_count.py b/examples/usb/isochronous_count.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -38,8 +38,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Isochronous IN Test"

diff --git a/examples/usb/loopback.py b/examples/usb/loopback.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -36,8 +36,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "User IO streamer"

diff --git a/examples/usb/simple_device.py b/examples/usb/simple_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -31,8 +31,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Test Device"

diff --git a/examples/usb/stream_out_device.py b/examples/usb/stream_out_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -36,8 +36,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "User IO streamer"

diff --git a/examples/usb/stress_test_device.py b/examples/usb/stress_test_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
@@ -127,8 +127,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Stress Test"

diff --git a/examples/usb/superspeed/simple_device.py b/examples/usb/superspeed/simple_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 from amaranth import *
@@ -32,8 +32,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             # We're complying with the USB 3.2 standard.
             d.bcdUSB             = 3.2

diff --git a/examples/usb/superspeed/stream_in_device.py b/examples/usb/superspeed/stream_in_device.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 from amaranth import *
@@ -34,8 +34,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             # We're complying with the USB 3.2 standard.
             d.bcdUSB             = 3.2

diff --git a/examples/usb/superspeed/vendor_request.py b/examples/usb/superspeed/vendor_request.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 from amaranth import *
@@ -105,8 +105,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             # We're complying with the USB 3.2 standard.
             d.bcdUSB             = 3.2

diff --git a/examples/usb/vendor_request.py b/examples/usb/vendor_request.py
@@ -2,7 +2,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 from amaranth                       import Elaboratable, Module, Cat
@@ -81,8 +81,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Fancy USB-Controlled LEDs"

diff --git a/luna/gateware/applets/speed_test.py b/luna/gateware/applets/speed_test.py
@@ -1,3 +1,9 @@
+#
+# This file is part of LUNA.
+#
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
+# SPDX-License-Identifier: BSD-3-Clause
+
 from amaranth                import *
 from usb_protocol.emitters   import DeviceDescriptorCollection, SuperSpeedDeviceDescriptorCollection
 
@@ -9,8 +15,8 @@
 
 from apollo_fpga.gateware.advertiser import ApolloAdvertiser, ApolloAdvertiserRequestHandler
 
-VENDOR_ID  = 0x16d0
-PRODUCT_ID = 0x0f3b
+VENDOR_ID  = 0x1209
+PRODUCT_ID = 0x0001
 
 BULK_ENDPOINT_NUMBER = 1
 
@@ -178,8 +184,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             # We're complying with the USB 3.2 standard.
             d.bcdUSB             = 3.2

diff --git a/luna/gateware/usb/devices/ila.py b/luna/gateware/usb/devices/ila.py
@@ -1,7 +1,7 @@
 #
 # This file is part of LUNA.
 #
-# Copyright (c) 2020 Great Scott Gadgets <[email protected]>
+# Copyright (c) 2020-2024 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 """ Pre-made gateware that implements an ILA connection serial. """
@@ -72,8 +72,8 @@ def create_descriptors(self):
 
         # We'll need a device descriptor...
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0x05a5
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0002
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Integrated Logic Analyzer"
@@ -162,7 +162,7 @@ def __init__(self, *args, ila, delay=3, **kwargs):
             time.sleep(delay)
 
         # Create our USB connection the device
-        self._device = usb.core.find(idVendor=0x16d0, idProduct=0x5a5)
+        self._device = usb.core.find(idVendor=0x1209, idProduct=0x0002)
 
 
         super().__init__(ila)

diff --git a/tests/test_usb2_device.py b/tests/test_usb2_device.py
@@ -43,8 +43,8 @@ def provision_dut(self, dut):
         self.descriptors = descriptors = DeviceDescriptorCollection()
 
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Test Device"
@@ -163,8 +163,8 @@ def provision_dut(self, dut):
         self.descriptors = descriptors = DeviceDescriptorCollection()
 
         with descriptors.DeviceDescriptor() as d:
-            d.idVendor           = 0x16d0
-            d.idProduct          = 0xf3b
+            d.idVendor           = 0x1209
+            d.idProduct          = 0x0001
 
             d.iManufacturer      = "LUNA"
             d.iProduct           = "Test Device"