stm32/usb: Add usb mode for VCP+VCP without MSC #4712
Conversation
|
+1 for the need of a dual cdc mode without msc |
|
Thanks for this, it looks pretty good!
I think I'll have a go at optimising the existing code so it doesn't duplicate these templates everywhere, then hopefully the PR here can be a lot simpler. |
See #4721 |
pi-anl
force-pushed
the
stm32_usb_cdc2_only
branch
from
e845c0a
to
f455ccf
Compare
|
Ok, as a bonus/bloat I've tacked this on here as well for now: f455ccf It automatically tracks the appropriate interface number for each definition, making it even easier to add any new mix of descriptors. It does add a little more code size again though, so up to you if you think it adds enough value. |
I did consider this but didn't go as far as implementing it. I didn't want to have too much code increase. But maybe it's worth it to simplify the configuration. |
| @@ -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) { | |||
There was a problem hiding this comment.
CDC is legacy so we don't need to add it here, VCP is enough.
| @@ -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; | |||
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Tbh this hasn't been thoroughly tested, last build I didn't have msc enabled.
|
Thinking about it more, I'm not sure the interface counting is really with it yet. It doesn't actually simplify things much, certainly not compared to your change which was a dramatic improvement for the code size cost. I would hold off on my second commit, perhaps it can be the start of a bigger dynamic improvement later |
|
Ok I'll just go for the VCP+VCP commit. |
|
The VCP+VCP commit/feature was merged in 70a28e3 |
Build an aarch64 version of mpy-cross
When
MICROPY_HW_USB_ENABLE_CDC2is enabled, this allows a usb mode ofVCP+VCPrather than just the existingVCP+VCP+MSCfor situation where two serial ports are desired, but mass storage is not.I found it rather difficult to modify an existing configuration similar to the way the current CDC2 config was added onto VCP+MSC at runtime, so this includes a complete new template struct.