stm32/usb: Add support for using TinyUSB stack by default.

Signed-off-by: Andrew Leech <andrew@alelec.net>

Author: pi-anl

ports/stm32/Makefile

@@ -258,6 +258,10 @@ SRC_C += \
 	usbd.c \
 	usbd_conf.c \
 	usb.c \
+	usbd_desc.c \
+	usbd_cdc_interface.c \
+	usbd_hid_interface.c \
+	usbd_msc_interface.c \
 	mphalport.c \
 	mpnetworkport.c \
 	mpthreadport.c \
@@ -432,6 +436,15 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
+USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
+	core/src/usbd_core.c \
+	core/src/usbd_ctlreq.c \
+	core/src/usbd_ioreq.c \
+	class/src/usbd_cdc_msc_hid.c \
+	class/src/usbd_msc_bot.c \
+	class/src/usbd_msc_scsi.c \
+	)
+
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 LIB_SRC_C += mbedtls/mbedtls_port.c
 endif

ports/stm32/mpconfigboard_common.h

@@ -111,7 +111,7 @@
 #define MICROPY_HW_USB_FS (1)
 
 #ifndef MICROPY_HW_TINYUSB_STACK
-#define MICROPY_HW_TINYUSB_STACK (MICROPY_HW_ENABLE_USB)
+#define MICROPY_HW_TINYUSB_STACK (0)
 #endif
 
 // Whether to enable the PA0-PA3 servo driver, exposed as pyb.Servo
@@ -677,10 +677,10 @@
 #define MICROPY_HW_USB_CDC_NUM (1)
 #endif
 #ifndef MICROPY_HW_USB_MSC
-#define MICROPY_HW_USB_MSC (0)
+#define MICROPY_HW_USB_MSC (MICROPY_HW_ENABLE_USB && !MICROPY_HW_TINYUSB_STACK)
 #endif
 #ifndef MICROPY_HW_USB_HID
-#define MICROPY_HW_USB_HID (0)
+#define MICROPY_HW_USB_HID (MICROPY_HW_ENABLE_USB && !MICROPY_HW_TINYUSB_STACK)
 #endif
 
 // Pin definition header file

ports/stm32/usb.h

@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_USB_H
 #define MICROPY_INCLUDED_STM32_USB_H
 
-// #include "usbd_cdc_msc_hid0.h"
+#include "usbd_cdc_msc_hid0.h"
 
 #define PYB_USB_FLAG_USB_MODE_CALLED    (0x0002)
 
@@ -56,7 +56,7 @@ MP_DECLARE_CONST_FUN_OBJ_1(pyb_hid_send_report_obj); // deprecated
 
 void pyb_usb_init0(void);
 int pyb_usb_dev_detect(void);
-// bool pyb_usb_dev_init(int dev_id, uint16_t vid, uint16_t pid, uint8_t mode, size_t msc_n, const void *msc_unit, USBD_HID_ModeInfoTypeDef *hid_info);
+bool pyb_usb_dev_init(int dev_id, uint16_t vid, uint16_t pid, uint8_t mode, size_t msc_n, const void *msc_unit, USBD_HID_ModeInfoTypeDef *hid_info);
 void pyb_usb_dev_deinit(void);
 bool usb_vcp_is_enabled(void);
 int usb_vcp_recv_byte(uint8_t *c); // if a byte is available, return 1 and put the byte in *c, else return 0