Merge pull request #128 from maidnl/usb_post_initialization_function

Usb post initialization function and tinyusb fixes

Author: facchinm

boards.txt

@@ -154,7 +154,7 @@ muxto.build.fpu=
 muxto.build.float-abi=
 
 muxto.build.board=MUXTO
-muxto.build.defines=-DF_CPU=48000000 -DFIRST_BULK_PIPE=4
+muxto.build.defines=-DF_CPU=48000000 -DFIRST_BULK_PIPE=4 -DNO_ISOCRONOUS_PIPE=1 -DNUMBER_OF_PIPES=8
 muxto.vid.0=0x2341
 muxto.pid.0=0x006C
 muxto.vid.1=0x2341

bootloaders/SCIENCE_KIT/science_kit.hex

@@ -295,6 +295,8 @@ extern "C" {
 }
 
 __attribute__((weak)) void configure_usb_mux() {}
+/* specific variant USB initialization should define this functiona in variant.cpp */
+__attribute__((weak)) void usb_post_initialization() {}
 
 void __USBStart() {
     USBIrqCfg_t usb_irq_cfg;
@@ -361,6 +363,8 @@ void __USBStart() {
     /* init device port*/
     tud_init(BOARD_TUD_RHPORT);
 
+    usb_post_initialization();
+
 #ifdef VUSB_LDO_ENABLE
     ((R_USB_FS0_Type*)R_USB_FS0_BASE)->USBMC_b.VDCEN = 1;
 #endif

cores/arduino/usb/USB.cpp

@@ -75,6 +75,11 @@ int32_t getPinIndex(bsp_io_port_pin_t p) {
 
 #include "FspTimer.h"
 
+void usb_post_initialization() {
+  ((R_USB_FS0_Type*)R_USB_FS0_BASE)->USBMC_b.VDCEN = 1;
+}
+
+
 void initVariant() {
   // bootloader configures LED_BUILTIN as PWM output, deconfigure it to avoid spurious signals
   pinMode(LED_BUILTIN, OUTPUT);

extras/tinyusb

@@ -80,6 +80,11 @@ static const ioport_cfg_t bsp_pin_cfg = {
 };
 static ioport_instance_ctrl_t ioport_ctrl;
 
+void usb_post_initialization() {
+  ((R_USB_FS0_Type*)R_USB_FS0_BASE)->USBMC_b.VDCEN = 1;
+  ((R_USB_FS0_Type*)R_USB_FS0_BASE)->SYSCFG_b.DPRPU = 1;
+}
+
 void initVariant() {
     //R_IOPORT_Open(&ioport_ctrl, &bsp_pin_cfg);
     //R_IOPORT_PinCfg(NULL, BSP_IO_PORT_09_PIN_14, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | IOPORT_PERIPHERAL_USB_FS));

variants/MINIMA/variant.cpp

@@ -104,6 +104,10 @@ void configure_usb_mux() {
 
 __attribute__((weak)) void __maybe_start_usb() {}
 
+void usb_post_initialization() {
+  ((R_USB_FS0_Type*)R_USB_FS0_BASE)->USBMC_b.VDCEN = 1;
+}
+
 void initVariant() {
   __maybe_start_usb();
   // bootloader configures LED_BUILTIN as PWM output, deconfigure it to avoid spurious signals