Skip to content

Commit 90db9c0

Browse files
author
Mika Leppänen
committed
Corrected IAR compilation and removed compiler warnings
1 parent 30b6d23 commit 90db9c0

File tree

2 files changed

+3
-21
lines changed
  • features/FEATURE_LWIP/lwip-interface

2 files changed

+3
-21
lines changed

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ err_t k64f_etharp_output_ipv6(struct netif *netif, struct pbuf *q, const ip6_add
296296
* \param[in] action
297297
* \return ERR_OK or error code
298298
*/
299-
err_t igmp_mac_filter(struct netif *netif, const ip4_addr_t *group, u8_t action)
299+
err_t igmp_mac_filter(struct netif *netif, const ip4_addr_t *group, enum netif_mac_filter_action action)
300300
{
301301
switch (action) {
302302
case NETIF_ADD_MAC_FILTER:
@@ -330,7 +330,7 @@ err_t igmp_mac_filter(struct netif *netif, const ip4_addr_t *group, u8_t action)
330330
* \param[in] action
331331
* \return ERR_OK or error code
332332
*/
333-
err_t mld_mac_filter(struct netif *netif, const ip6_addr_t *group, u8_t action)
333+
err_t mld_mac_filter(struct netif *netif, const ip6_addr_t *group, enum netif_mac_filter_action action)
334334
{
335335
switch (action) {
336336
case NETIF_ADD_MAC_FILTER:

features/FEATURE_LWIP/lwip-interface/lwip-sys/arch/cc.h

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,6 @@
3535
#include <stdint.h>
3636
#include <stddef.h> /* for size_t */
3737

38-
/* Types based on stdint.h */
39-
typedef uint8_t u8_t;
40-
typedef int8_t s8_t;
41-
typedef uint16_t u16_t;
42-
typedef int16_t s16_t;
43-
typedef uint32_t u32_t;
44-
typedef int32_t s32_t;
45-
typedef uintptr_t mem_ptr_t;
46-
47-
/* Define (sn)printf formatters for these lwIP types */
48-
#define U16_F "hu"
49-
#define S16_F "hd"
50-
#define X16_F "hx"
51-
#define U32_F "lu"
52-
#define S32_F "ld"
53-
#define X32_F "lx"
54-
#define SZT_F "uz"
55-
5638
/* ARM/LPC17xx is little endian only */
5739
#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
5840
#ifdef BYTE_ORDER
@@ -97,7 +79,7 @@ typedef uintptr_t mem_ptr_t;
9779
#define LWIP_CHKSUM_ALGORITHM 0
9880

9981
void* thumb2_memcpy(void* pDest, const void* pSource, size_t length);
100-
u16_t thumb2_checksum(const void* pData, int length);
82+
uint16_t thumb2_checksum(const void* pData, int length);
10183
#else
10284
/* Used with IP headers only */
10385
#define LWIP_CHKSUM_ALGORITHM 1

0 commit comments

Comments
 (0)