From 27ffeae406e56e7435ee8bb10c87de8fbca64747 Mon Sep 17 00:00:00 2001 From: proff_fs Date: Fri, 21 Mar 2003 16:56:05 +0000 Subject: [PATCH] Fixed compilation. --- ports/msvc6/include/arch/cc.h | 25 ++++++++++++++++++-- ports/msvc6/include/arch/cpu.h | 39 ------------------------------- ports/msvc6/include/arch/init.h | 41 --------------------------------- ports/msvc6/include/arch/lib.h | 37 ----------------------------- ports/msvc6/lwip4.dsp | 4 ++++ ports/msvc6/lwipopts.h | 2 +- ports/msvc6/pktif.c | 5 ++++ ports/msvc6/test.c | 2 +- 8 files changed, 34 insertions(+), 121 deletions(-) delete mode 100644 ports/msvc6/include/arch/cpu.h delete mode 100644 ports/msvc6/include/arch/init.h delete mode 100644 ports/msvc6/include/arch/lib.h diff --git a/ports/msvc6/include/arch/cc.h b/ports/msvc6/include/arch/cc.h index 87fb3ba..97f641f 100644 --- a/ports/msvc6/include/arch/cc.h +++ b/ports/msvc6/include/arch/cc.h @@ -32,10 +32,17 @@ #ifndef __ARCH_CC_H__ #define __ARCH_CC_H__ +/* Include some files for defining library routines */ +#include + +/* Define platform endianness */ +#ifndef BYTE_ORDER +#define BYTE_ORDER LITTLE_ENDIAN +#endif /* BYTE_ORDER */ + +/* Define generic types used in lwIP */ typedef unsigned char u8_t; typedef signed char s8_t; -/*typedef unsigned short u8_t; - typedef signed short s8_t; */ typedef unsigned short u16_t; typedef signed short s16_t; typedef unsigned long u32_t; @@ -43,9 +50,23 @@ typedef signed long s32_t; typedef u32_t mem_ptr_t; +/* Compiler hints for packing structures */ #define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_STRUCT #pragma warning(disable: 4103) #define PACK_STRUCT_USE_INCLUDES +/* prototypes for printf() and abort() */ +#include +#include +/* Plaform specific diagnostic output */ +#define LWIP_PLATFORM_DIAG(x) do {printf x;} while(0) + +#define LWIP_PLATFORM_ASSERT(x) do {printf("Assertion \"%s\" failed at line %d in %s\n", \ + x, __LINE__, __FILE__); fflush(NULL); abort();} while(0) + +#define SYS_ARCH_DECL_PROTECT(x) +#define SYS_ARCH_PROTECT(x) +#define SYS_ARCH_UNPROTECT(x) + #endif /* __ARCH_CC_H__ */ diff --git a/ports/msvc6/include/arch/cpu.h b/ports/msvc6/include/arch/cpu.h deleted file mode 100644 index b05112f..0000000 --- a/ports/msvc6/include/arch/cpu.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2001-2003 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the lwIP TCP/IP stack. - * - * Author: Adam Dunkels - * - */ -#ifndef __ARCH_CPU_H__ -#define __ARCH_CPU_H__ - -#ifndef BYTE_ORDER -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* BYTE_ORDER */ - -#endif /* __ARCH_CPU_H__ */ diff --git a/ports/msvc6/include/arch/init.h b/ports/msvc6/include/arch/init.h deleted file mode 100644 index 5f9277a..0000000 --- a/ports/msvc6/include/arch/init.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2001-2003 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the lwIP TCP/IP stack. - * - * Author: Adam Dunkels - * - */ -#ifndef __ARCH_INIT_H__ -#define __ARCH_INIT_H__ - -#define TCPIP_INIT_DONE(arg) sys_sem_signal(*(sys_sem_t *)arg) - -#endif /* __ARCH_INIT_H__ */ - - - - diff --git a/ports/msvc6/include/arch/lib.h b/ports/msvc6/include/arch/lib.h deleted file mode 100644 index f84de67..0000000 --- a/ports/msvc6/include/arch/lib.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2001-2003 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the lwIP TCP/IP stack. - * - * Author: Adam Dunkels - * - */ -#ifndef __ARCH_LIB_H__ -#define __ARCH_LIB_H__ - -#include - -#endif /* __ARCH_LIB_H__ */ diff --git a/ports/msvc6/lwip4.dsp b/ports/msvc6/lwip4.dsp index acd379a..fdd491b 100644 --- a/ports/msvc6/lwip4.dsp +++ b/ports/msvc6/lwip4.dsp @@ -101,6 +101,10 @@ SOURCE="$(LWIP_SRC)\core\ipv4\ip_addr.c" # End Source File # Begin Source File +SOURCE="$(LWIP_SRC)\core\ipv4\ip_frag.c" +# End Source File +# Begin Source File + SOURCE="$(LWIP_SRC)\core\mem.c" # End Source File # Begin Source File diff --git a/ports/msvc6/lwipopts.h b/ports/msvc6/lwipopts.h index 3fabbc5..791e105 100644 --- a/ports/msvc6/lwipopts.h +++ b/ports/msvc6/lwipopts.h @@ -146,7 +146,7 @@ a lot of data that needs to be copied, this should be set high. */ #define DHCP_DOES_ARP_CHECK 1 /* ---------- UDP options ---------- */ -#define LWIP_UDP 0 +#define LWIP_UDP 1 #define UDP_TTL 255 diff --git a/ports/msvc6/pktif.c b/ports/msvc6/pktif.c index 8d1dd27..58f5916 100644 --- a/ports/msvc6/pktif.c +++ b/ports/msvc6/pktif.c @@ -63,6 +63,11 @@ */ #define WIN32_LEAN_AND_MEAN +/* get the windows definitions of the following 4 functions out of the way */ +#define htons win_htons +#define ntohs win_ntons +#define htonl win_htonl +#define ntohl win_ntonl #include #include #include diff --git a/ports/msvc6/test.c b/ports/msvc6/test.c index cb1c2a4..bf88818 100644 --- a/ports/msvc6/test.c +++ b/ports/msvc6/test.c @@ -123,7 +123,7 @@ void main_loop() if (init_adapter() != 0) return; - netif_set_default(netif_add(&ipaddr, &netmask, &gw, ethernetif_init, + netif_set_default(netif_add(&ipaddr, &netmask, &gw, NULL, ethernetif_init, ip_input)); /*