arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-03 20:11:00 +00:00
Code Issues Releases Wiki Activity

core+legacy: reintroduce USB 2.1 landing page for firmware

Browse Source
This commit is contained in:
Pavol Rusnak 2019-04-24 22:55:34 +02:00
parent 30ae11f22e
commit 62707a062a
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/usb.py
View File

@ -62,7 +62,6 @@ bus = io.USB(
product="TREZOR", product="TREZOR",
interface="TREZOR Interface", interface="TREZOR Interface",
serial_number=get_device_id(), serial_number=get_device_id(),
usb21_landing=False,
) )
bus.add(iface_wire) bus.add(iface_wire)
if __debug__: if __debug__:

2
legacy/firmware/usb.c
View File

@ -344,7 +344,7 @@ static uint8_t usbd_control_buffer[256] __attribute__((aligned(2)));
static const struct usb_device_capability_descriptor *capabilities[] = { static const struct usb_device_capability_descriptor *capabilities[] = {
(const struct usb_device_capability_descriptor (const struct usb_device_capability_descriptor
*)&webusb_platform_capability_descriptor_no_landing_page, *)&webusb_platform_capability_descriptor,
}; };
static const struct usb_bos_descriptor bos_descriptor = { static const struct usb_bos_descriptor bos_descriptor = {

11
legacy/webusb.c
View File

@ -32,17 +32,6 @@ const struct webusb_platform_descriptor webusb_platform_capability_descriptor =
.bVendorCode = WEBUSB_VENDOR_CODE, .bVendorCode = WEBUSB_VENDOR_CODE,
.iLandingPage = 1}; .iLandingPage = 1};
const struct webusb_platform_descriptor
webusb_platform_capability_descriptor_no_landing_page = {
.bLength = WEBUSB_PLATFORM_DESCRIPTOR_SIZE,
.bDescriptorType = USB_DT_DEVICE_CAPABILITY,
.bDevCapabilityType = USB_DC_PLATFORM,
.bReserved = 0,
.platformCapabilityUUID = WEBUSB_UUID,
.bcdVersion = 0x0100,
.bVendorCode = WEBUSB_VENDOR_CODE,
.iLandingPage = 0};
static const char* webusb_https_url; static const char* webusb_https_url;
static enum usbd_request_return_codes webusb_control_vendor_request( static enum usbd_request_return_codes webusb_control_vendor_request(

2
legacy/webusb.h
View File

@ -27,8 +27,6 @@
extern const struct webusb_platform_descriptor extern const struct webusb_platform_descriptor
webusb_platform_capability_descriptor; webusb_platform_capability_descriptor;
extern const struct webusb_platform_descriptor
webusb_platform_capability_descriptor_no_landing_page;
extern void webusb_setup(usbd_device* usbd_dev, const char* https_url); extern void webusb_setup(usbd_device* usbd_dev, const char* https_url);