diff options
| author | hathach <[email protected]> | 2014-03-14 10:19:44 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-14 10:19:44 +0700 |
| commit | 214af7e9885f100d4f4d1882e9305899b6afc2b7 (patch) | |
| tree | 2758f140eb1bdbcda18108671afc5d8b822b0cea /tinyusb | |
| parent | 97cce2fa58fef84b58808f1861767a4c05dea8e7 (diff) | |
zero warnings compiling host os none on keil
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/class/msc_host.h | 2 | ||||
| -rw-r--r-- | tinyusb/hal/hal_lpc175x_6x.c | 8 | ||||
| -rw-r--r-- | tinyusb/hal/hal_lpc175x_6x.h | 1 |
3 files changed, 6 insertions, 5 deletions
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 |