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

stm32/usb: Add usb mode for VCP+VCP without MSC #4712

Closed
wants to merge 2 commits into from
Closed

stm32/usb: Add usb mode for VCP+VCP without MSC #4712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5126b8
stm32/usb: Add usb mode for VCP+VCP without MSC
pi-anl Apr 26, 2019
f455ccf
stm32/usb: Automatically calculate the interface numbers used in each…
pi-anl Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions ports/stm32/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,11 @@ STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
pid = USBD_PID_CDC2_MSC;
}
mode = USBD_MODE_CDC2_MSC;
} else if (strcmp(mode_str, "CDC+CDC") == 0 || strcmp(mode_str, "VCP+VCP") == 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CDC is legacy so we don't need to add it here, VCP is enough.

if (args[2].u_int == -1) {
pid = USBD_PID_CDC2;
}
mode = USBD_MODE_CDC2;
#endif
} else if (strcmp(mode_str, "CDC+HID") == 0 || strcmp(mode_str, "VCP+HID") == 0) {
if (args[2].u_int == -1) {
Expand Down
1 change: 1 addition & 0 deletions ports/stm32/usb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#define USBD_PID_CDC (0x9802)
#define USBD_PID_MSC (0x9803)
#define USBD_PID_CDC2_MSC (0x9804)
#define USBD_PID_CDC2 (0x9805)

typedef enum {
PYB_USB_STORAGE_MEDIUM_NONE = 0,
Expand Down
87 changes: 46 additions & 41 deletions ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@
#define HID_DESC_OFFSET_POLLING_INTERVAL_OUT (31)
#define HID_SUBDESC_LEN (9)

#define CDC_IFACE_NUM_ALONE (0)
#define CDC_IFACE_NUM_WITH_MSC (1)
#define CDC2_IFACE_NUM_WITH_MSC (3)
#define CDC_IFACE_NUM_WITH_HID (1)
#define MSC_IFACE_NUM_WITH_CDC (0)
#define HID_IFACE_NUM_WITH_CDC (0)
#define HID_IFACE_NUM_WITH_MSC (1)

#define CDC_IN_EP (0x83)
#define CDC_OUT_EP (0x03)
#define CDC_CMD_EP (0x82)
Expand Down Expand Up @@ -149,7 +141,7 @@ static const uint8_t msc_class_desc_data[MSC_CLASS_DESC_SIZE] = {
// Interface Descriptor
0x09, // bLength: Interface Descriptor size
USB_DESC_TYPE_INTERFACE, // bDescriptorType: interface descriptor
MSC_IFACE_NUM_WITH_CDC, // bInterfaceNumber: Number of Interface
0x00, // bInterfaceNumber: Number of Interface -- to be filled in
0x00, // bAlternateSetting: Alternate setting
0x02, // bNumEndpoints
0x08, // bInterfaceClass: MSC Class
Expand Down Expand Up @@ -277,7 +269,7 @@ static const uint8_t hid_class_desc_data[HID_CLASS_DESC_SIZE] = {
// Interface Descriptor
0x09, // bLength: Interface Descriptor size
USB_DESC_TYPE_INTERFACE, // bDescriptorType: interface descriptor
HID_IFACE_NUM_WITH_CDC, // bInterfaceNumber: Number of Interface
0x00, // bInterfaceNumber: Number of Interface -- to be filled in
0x00, // bAlternateSetting: Alternate setting
0x02, // bNumEndpoints
0x03, // bInterfaceClass: HID Class
Expand Down Expand Up @@ -399,29 +391,32 @@ static void make_head_desc(uint8_t *dest, uint16_t len, uint8_t num_itf) {
dest[4] = num_itf; // bNumInterfaces
}

static size_t make_msc_desc(uint8_t *dest) {
static size_t make_msc_desc(uint8_t *dest, uint8_t *iface_num) {
memcpy(dest, msc_class_desc_data, sizeof(msc_class_desc_data));
dest[2] = (*iface_num)++; // bInterfaceNumber
return sizeof(msc_class_desc_data);
}

static size_t make_cdc_desc(uint8_t *dest, int need_iad, uint8_t iface_num) {
static size_t make_cdc_desc(uint8_t *dest, int need_iad, uint8_t *iface_num) {
uint8_t iface_main = (*iface_num)++;
uint8_t iface_data = (*iface_num)++;
if (need_iad) {
memcpy(dest, cdc_class_desc_data, sizeof(cdc_class_desc_data));
dest[2] = iface_num; // bFirstInterface
dest[2] = iface_main; // bFirstInterface
dest += 8;
} else {
memcpy(dest, cdc_class_desc_data + 8, sizeof(cdc_class_desc_data) - 8);
}
dest[2] = iface_num; // bInterfaceNumber, main class
dest[18] = iface_num + 1; // bDataInterface
dest[26] = iface_num + 0; // bMasterInterface
dest[27] = iface_num + 1; // bSlaveInterface
dest[37] = iface_num + 1; // bInterfaceNumber, data class
dest[2] = iface_main; // bInterfaceNumber, main class
dest[18] = iface_data; // bDataInterface
dest[26] = iface_main; // bMasterInterface
dest[27] = iface_data; // bSlaveInterface
dest[37] = iface_data; // bInterfaceNumber, data class
return need_iad ? 8 + 58 : 58;
}

#if MICROPY_HW_USB_ENABLE_CDC2
static size_t make_cdc_desc_ep(uint8_t *dest, int need_iad, uint8_t iface_num, uint8_t cmd_ep, uint8_t out_ep, uint8_t in_ep) {
static size_t make_cdc_desc_ep(uint8_t *dest, int need_iad, uint8_t *iface_num, uint8_t cmd_ep, uint8_t out_ep, uint8_t in_ep) {
size_t n = make_cdc_desc(dest, need_iad, iface_num);
if (need_iad) {
dest += 8;
Expand All @@ -433,8 +428,9 @@ static size_t make_cdc_desc_ep(uint8_t *dest, int need_iad, uint8_t iface_num, u
}
#endif

static size_t make_hid_desc(uint8_t *dest, USBD_HID_ModeInfoTypeDef *hid_info) {
static size_t make_hid_desc(uint8_t *dest, USBD_HID_ModeInfoTypeDef *hid_info, uint8_t *iface_num) {
memcpy(dest, hid_class_desc_data, sizeof(hid_class_desc_data));
dest[2] = (*iface_num)++; // bInterfaceNumber
dest[HID_DESC_OFFSET_SUBCLASS] = hid_info->subclass;
dest[HID_DESC_OFFSET_PROTOCOL] = hid_info->protocol;
dest[HID_DESC_OFFSET_REPORT_DESC_LEN] = hid_info->report_desc_len;
Expand Down Expand Up @@ -462,45 +458,54 @@ int USBD_SelectMode(usbd_cdc_msc_hid_state_t *usbd, uint32_t mode, USBD_HID_Mode
uint8_t num_itf = 0;
switch (usbd->usbd_mode) {
case USBD_MODE_MSC:
n += make_msc_desc(d + n);
num_itf = 1;
usbd->MSC_BOT_ClassData.interface = num_itf;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you really use this variable MSC_BOT_ClassData.interface safely? Note that the USB_REQ_SET_INTERFACE command will change this value... not sure what to but it might be better to use a separate (new) variable for this.

Copy link
Sponsor Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tbh this hasn't been thoroughly tested, last build I didn't have msc enabled.

n += make_msc_desc(d + n, &num_itf);
break;

case USBD_MODE_CDC_MSC:
n += make_msc_desc(d + n);
n += make_cdc_desc(d + n, 1, CDC_IFACE_NUM_WITH_MSC);
usbd->cdc->iface_num = CDC_IFACE_NUM_WITH_MSC;
num_itf = 3;
usbd->MSC_BOT_ClassData.interface = num_itf;
n += make_msc_desc(d + n, &num_itf);
usbd->cdc->iface_num = num_itf;
n += make_cdc_desc(d + n, 1, &num_itf);
break;

#if MICROPY_HW_USB_ENABLE_CDC2
case USBD_MODE_CDC2: {
// Ensure the first interface is also enabled
usbd->usbd_mode |= USBD_MODE_CDC;

usbd->cdc->iface_num = num_itf;
n += make_cdc_desc(d + n, 1, &num_itf);
usbd->cdc2->iface_num = num_itf;
n += make_cdc_desc_ep(d + n, 1, &num_itf, CDC2_CMD_EP, CDC2_OUT_EP, CDC2_IN_EP);
break;
}

case USBD_MODE_CDC2_MSC: {
n += make_msc_desc(d + n);
n += make_cdc_desc(d + n, 1, CDC_IFACE_NUM_WITH_MSC);
n += make_cdc_desc_ep(d + n, 1, CDC2_IFACE_NUM_WITH_MSC, CDC2_CMD_EP, CDC2_OUT_EP, CDC2_IN_EP);
usbd->cdc->iface_num = CDC_IFACE_NUM_WITH_MSC;
usbd->cdc2->iface_num = CDC2_IFACE_NUM_WITH_MSC;
num_itf = 5;
usbd->MSC_BOT_ClassData.interface = num_itf;
n += make_msc_desc(d + n, &num_itf);
usbd->cdc->iface_num = num_itf;
n += make_cdc_desc(d + n, 1, &num_itf);
usbd->cdc2->iface_num = num_itf;
n += make_cdc_desc_ep(d + n, 1, &num_itf, CDC2_CMD_EP, CDC2_OUT_EP, CDC2_IN_EP);
break;
}
#endif

case USBD_MODE_CDC_HID:
usbd->hid->desc = d + n;
n += make_hid_desc(d + n, hid_info);
n += make_cdc_desc(d + n, 1, CDC_IFACE_NUM_WITH_HID);
usbd->cdc->iface_num = CDC_IFACE_NUM_WITH_HID;
usbd->hid->iface_num = num_itf;
n += make_hid_desc(d + n, hid_info, &num_itf);
usbd->cdc->iface_num = num_itf;
n += make_cdc_desc(d + n, 1, &num_itf);
usbd->hid->in_ep = HID_IN_EP_WITH_CDC;
usbd->hid->out_ep = HID_OUT_EP_WITH_CDC;
usbd->hid->iface_num = HID_IFACE_NUM_WITH_CDC;
usbd->hid->report_desc = hid_info->report_desc;
num_itf = 3;
break;

case USBD_MODE_CDC:
n += make_cdc_desc(d + n, 0, CDC_IFACE_NUM_ALONE);
usbd->cdc->iface_num = CDC_IFACE_NUM_ALONE;
num_itf = 2;
usbd->cdc->iface_num = num_itf;
n += make_cdc_desc(d + n, 0, &num_itf);
break;

/*
Expand Down Expand Up @@ -712,7 +717,7 @@ static uint8_t USBD_CDC_MSC_HID_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTyp
recipient = USBD_MODE_CDC;
cdc = usbd->cdc2;
#endif
} else if ((mode & USBD_MODE_MSC) && iface == MSC_IFACE_NUM_WITH_CDC) {
} else if ((mode & USBD_MODE_MSC) && iface == usbd->MSC_BOT_ClassData.interface) {
recipient = USBD_MODE_MSC;
} else if ((mode & USBD_MODE_HID) && iface == usbd->hid->iface_num) {
recipient = USBD_MODE_HID;
Expand Down