diff options
| author | hathach <[email protected]> | 2021-12-29 18:27:29 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-12-29 18:27:29 +0700 |
| commit | 30aba24ddc0d25dfa796de3a5d3857a13d440f5e (patch) | |
| tree | 8cbb988ba6ca126b330cf1fb59a903dbcbee5c90 /src/device | |
| parent | a6789b5d5a3c9e41771e5eb8fdb08182c95fbe08 (diff) | |
| parent | 527036b1f5a3f0aa3994f62e3ab18fa990a40cf8 (diff) | |
Merge branch 'master' of https://github.com/t123yh/tinyusb into t123yh-master
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/dcd.h | 4 | ||||
| -rw-r--r-- | src/device/dcd_attr.h | 4 | ||||
| -rw-r--r-- | src/device/usbd.c | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/device/dcd.h b/src/device/dcd.h index c042cc708..fbcef40d4 100644 --- a/src/device/dcd.h +++ b/src/device/dcd.h @@ -106,12 +106,12 @@ typedef struct TU_ATTR_ALIGNED(4) void dcd_init (uint8_t rhport); // Interrupt Handler -#if __GNUC__ +#if __GNUC__ && !defined(__ARMCC_VERSION) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wredundant-decls" #endif void dcd_int_handler(uint8_t rhport); -#if __GNUC__ +#if __GNUC__ && !defined(__ARMCC_VERSION) #pragma GCC diagnostic pop #endif diff --git a/src/device/dcd_attr.h b/src/device/dcd_attr.h index 3c5dadaf4..695a4a05a 100644 --- a/src/device/dcd_attr.h +++ b/src/device/dcd_attr.h @@ -197,6 +197,10 @@ #elif TU_CHECK_MCU(OPT_MCU_XMC4000) #define DCD_ATTR_ENDPOINT_MAX 8 +//------------ Allwinner -------------// +#elif TU_CHECK_MCU(OPT_MCU_F1C100S) + #define DCD_ATTR_ENDPOINT_MAX 4 + #else #warning "DCD_ATTR_ENDPOINT_MAX is not defined for this MCU, default to 8" #define DCD_ATTR_ENDPOINT_MAX 8 diff --git a/src/device/usbd.c b/src/device/usbd.c index 6a5210b34..0e31f47c7 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -44,6 +44,11 @@ #define CFG_TUD_TASK_QUEUE_SZ 16 #endif +#ifdef __ARMCC_VERSION +// Supress "statement is unreachable" warning +#pragma diag_suppress 111 +#endif + //--------------------------------------------------------------------+ // Device Data //--------------------------------------------------------------------+ |