From 4bf1ecc20e8dbe5310e77700318b6814c425f73a Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Wed, 11 Apr 2007 00:25:38 +0000 Subject: [PATCH] Made endianess configuration actually work. --- core/net/uipopt.h | 6 +++--- platform/apple2enh/contiki-conf.h | 2 +- platform/c64/contiki-conf.h | 2 +- platform/cooja/contiki-conf.h | 4 ++-- platform/gtk/contiki-conf.h | 2 +- platform/minimal-net/contiki-conf.h | 4 ++-- platform/minimal-ppp/contiki-conf.h | 4 ++-- platform/native/contiki-conf.h | 4 ++-- platform/netsim/contiki-conf.h | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/net/uipopt.h b/core/net/uipopt.h index 7e3354637..ebefed71f 100644 --- a/core/net/uipopt.h +++ b/core/net/uipopt.h @@ -58,7 +58,7 @@ * * This file is part of the uIP TCP/IP stack. * - * $Id: uipopt.h,v 1.3 2007/04/02 18:08:36 adamdunkels Exp $ + * $Id: uipopt.h,v 1.4 2007/04/11 00:29:12 oliverschmidt Exp $ * */ @@ -474,8 +474,8 @@ void uip_log(char *msg); /** * The byte order of the CPU architecture on which uIP is to be run. * - * This option can be either BIG_ENDIAN (Motorola byte order) or - * LITTLE_ENDIAN (Intel byte order). + * This option can be either UIP_BIG_ENDIAN (Motorola byte order) or + * UIP_LITTLE_ENDIAN (Intel byte order). * * \hideinitializer */ diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h index ff7fdea26..4485335e7 100644 --- a/platform/apple2enh/contiki-conf.h +++ b/platform/apple2enh/contiki-conf.h @@ -89,7 +89,7 @@ typedef unsigned short clock_time_t; #define UIP_CONF_MAX_CONNECTIONS 10 #define UIP_CONF_MAX_LISTENPORTS 10 #define UIP_CONF_BUFFER_SIZE (1024 - 2) -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_LOGGING 1 #define UIP_CONF_UDP_CHECKSUMS 1 diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index 01443bdc9..2f485d889 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -520,7 +520,7 @@ architecture specific files to work). */ #define UIP_CONF_BUFFER_SIZE 400 #define UIP_CONF_RECEIVE_WINDOW 320 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_ARBTAB_SIZE 4 diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h index 65eafc663..74b932998 100644 --- a/platform/cooja/contiki-conf.h +++ b/platform/cooja/contiki-conf.h @@ -32,7 +32,7 @@ * * This file is part of the Contiki desktop OS * - * $Id: contiki-conf.h,v 1.3 2006/08/30 14:48:36 fros4943 Exp $ + * $Id: contiki-conf.h,v 1.4 2007/04/11 00:26:27 oliverschmidt Exp $ * */ @@ -247,7 +247,7 @@ architecture specific files to work). */ #define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_BUFFER_SIZE 200 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_BROADCAST 1 diff --git a/platform/gtk/contiki-conf.h b/platform/gtk/contiki-conf.h index f96666ce6..7ef5ae0d0 100644 --- a/platform/gtk/contiki-conf.h +++ b/platform/gtk/contiki-conf.h @@ -140,7 +140,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_BUFFER_SIZE 420 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_TCP_SPLIT 1 diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index 095eb17d5..d5a6a7edf 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:00 oliverschmidt Exp $ + * @(#)$Id: contiki-conf.h,v 1.4 2007/04/11 00:27:17 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -52,7 +52,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 40 #define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_BUFFER_SIZE 600 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_LOGGING 1 #define UIP_CONF_UDP_CHECKSUMS 1 diff --git a/platform/minimal-ppp/contiki-conf.h b/platform/minimal-ppp/contiki-conf.h index 5976f05d0..3a2790a03 100644 --- a/platform/minimal-ppp/contiki-conf.h +++ b/platform/minimal-ppp/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:18 oliverschmidt Exp $ + * @(#)$Id: contiki-conf.h,v 1.4 2007/04/11 00:27:31 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -56,7 +56,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 40 #define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_BUFFER_SIZE 420 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_LOGGING 1 #define UIP_CONF_UDP_CHECKSUMS 1 diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index d3d7ef7bc..2151f9829 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:33 oliverschmidt Exp $ + * @(#)$Id: contiki-conf.h,v 1.4 2007/04/11 00:27:56 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -53,7 +53,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 40 #define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_BUFFER_SIZE 420 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_LOGGING 0 #define UIP_CONF_UDP_CHECKSUMS 1 diff --git a/platform/netsim/contiki-conf.h b/platform/netsim/contiki-conf.h index 3d0f01ba4..e0e9f0f38 100644 --- a/platform/netsim/contiki-conf.h +++ b/platform/netsim/contiki-conf.h @@ -32,7 +32,7 @@ * * This file is part of the Contiki desktop OS * - * $Id: contiki-conf.h,v 1.5 2007/03/29 22:24:21 adamdunkels Exp $ + * $Id: contiki-conf.h,v 1.6 2007/04/11 00:28:26 oliverschmidt Exp $ * */ @@ -103,7 +103,7 @@ typedef unsigned long clock_time_t; #define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_BUFFER_SIZE 120 -#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_BROADCAST 1