Skip to content

Commit 160f06d

Browse files
mossmannmossmann
authored
Merge pull request #268 from mossmann/vidpid
Update VID/PIDs
2 parents 5053816 + 27069e9 commit 160f06d

17 files changed

+63
-56
lines changed

‎contrib/54-luna-plugdev.rules

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
ATTR{idVendor}=="16d0", ATTR{idProduct}=="05a5", SYMLINK+="luna%k", MODE="660", GROUP="plugdev"
2-
ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f3b", SYMLINK+="lunatarget%k", MODE="660", GROUP="plugdev"
3-
ATTR{idVendor}=="1d50", ATTR{idProduct}=="615c", SYMLINK+="apollo%k", MODE="660", GROUP="plugdev"
4-
ATTR{idVendor}=="1d50", ATTR{idProduct}=="615b", SYMLINK+="luna%k", MODE="660", GROUP="plugdev"
1+
ATTR{idVendor}=="1209", ATTR{idProduct}=="0001", SYMLINK+="luna-test1-%k", MODE="660", GROUP="plugdev"
2+
ATTR{idVendor}=="1209", ATTR{idProduct}=="0002", SYMLINK+="luna-test2-%k", MODE="660", GROUP="plugdev"
3+
ATTR{idVendor}=="1209", ATTR{idProduct}=="0003", SYMLINK+="luna-test3-%k", MODE="660", GROUP="plugdev"
4+
ATTR{idVendor}=="1209", ATTR{idProduct}=="0004", SYMLINK+="luna-test4-%k", MODE="660", GROUP="plugdev"
5+
ATTR{idVendor}=="1209", ATTR{idProduct}=="0005", SYMLINK+="luna-test5-%k", MODE="660", GROUP="plugdev"

‎contrib/54-luna-uaccess.rules

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ATTR{idVendor}=="16d0", ATTR{idProduct}=="05a5", SYMLINK+="luna%k", TAG+="uaccess"
2-
ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f3b", SYMLINK+="lunatarget%k", TAG+="uaccess"
3-
4-
ATTR{idVendor}=="1d50", ATTR{idProduct}=="615c", SYMLINK+="apollo%k", TAG+="uaccess"
5-
ATTR{idVendor}=="1d50", ATTR{idProduct}=="615b", SYMLINK+="luna%k", TAG+="uaccess"
1+
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0001", SYMLINK+="luna-test1-%k", TAG+="uaccess"
2+
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0002", SYMLINK+="luna-test2-%k", TAG+="uaccess"
3+
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0003", SYMLINK+="luna-test3-%k", TAG+="uaccess"
4+
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0004", SYMLINK+="luna-test4-%k", TAG+="uaccess"
5+
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0005", SYMLINK+="luna-test5-%k", TAG+="uaccess"

‎examples/usb/acm_serial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
from amaranth import Elaboratable, Module
@@ -23,7 +23,7 @@ def elaborate(self, platform):
2323
# Create our USB-to-serial converter.
2424
ulpi = platform.request(platform.default_usb_connection)
2525
m.submodules.usb_serial = usb_serial = \
26-
USBSerialDevice(bus=ulpi, idVendor=0x16d0, idProduct=0x0f3b)
26+
USBSerialDevice(bus=ulpi, idVendor=0x1209, idProduct=0x0001)
2727

