diff options
| author | Ha Thach <[email protected]> | 2023-08-28 17:46:05 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-28 17:46:05 +0700 |
| commit | 9063ede25f4a013dae8edccc2d953ba2de7ed684 (patch) | |
| tree | 6f3b8ed3721b60955380514d414228bb567767cb /lib | |
| parent | aa0fabd51d3ed855ccb337602c6a0083bb50f648 (diff) | |
| parent | 7bf5923052e5861f54c9cb0581e328f8be26a0a9 (diff) | |
Merge branch 'master' into nxp_k64
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SEGGER_RTT/RTT/SEGGER_RTT.c | 5 | ||||
| -rw-r--r-- | lib/networking/rndis_reports.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/SEGGER_RTT/RTT/SEGGER_RTT.c b/lib/SEGGER_RTT/RTT/SEGGER_RTT.c index 730a5cfb3..811d951fd 100644 --- a/lib/SEGGER_RTT/RTT/SEGGER_RTT.c +++ b/lib/SEGGER_RTT/RTT/SEGGER_RTT.c @@ -183,6 +183,11 @@ Additional information: * ********************************************************************** */ +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wcast-qual" +#pragma GCC diagnostic ignored "-Wcast-align" +#endif + #if (defined __ICCARM__) || (defined __ICCRX__) #define RTT_PRAGMA(P) _Pragma(#P) #endif diff --git a/lib/networking/rndis_reports.c b/lib/networking/rndis_reports.c index cc14f174c..60afb8615 100644 --- a/lib/networking/rndis_reports.c +++ b/lib/networking/rndis_reports.c @@ -43,7 +43,7 @@ static usb_eth_stat_t usb_eth_stat = { 0, 0, 0, 0 }; static uint32_t oid_packet_filter = 0x0000000; static rndis_state_t rndis_state; -CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t ndis_report[8] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t ndis_report[8] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; static const uint32_t OIDSupportedList[] = { |