summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--digital/avr/modules/usb/test/descriptors.c8
-rw-r--r--digital/avr/modules/usb/test/todfu.py2
-rw-r--r--digital/dev2/doc/dev2.txt6
-rw-r--r--digital/dev2/src/usb_gpio/descriptors.c6
-rw-r--r--digital/dev2/src/usb_serial_isp/descriptors.c6
-rw-r--r--digital/dev2/src/usb_twi/descriptors.c6
-rwxr-xr-xdigital/dev2/tools/dev2ctl.py2
-rw-r--r--digital/ucoolib/ucoolib/hal/usb/Config6
-rw-r--r--digital/ucoolib/ucoolib/hal/usb/test/Config6
9 files changed, 24 insertions, 24 deletions
diff --git a/digital/avr/modules/usb/test/descriptors.c b/digital/avr/modules/usb/test/descriptors.c
index a3b46ee0..70d1bdd1 100644
--- a/digital/avr/modules/usb/test/descriptors.c
+++ b/digital/avr/modules/usb/test/descriptors.c
@@ -50,9 +50,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
SubClass: 0x00,
Protocol: 0x00,
Endpoint0Size: 8,
- /* Taken from LUFA IDs. */
- VendorID: 0x03EB,
- ProductID: 0x204E,
+ /* Theses are APBTeam IDs, given by Openmoko! */
+ VendorID: 0x1d50,
+ ProductID: 0x6052,
ReleaseNumber: 0x0000,
ManufacturerStrIndex: 0x01,
ProductStrIndex: 0x02,
@@ -157,7 +157,7 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
USB_Descriptor_String_t PROGMEM ProductString =
{
Header: { Size: USB_STRING_LEN (16), Type: DTYPE_String },
- UnicodeString: L"Dual Serial Echo"
+ UnicodeString: L"test usb"
};
uint16_t
diff --git a/digital/avr/modules/usb/test/todfu.py b/digital/avr/modules/usb/test/todfu.py
index 60e47eac..bca356bc 100644
--- a/digital/avr/modules/usb/test/todfu.py
+++ b/digital/avr/modules/usb/test/todfu.py
@@ -3,6 +3,6 @@ import usb
for bus in usb.busses ():
for dev in bus.devices:
- if dev.idVendor == 0x03eb and dev.idProduct == 0x204e:
+ if dev.idVendor == 0x1d50 and dev.idProduct == 0x6052:
d = dev.open ()
d.controlMsg (usb.TYPE_VENDOR | usb.RECIP_DEVICE, 0, 0)
diff --git a/digital/dev2/doc/dev2.txt b/digital/dev2/doc/dev2.txt
index 2eed3b3d..9d499172 100644
--- a/digital/dev2/doc/dev2.txt
+++ b/digital/dev2/doc/dev2.txt
@@ -9,7 +9,7 @@ As there is no driver for the dev2 board in the kernel and there is not enough
USB end points in the AT90USB162 to implement a ACM class device with two
serial ports, you should load the generic serial driver:
- modprobe usbserial vendor=0x03eb product=0x204e
+ modprobe usbserial vendor=0x1d50 product=0x6052
Then look at kernel messages to locate the new serial devices (/dev/ttyUSBx).
@@ -19,9 +19,9 @@ be detected.
To let udev do this automatically for you, you can add this to the file
`/etc/udev/rules.d/70-apbteam.rules`:
- SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="03eb", ATTR{idProduct}=="204e", \
+ SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1d50", ATTR{idProduct}=="6052", \
ATTR{manufacturer}=="APBTeam", MODE="0660", GROUP="plugdev", \
- RUN+="/sbin/modprobe usbserial vendor=0x03eb product=0x204e"
+ RUN+="/sbin/modprobe usbserial vendor=0x1d50 product=0x6052"
This will also automatically authorize the `plugdev` group to use the device
without root access.
diff --git a/digital/dev2/src/usb_gpio/descriptors.c b/digital/dev2/src/usb_gpio/descriptors.c
index d2046b3d..f8e6c58d 100644
--- a/digital/dev2/src/usb_gpio/descriptors.c
+++ b/digital/dev2/src/usb_gpio/descriptors.c
@@ -47,9 +47,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
SubClass: 0x00,
Protocol: 0x00,
Endpoint0Size: 8,
- /* Taken from LUFA IDs. */
- VendorID: 0x03EB,
- ProductID: 0x204E,
+ /* Theses are APBTeam IDs, given by Openmoko! */
+ VendorID: 0x1d50,
+ ProductID: 0x6052,
ReleaseNumber: 0x0000,
ManufacturerStrIndex: 0x01,
ProductStrIndex: 0x02,
diff --git a/digital/dev2/src/usb_serial_isp/descriptors.c b/digital/dev2/src/usb_serial_isp/descriptors.c
index 684b1004..b1f52566 100644
--- a/digital/dev2/src/usb_serial_isp/descriptors.c
+++ b/digital/dev2/src/usb_serial_isp/descriptors.c
@@ -50,9 +50,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
SubClass: 0x00,
Protocol: 0x00,
Endpoint0Size: 8,
- /* Taken from LUFA IDs. */
- VendorID: 0x03EB,
- ProductID: 0x204E,
+ /* Theses are APBTeam IDs, given by Openmoko! */
+ VendorID: 0x1d50,
+ ProductID: 0x6052,
ReleaseNumber: 0x0000,
ManufacturerStrIndex: 0x01,
ProductStrIndex: 0x02,
diff --git a/digital/dev2/src/usb_twi/descriptors.c b/digital/dev2/src/usb_twi/descriptors.c
index 728184f6..90e17a93 100644
--- a/digital/dev2/src/usb_twi/descriptors.c
+++ b/digital/dev2/src/usb_twi/descriptors.c
@@ -47,9 +47,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
SubClass: 0x00,
Protocol: 0x00,
Endpoint0Size: 8,
- /* Taken from LUFA IDs. */
- VendorID: 0x03EB,
- ProductID: 0x204E,
+ /* Theses are APBTeam IDs, given by Openmoko! */
+ VendorID: 0x1d50,
+ ProductID: 0x6052,
ReleaseNumber: 0x0000,
ManufacturerStrIndex: 0x01,
ProductStrIndex: 0x02,
diff --git a/digital/dev2/tools/dev2ctl.py b/digital/dev2/tools/dev2ctl.py
index 3cbe4d20..aa69832a 100755
--- a/digital/dev2/tools/dev2ctl.py
+++ b/digital/dev2/tools/dev2ctl.py
@@ -57,7 +57,7 @@ if options.gpio is not None and (options.gpio[0] < 0 or options.gpio[0] > 0xff
d = None
for bus in usb.busses ():
for dev in bus.devices:
- if dev.idVendor == 0x03eb and dev.idProduct == 0x204e:
+ if dev.idVendor == 0x1d50 and dev.idProduct == 0x6052:
d = dev.open ()
if d is None:
print >> sys.stderr, 'device not found'
diff --git a/digital/ucoolib/ucoolib/hal/usb/Config b/digital/ucoolib/ucoolib/hal/usb/Config
index 1d05df2f..f494fefc 100644
--- a/digital/ucoolib/ucoolib/hal/usb/Config
+++ b/digital/ucoolib/ucoolib/hal/usb/Config
@@ -1,8 +1,8 @@
[hal/usb]
-# Taken from LUFA IDs, not for commercial use. Do not use them as default so
+# Theses are APBTeam IDs, given by Openmoko! Do not use them as default so
# that comment is not missed.
-#vendor_id = 0x03eb
-#product_id = 0x204e
+#vendor_id = 0x1d50
+#product_id = 0x6052
vendor_id =
product_id =
# Number of streams, interfaces, or pair of endpoints.
diff --git a/digital/ucoolib/ucoolib/hal/usb/test/Config b/digital/ucoolib/ucoolib/hal/usb/test/Config
index e8c63711..bd314cb0 100644
--- a/digital/ucoolib/ucoolib/hal/usb/test/Config
+++ b/digital/ucoolib/ucoolib/hal/usb/test/Config
@@ -1,5 +1,5 @@
[hal/usb]
-# Taken from LUFA IDs, not for commercial use.
-vendor_id = 0x03eb
-product_id = 0x204e
+# Theses are APBTeam IDs, given by Openmoko!
+vendor_id = 0x1d50
+product_id = 0x6052
stream_nb = 1