From fda38428d9abef50fb1284827b292210139312fa Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sun, 23 Dec 2007 13:55:38 +0000 Subject: [PATCH] Introduced some more high-level config macros. --- cpu/6502/6502def.h | 14 +++++++++++++- platform/apple2enh/contiki-conf.h | 6 ++---- platform/c64/contiki-conf.h | 6 ++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h index 2a5f94621..3700e62f1 100644 --- a/cpu/6502/6502def.h +++ b/cpu/6502/6502def.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * @(#)$Id: 6502def.h,v 1.5 2007/12/23 12:32:43 oliverschmidt Exp $ + * @(#)$Id: 6502def.h,v 1.6 2007/12/23 13:55:38 oliverschmidt Exp $ */ #ifndef __6502DEF_H__ @@ -60,6 +60,18 @@ typedef unsigned short uip_stats_t; #define UIP_ARCH_ADD32 1 #define UIP_ARCH_CHKSUM 1 +#if MTU_SIZE +#define UIP_CONF_BUFFER_SIZE (UIP_LLH_LEN + MTU_SIZE) +#else /* MTU_SIZE */ +#define UIP_CONF_BUFFER_SIZE (UIP_LLH_LEN + 1500) +#endif /* MTU_SIZE */ + +#if WITH_BOOST +#define UIP_CONF_TCP_SPLIT 1 +#else /* WITH_BOOST */ +#define UIP_CONF_TCP_SPLIT 0 +#endif /* WITH_BOOST */ + #if WITH_CLIENT #define UIP_CONF_ACTIVE_OPEN 1 #else /* WITH_CLIENT */ diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h index 65d2080c1..254ee7740 100644 --- a/platform/apple2enh/contiki-conf.h +++ b/platform/apple2enh/contiki-conf.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-conf.h,v 1.10 2007/12/23 12:36:41 oliverschmidt Exp $ + * $Id: contiki-conf.h,v 1.11 2007/12/23 13:57:08 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -40,9 +40,7 @@ #define LOG_CONF_ENABLED 1 -#define UIP_CONF_BUFFER_SIZE 1500 -#define UIP_CONF_TCP_SPLIT 1 -#define UIP_CONF_LOGGING 1 +#define UIP_CONF_LOGGING 0 #define CTK_CONF_MENU_KEY CH_ESC #define CTK_CONF_WINDOWSWITCH_KEY 0x17 /* Ctrl-W */ diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index 86642dc65..419d2219f 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-conf.h,v 1.13 2007/12/23 12:38:09 oliverschmidt Exp $ + * $Id: contiki-conf.h,v 1.14 2007/12/23 13:57:25 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -40,9 +40,7 @@ #define LOG_CONF_ENABLED 1 -#define UIP_CONF_BUFFER_SIZE 1500 -#define UIP_CONF_TCP_SPLIT 1 -#define UIP_CONF_LOGGING 1 +#define UIP_CONF_LOGGING 0 #define CTK_CONF_MENU_KEY CH_F1 #define CTK_CONF_WINDOWSWITCH_KEY CH_F3