2828
m.d.comb += [
2929
# Place the streams into a loopback configuration...

‎examples/usb/counter_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -39,8 +39,8 @@ def create_descriptors(self):
3939

4040
# We'll need a device descriptor...
4141
with descriptors.DeviceDescriptor() as d:
42-
d.idVendor = 0x16d0
43-
d.idProduct = 0xf3b
42+
d.idVendor = 0x1209
43+
d.idProduct = 0x0001
4444

4545
d.iManufacturer = "LUNA"
4646
d.iProduct = "Counter/Throughput Test"

‎examples/usb/interrupt_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -37,8 +37,8 @@ def create_descriptors(self):
3737

3838
# We'll need a device descriptor...
3939
with descriptors.DeviceDescriptor() as d:
40-
d.idVendor = 0x16d0
41-
d.idProduct = 0xf3b
40+
d.idVendor = 0x1209
41+
d.idProduct = 0x0001
4242

4343
d.iManufacturer = "LUNA"
4444
d.iProduct = "Status interrupt mechanism"

‎examples/usb/isochronous_count.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -38,8 +38,8 @@ def create_descriptors(self):
3838

3939
# We'll need a device descriptor...
4040
with descriptors.DeviceDescriptor() as d:
41-
d.idVendor = 0x16d0
42-
d.idProduct = 0xf3b
41+
d.idVendor = 0x1209
42+
d.idProduct = 0x0001
4343

4444
d.iManufacturer = "LUNA"
4545
d.iProduct = "Isochronous IN Test"

‎examples/usb/loopback.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -36,8 +36,8 @@ def create_descriptors(self):
3636

3737
# We'll need a device descriptor...
3838
with descriptors.DeviceDescriptor() as d:
39-
d.idVendor = 0x16d0
40-
d.idProduct = 0xf3b
39+
d.idVendor = 0x1209
40+
d.idProduct = 0x0001
4141

4242
d.iManufacturer = "LUNA"
4343
d.iProduct = "User IO streamer"

‎examples/usb/simple_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -31,8 +31,8 @@ def create_descriptors(self):
3131

3232
# We'll need a device descriptor...
3333
with descriptors.DeviceDescriptor() as d:
34-
d.idVendor = 0x16d0
35-
d.idProduct = 0xf3b
34+
d.idVendor = 0x1209
35+
d.idProduct = 0x0001
3636

3737
d.iManufacturer = "LUNA"
3838
d.iProduct = "Test Device"

‎examples/usb/stream_out_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -36,8 +36,8 @@ def create_descriptors(self):
3636

3737
# We'll need a device descriptor...
3838
with descriptors.DeviceDescriptor() as d:
39-
d.idVendor = 0x16d0
40-
d.idProduct = 0xf3b
39+
d.idVendor = 0x1209
40+
d.idProduct = 0x0001
4141

4242
d.iManufacturer = "LUNA"
4343
d.iProduct = "User IO streamer"

‎examples/usb/stress_test_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
import os
@@ -127,8 +127,8 @@ def create_descriptors(self):
127127

128128
# We'll need a device descriptor...
129129
with descriptors.DeviceDescriptor() as d:
130-
d.idVendor = 0x16d0
131-
d.idProduct = 0xf3b
130+
d.idVendor = 0x1209
131+
d.idProduct = 0x0001
132132

133133
d.iManufacturer = "LUNA"
134134
d.iProduct = "Stress Test"

‎examples/usb/superspeed/simple_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
from amaranth import *
@@ -32,8 +32,8 @@ def create_descriptors(self):
3232

3333
# We'll need a device descriptor...
3434
with descriptors.DeviceDescriptor() as d:
35-
d.idVendor = 0x16d0
36-
d.idProduct = 0xf3b
35+
d.idVendor = 0x1209
36+
d.idProduct = 0x0001
3737

3838
# We're complying with the USB 3.2 standard.
3939
d.bcdUSB = 3.2

‎examples/usb/superspeed/stream_in_device.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
from amaranth import *
@@ -34,8 +34,8 @@ def create_descriptors(self):
3434

3535
# We'll need a device descriptor...
3636
with descriptors.DeviceDescriptor() as d:
37-
d.idVendor = 0x16d0
38-
d.idProduct = 0xf3b
37+
d.idVendor = 0x1209
38+
d.idProduct = 0x0001
3939

4040
# We're complying with the USB 3.2 standard.
4141
d.bcdUSB = 3.2

‎examples/usb/superspeed/vendor_request.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
from amaranth import *
@@ -105,8 +105,8 @@ def create_descriptors(self):
105105

106106
# We'll need a device descriptor...
107107
with descriptors.DeviceDescriptor() as d:
108-
d.idVendor = 0x16d0
109-
d.idProduct = 0xf3b
108+
d.idVendor = 0x1209
109+
d.idProduct = 0x0001
110110

111111
# We're complying with the USB 3.2 standard.
112112
d.bcdUSB = 3.2

‎examples/usb/vendor_request.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of LUNA.
44
#
5-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
66
# SPDX-License-Identifier: BSD-3-Clause
77

88
from amaranth import Elaboratable, Module, Cat
@@ -81,8 +81,8 @@ def create_descriptors(self):
8181

8282
# We'll need a device descriptor...
8383
with descriptors.DeviceDescriptor() as d:
84-
d.idVendor = 0x16d0
85-
d.idProduct = 0xf3b
84+
d.idVendor = 0x1209
85+
d.idProduct = 0x0001
8686

8787
d.iManufacturer = "LUNA"
8888
d.iProduct = "Fancy USB-Controlled LEDs"

‎luna/gateware/applets/speed_test.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#
2+
# This file is part of LUNA.
3+
#
4+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
5+
# SPDX-License-Identifier: BSD-3-Clause
6+
17
from amaranth import *
28
from usb_protocol.emitters import DeviceDescriptorCollection, SuperSpeedDeviceDescriptorCollection
39

@@ -9,8 +15,8 @@
915

1016
from apollo_fpga.gateware.advertiser import ApolloAdvertiser, ApolloAdvertiserRequestHandler
1117

12-
VENDOR_ID = 0x16d0
13-
PRODUCT_ID = 0x0f3b
18+
VENDOR_ID = 0x1209
19+
PRODUCT_ID = 0x0001
1420

1521
BULK_ENDPOINT_NUMBER = 1
1622

@@ -178,8 +184,8 @@ def create_descriptors(self):
178184

179185
# We'll need a device descriptor...
180186
with descriptors.DeviceDescriptor() as d:
181-
d.idVendor = 0x16d0
182-
d.idProduct = 0xf3b
187+
d.idVendor = 0x1209
188+
d.idProduct = 0x0001
183189

184190
# We're complying with the USB 3.2 standard.
185191
d.bcdUSB = 3.2

‎luna/gateware/usb/devices/ila.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# This file is part of LUNA.
33
#
4-
# Copyright (c) 2020 Great Scott Gadgets <info@greatscottgadgets.com>
4+
# Copyright (c) 2020-2024 Great Scott Gadgets <info@greatscottgadgets.com>
55
# SPDX-License-Identifier: BSD-3-Clause
66

77
""" Pre-made gateware that implements an ILA connection serial. """
@@ -72,8 +72,8 @@ def create_descriptors(self):
7272

7373
# We'll need a device descriptor...
7474
with descriptors.DeviceDescriptor() as d:
75-
d.idVendor = 0x16d0
76-
d.idProduct = 0x05a5
75+
d.idVendor = 0x1209
76+
d.idProduct = 0x0002
7777

7878
d.iManufacturer = "LUNA"
7979
d.iProduct = "Integrated Logic Analyzer"
@@ -162,7 +162,7 @@ def __init__(self, *args, ila, delay=3, **kwargs):
162162
time.sleep(delay)
163163

164164
# Create our USB connection the device
165-
self._device = usb.core.find(idVendor=0x16d0, idProduct=0x5a5)
165+
self._device = usb.core.find(idVendor=0x1209, idProduct=0x0002)
166166

167167

168168
super().__init__(ila)

‎tests/test_usb2_device.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def provision_dut(self, dut):
4343
self.descriptors = descriptors = DeviceDescriptorCollection()
4444

4545
with descriptors.DeviceDescriptor() as d:
46-
d.idVendor = 0x16d0
47-
d.idProduct = 0xf3b
46+
d.idVendor = 0x1209
47+
d.idProduct = 0x0001
4848

4949
d.iManufacturer = "LUNA"
5050
d.iProduct = "Test Device"
@@ -163,8 +163,8 @@ def provision_dut(self, dut):
163163
self.descriptors = descriptors = DeviceDescriptorCollection()
164164

165165
with descriptors.DeviceDescriptor() as d:
166-
d.idVendor = 0x16d0
167-
d.idProduct = 0xf3b
166+
d.idVendor = 0x1209
167+
d.idProduct = 0x0001
168168

169169
d.iManufacturer = "LUNA"
170170
d.iProduct = "Test Device"

0 commit comments

Comments
 (0)