Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set iInterface=serprog #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Set iInterface=serprog #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions usbcdc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define STR_MAN 0x01
#define STR_PROD 0x02
#define STR_SER 0x03
#define STR_IFACE 0x04

#include "usbcdc.h"

Expand Down Expand Up @@ -111,7 +112,7 @@ static const struct usb_interface_descriptor comm_iface[] = {{
.bInterfaceClass = USB_CLASS_CDC,
.bInterfaceSubClass = USB_CDC_SUBCLASS_ACM,
.bInterfaceProtocol = USB_CDC_PROTOCOL_AT,
.iInterface = 0,
.iInterface = STR_IFACE,

.endpoint = comm_endp,

Expand All @@ -128,7 +129,7 @@ static const struct usb_interface_descriptor data_iface[] = {{
.bInterfaceClass = USB_CLASS_DATA,
.bInterfaceSubClass = 0,
.bInterfaceProtocol = 0,
.iInterface = 0,
.iInterface = STR_IFACE,

.endpoint = data_endp,
}};
Expand Down Expand Up @@ -218,15 +219,17 @@ static const char *usb_strings[] = {
"dword1511.info",
"STM32 virtual serprog for flashrom",
serial,
"serprog",
};
#define N_USB_STRS sizeof(usb_strings)/sizeof(usb_strings[0])

void usbcdc_init(void) {
desig_get_unique_id_as_string(serial, UID_LEN);

#ifdef STM32F0
usbd_dev = usbd_init(&st_usbfs_v2_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&st_usbfs_v2_usb_driver, &dev, &config, usb_strings, N_USB_STRS, usbd_control_buffer, sizeof(usbd_control_buffer));
#else
usbd_dev = usbd_init(&st_usbfs_v1_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&st_usbfs_v1_usb_driver, &dev, &config, usb_strings, N_USB_STRS, usbd_control_buffer, sizeof(usbd_control_buffer));
#endif /* STM32F0 */
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
usbd_register_reset_callback(usbd_dev, cdcacm_reset);
Expand Down