softonik/tinygo
1
0
Ответвление 0
Код Задачи Слияния Проекты Выпуски Пакеты Вики Активность Действия

machine/atsamd21 and atsamd51: corrections needed to return valid UCB CDC device and string descriptors

Просмотр исходного кода 
Signed-off-by: Ron Evans <ron@hybridgroup.com>
Этот коммит содержится в:
Ron Evans 2020-03-16 18:58:41 +01:00 • коммит произвёл Ayke
родитель 0312f12696
коммит c03e3616a2
2 изменённых файлов: 24 добавлений и 18 удалений
Показать статистику Скачать .patch Скачать .diff Показать все файлы Свернуть все файлы

21
src/machine/machine_atsamd21.go
Просмотреть файл

@ -1801,7 +1801,7 @@ func sendDescriptor(setup usbSetup) {
sendUSBPacket(0, dd.Bytes()[:8]) sendUSBPacket(0, dd.Bytes()[:8])
} else { } else {
// complete descriptor requested so send entire packet // complete descriptor requested so send entire packet
dd := NewDeviceDescriptor(0x00, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1) dd := NewDeviceDescriptor(0x02, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1)
sendUSBPacket(0, dd.Bytes()) sendUSBPacket(0, dd.Bytes())
} }
return return
@ -1810,11 +1810,12 @@ func sendDescriptor(setup usbSetup) {
switch setup.wValueL { switch setup.wValueL {
case 0: case 0:
b := make([]byte, 4) b := make([]byte, 4)
b[0] = byte(usb_STRING_LANGUAGE[0] >> 8) b[0] = 0x04
b[1] = byte(usb_STRING_LANGUAGE[0] & 0xff) b[1] = 0x03
b[2] = byte(usb_STRING_LANGUAGE[1] >> 8) b[2] = 0x09
b[3] = byte(usb_STRING_LANGUAGE[1] & 0xff) b[3] = 0x04
sendUSBPacket(0, b) sendUSBPacket(0, b)
return
case usb_IPRODUCT: case usb_IPRODUCT:
prod := []byte(usb_STRING_PRODUCT) prod := []byte(usb_STRING_PRODUCT)
@ -1823,11 +1824,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03 b[1] = 0x03
for i, val := range prod { for i, val := range prod {
b[i*2] = 0 b[i*2+2] = val
b[i*2+1] = val b[i*2+3] = 0
} }
sendUSBPacket(0, b) sendUSBPacket(0, b)
return
case usb_IMANUFACTURER: case usb_IMANUFACTURER:
prod := []byte(usb_STRING_MANUFACTURER) prod := []byte(usb_STRING_MANUFACTURER)
@ -1836,11 +1838,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03 b[1] = 0x03
for i, val := range prod { for i, val := range prod {
b[i*2] = 0 b[i*2+2] = val
b[i*2+1] = val b[i*2+3] = 0
} }
sendUSBPacket(0, b) sendUSBPacket(0, b)
return
case usb_ISERIAL: case usb_ISERIAL:
// TODO: allow returning a product serial number // TODO: allow returning a product serial number

21
src/machine/machine_atsamd51.go
Просмотреть файл

@ -1972,7 +1972,7 @@ func sendDescriptor(setup usbSetup) {
sendUSBPacket(0, dd.Bytes()[:8]) sendUSBPacket(0, dd.Bytes()[:8])
} else { } else {
// complete descriptor requested so send entire packet // complete descriptor requested so send entire packet
dd := NewDeviceDescriptor(0x00, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1) dd := NewDeviceDescriptor(0x02, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1)
sendUSBPacket(0, dd.Bytes()) sendUSBPacket(0, dd.Bytes())
} }
return return
@ -1981,11 +1981,12 @@ func sendDescriptor(setup usbSetup) {
switch setup.wValueL { switch setup.wValueL {
case 0: case 0:
b := make([]byte, 4) b := make([]byte, 4)
b[0] = byte(usb_STRING_LANGUAGE[0] >> 8) b[0] = 0x04
b[1] = byte(usb_STRING_LANGUAGE[0] & 0xff) b[1] = 0x03
b[2] = byte(usb_STRING_LANGUAGE[1] >> 8) b[2] = 0x09
b[3] = byte(usb_STRING_LANGUAGE[1] & 0xff) b[3] = 0x04
sendUSBPacket(0, b) sendUSBPacket(0, b)
return
case usb_IPRODUCT: case usb_IPRODUCT:
prod := []byte(usb_STRING_PRODUCT) prod := []byte(usb_STRING_PRODUCT)
@ -1994,11 +1995,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03 b[1] = 0x03
for i, val := range prod { for i, val := range prod {
b[i*2] = 0 b[i*2+2] = val
b[i*2+1] = val b[i*2+3] = 0
} }
sendUSBPacket(0, b) sendUSBPacket(0, b)
return
case usb_IMANUFACTURER: case usb_IMANUFACTURER:
prod := []byte(usb_STRING_MANUFACTURER) prod := []byte(usb_STRING_MANUFACTURER)
@ -2007,11 +2009,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03 b[1] = 0x03
for i, val := range prod { for i, val := range prod {
b[i*2] = 0 b[i*2+2] = val
b[i*2+1] = val b[i*2+3] = 0
} }
sendUSBPacket(0, b) sendUSBPacket(0, b)
return
case usb_ISERIAL: case usb_ISERIAL:
// TODO: allow returning a product serial number // TODO: allow returning a product serial number