Skip to content

Commit 691fc55

Browse files
author
Antti Kauppila
committed
Fix build issue
1 parent d34a40a commit 691fc55

File tree

2 files changed

+43
-39
lines changed

2 files changed

+43
-39
lines changed

features/lwipstack/lwip-sys/arch/cc.h

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
1-
/*
2-
* Copyright (c) 2001-2003 Swedish Institute of Computer Science.
3-
* All rights reserved.
4-
*
5-
* Redistribution and use in source and binary forms, with or without modification,
6-
* are permitted provided that the following conditions are met:
7-
*
8-
* 1. Redistributions of source code must retain the above copyright notice,
9-
* this list of conditions and the following disclaimer.
10-
* 2. Redistributions in binary form must reproduce the above copyright notice,
11-
* this list of conditions and the following disclaimer in the documentation
12-
* and/or other materials provided with the distribution.
13-
* 3. The name of the author may not be used to endorse or promote products
14-
* derived from this software without specific prior written permission.
15-
*
16-
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18-
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
19-
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20-
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
21-
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24-
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
25-
* OF SUCH DAMAGE.
26-
*
27-
* This file is part of the lwIP TCP/IP stack.
28-
*
29-
* Author: Adam Dunkels <[email protected]>
30-
*
31-
*/
32-
#ifndef __CC_H__
33-
#define __CC_H__
1+
/*
2+
* Copyright (c) 2001-2003 Swedish Institute of Computer Science.
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without modification,
6+
* are permitted provided that the following conditions are met:
7+
*
8+
* 1. Redistributions of source code must retain the above copyright notice,
9+
* this list of conditions and the following disclaimer.
10+
* 2. Redistributions in binary form must reproduce the above copyright notice,
11+
* this list of conditions and the following disclaimer in the documentation
12+
* and/or other materials provided with the distribution.
13+
* 3. The name of the author may not be used to endorse or promote products
14+
* derived from this software without specific prior written permission.
15+
*
16+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17+
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18+
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
19+
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
21+
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24+
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
25+
* OF SUCH DAMAGE.
26+
*
27+
* This file is part of the lwIP TCP/IP stack.
28+
*
29+
* Author: Adam Dunkels <[email protected]>
30+
*
31+
*/
32+
#ifndef __CC_H__
33+
#define __CC_H__
3434

3535
#include <stdint.h>
3636
#include <stddef.h> /* for size_t */
3737
#include "mbed_toolchain.h"
38+
#include "lwipopts.h"
3839

3940
#ifdef __cplusplus
4041
extern "C" {
@@ -60,22 +61,22 @@ extern "C" {
6061
#define PACK_STRUCT_END
6162
#define PACK_STRUCT_FIELD(fld) fld
6263
#define ALIGNED(n) __align(n)
63-
#elif defined (__IAR_SYSTEMS_ICC__)
64+
#elif defined (__IAR_SYSTEMS_ICC__)
6465
/* IAR Embedded Workbench tools */
6566
#define PACK_STRUCT_BEGIN __packed
6667
#define PACK_STRUCT_STRUCT
6768
#define PACK_STRUCT_END
6869
#define PACK_STRUCT_FIELD(fld) fld
6970
#define IAR_STR(a) #a
7071
#define ALIGNED(n) _Pragma(IAR_STR(data_alignment= ## n ##))
71-
#else
72+
#else
7273
/* GCC tools (CodeSourcery) */
7374
#define PACK_STRUCT_BEGIN
7475
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
7576
#define PACK_STRUCT_END
7677
#define PACK_STRUCT_FIELD(fld) fld
7778
#define ALIGNED(n) __attribute__((aligned (n)))
78-
#endif
79+
#endif
7980

8081
/* Provide Thumb-2 routines for GCC to improve performance */
8182
#if defined(TOOLCHAIN_GCC) && defined(__thumb2__)
@@ -117,7 +118,7 @@ MBED_NORETURN void assert_printf(const char *msg, int line, const char *file);
117118
#define LWIP_PLATFORM_DIAG(vars) printf vars
118119
#define LWIP_PLATFORM_ASSERT(flag) { assert_printf((flag), __LINE__, __FILE__); }
119120
#endif // MBED_CONF_LWIP_USE_MBED_TRACE
120-
#endif
121+
#endif
121122

122123
#if TRACE_TO_ASCII_HEX_DUMP
123124
#define TRACE_TO_ASCII_HEX_DUMPF(prefix, len, data) trace_to_ascii_hex_dump(prefix, len, data)
@@ -182,4 +183,4 @@ SET_MEMP_SECTION(memp_memory_TCPIP_MSG_API_base);
182183
}
183184
#endif
184185

185-
#endif /* __CC_H__ */
186+
#endif /* __CC_H__ */

features/lwipstack/lwipopts.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@
7171
#error "Either IPv4 or IPv6 must be preferred."
7272
#endif
7373

74-
#define LWIP_DEBUG MBED_CONF_LWIP_DEBUG_ENABLED
74+
#undef LWIP_DEBUG
75+
#if MBED_CONF_LWIP_DEBUG_ENABLED
76+
#define LWIP_DEBUG 1
77+
#endif
7578

7679
#if NO_SYS == 0
7780
#include "cmsis_os2.h"

0 commit comments

Comments
 (0)