diff options
| author | hathach <[email protected]> | 2013-06-03 15:56:14 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-06-03 15:56:14 +0700 |
| commit | 9f9adca03b97874754075b9c1a4612c2be1e5f07 (patch) | |
| tree | 2397037b16feb292b371a848dfe947f370624252 /tinyusb/device | |
| parent | 52f18f37848615b9ebe8d749c16eea114b24f524 (diff) | |
add TUSB_CFG_PROUDCT_ID check
move USB_MAX_EP_NUM to device dependency
- lpc43 --> 6
- lpc11/13 --> 5
Diffstat (limited to 'tinyusb/device')
| -rw-r--r-- | tinyusb/device/dcd_nxp_romdriver.h | 12 | ||||
| -rw-r--r-- | tinyusb/device/romdriver/mw_usbd_core.h | 2 | ||||
| -rw-r--r-- | tinyusb/device/usbd.h | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/tinyusb/device/dcd_nxp_romdriver.h b/tinyusb/device/dcd_nxp_romdriver.h index 4143805e7..e33c45186 100644 --- a/tinyusb/device/dcd_nxp_romdriver.h +++ b/tinyusb/device/dcd_nxp_romdriver.h @@ -47,22 +47,28 @@ #define _TUSB_DCD_NXP_ROMDRIVER_H_ #include "common/common.h" -#include "romdriver/mw_usbd_rom_api.h" #ifdef __cplusplus extern "C" { #endif + +#define USB_MAX_IF_NUM 8 // maximum interface number supported, should be fixed to 8 + #if (MCU == MCU_LPC18XX) || (MCU == MCU_LPC43XX) #include "dcd_lpc18xx_lpc43xx.h" - #define ROM_API ( * ((USBD_API_T**) NXP_ROMDRIVER_FUNCTION_ADDR) ) + #define ROM_API ( * ((USBD_API_T**) NXP_ROMDRIVER_FUNCTION_ADDR) ) + #define USB_MAX_EP_NUM 6 #elif (MCU == MCU_LPC13UXX) || (MCU == MCU_LPC11UXX) #include "dcd_lpc11uxx_lpc13xx.h" - #define ROM_API ( * (*((USBD_API_T***) NXP_ROMDRIVER_FUNCTION_ADDR)) ) + #define ROM_API ( * (*((USBD_API_T***) NXP_ROMDRIVER_FUNCTION_ADDR)) ) + #define USB_MAX_EP_NUM 5 #else #error forgot something, thach ? #endif +#include "romdriver/mw_usbd_rom_api.h" + extern USBD_HANDLE_T romdriver_hdl; #ifdef __cplusplus diff --git a/tinyusb/device/romdriver/mw_usbd_core.h b/tinyusb/device/romdriver/mw_usbd_core.h index fa1995bcb..dddbbb51b 100644 --- a/tinyusb/device/romdriver/mw_usbd_core.h +++ b/tinyusb/device/romdriver/mw_usbd_core.h @@ -26,7 +26,7 @@ #include "error.h" #include "mw_usbd.h" -#include "tusb_option.h" +#include "../dcd_nxp_romdriver.h" /** \file * \brief ROM API for USB device stack. diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h index 8da6da229..4f5e53e0a 100644 --- a/tinyusb/device/usbd.h +++ b/tinyusb/device/usbd.h @@ -51,7 +51,10 @@ //--------------------------------------------------------------------+ #include "common/common.h" #include "osal/osal.h" // TODO refractor move to common.h ? + +#ifdef _TINY_USB_SOURCE_FILE_ #include "dcd.h" // TODO hide from application include +#endif //#include "tusb_descriptors.h" #ifdef __cplusplus |