diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index 4790d5e0a..d54fd60d0 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -928,10 +928,10 @@ 1 0 0 - 12 + 1 0 - 141 - 160 + 122 + 142 0 ..\src\msc_app.c msc_app.c @@ -1018,8 +1018,8 @@ 0 0 0 - 0 - 0 + 147 + 166 0 ..\..\..\tinyusb\host\hub.c hub.c @@ -1114,7 +1114,7 @@ 0 17 0 - 31 + 32 45 0 ..\..\..\tinyusb\hal\hal_lpc175x_6x.c @@ -1160,10 +1160,10 @@ 1 0 0 - 6 + 0 0 - 250 - 271 + 1 + 34 0 ..\..\..\tinyusb\class\cdc_host.c cdc_host.c @@ -1210,8 +1210,8 @@ 0 0 0 - 359 - 380 + 1 + 1 0 ..\..\..\tinyusb\class\msc_host.c msc_host.c @@ -1306,7 +1306,7 @@ 0 63 0 - 583 + 584 605 0 ..\..\..\tinyusb\host\ohci\ohci.c diff --git a/tinyusb/class/msc_host.h b/tinyusb/class/msc_host.h index 3dcf18704..46ee139dd 100644 --- a/tinyusb/class/msc_host.h +++ b/tinyusb/class/msc_host.h @@ -139,7 +139,7 @@ tusb_error_t tusbh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buf * \retval TUSB_ERROR_INVALID_PARA if input parameters are not correct * \note This function is non-blocking and returns immediately. The result of USB transfer will be reported by the interface's callback function */ -tusb_error_t tusbh_msc_request_sense(uint8_t dev_addr, uint8_t lun, uint8_t *p_data) ATTR_WARN_UNUSED_RESULT; +tusb_error_t tusbh_msc_request_sense(uint8_t dev_addr, uint8_t lun, uint8_t *p_data); /** \brief Perform SCSI TEST UNIT READY command to test if MassStorage device is ready * \param[in] dev_addr device address diff --git a/tinyusb/hal/hal_lpc175x_6x.c b/tinyusb/hal/hal_lpc175x_6x.c index bb840a40d..c04b1660c 100644 --- a/tinyusb/hal/hal_lpc175x_6x.c +++ b/tinyusb/hal/hal_lpc175x_6x.c @@ -47,11 +47,13 @@ tusb_error_t hal_init(void) { enum { - USBCLK_DEVCIE = 0x12, // AHB + Device - USBCLK_HOST = 0x19 // AHB + Host + OTG (!) + USBCLK_DEVCIE = 0x12, // AHB + Device + USBCLK_HOST = 0x19, // AHB + Host + OTG (!) + + PCONP_PCUSB = BIT_(31) }; - LPC_SC->PCONP |= CLKPWR_PCONP_PCUSB; // enable USB Peripherals + LPC_SC->PCONP |= PCONP_PCUSB; // enable USB Peripherals //------------- user manual 11.13 usb device controller initialization -------------// PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 0, .Pinnum = 29, .Funcnum = 1} ); // P0.29 as D+ diff --git a/tinyusb/hal/hal_lpc175x_6x.h b/tinyusb/hal/hal_lpc175x_6x.h index 47b38747b..e0ab4f59a 100644 --- a/tinyusb/hal/hal_lpc175x_6x.h +++ b/tinyusb/hal/hal_lpc175x_6x.h @@ -47,7 +47,6 @@ #define _TUSB_HAL_LPC175X_6X_H_ #include "LPC17xx.h" -#include "lpc17xx_clkpwr.h" #include "lpc17xx_pinsel.h" #ifdef __cplusplus