From 26c9ec41f7b8acf4d87df1d43541c41a9bba9062 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Sat, 30 Jan 2010 20:48:31 +0000
Subject: [PATCH] Activate uIP logging when "high level config" logging is
 enabled.

---
 cpu/6502/6502def.h                | 4 +++-
 cpu/6502/README                   | 2 +-
 platform/apple2enh/contiki-conf.h | 4 +---
 platform/c128/contiki-conf.h      | 4 +---
 platform/c64/contiki-conf.h       | 4 +---
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h
index 54d3d2a96..b429ec0e4 100644
--- a/cpu/6502/6502def.h
+++ b/cpu/6502/6502def.h
@@ -30,7 +30,7 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * @(#)$Id: 6502def.h,v 1.17 2009/03/01 12:26:53 oliverschmidt Exp $
+ * @(#)$Id: 6502def.h,v 1.18 2010/01/30 20:48:31 oliverschmidt Exp $
  */
 
 #ifndef __6502DEF_H__
@@ -68,8 +68,10 @@ typedef unsigned short uip_stats_t;
 
 #if WITH_LOGGING
 #define LOG_CONF_ENABLED 1
+#define UIP_CONF_LOGGING 1
 #else /* WITH_LOGGING */
 #define LOG_CONF_ENABLED 0
+#define UIP_CONF_LOGGING 0
 #endif /* WITH_LOGGING */
 
 #if MTU_SIZE
diff --git a/cpu/6502/README b/cpu/6502/README
index 20314fd05..837106a37 100644
--- a/cpu/6502/README
+++ b/cpu/6502/README
@@ -43,7 +43,7 @@ MTU_SIZE
 
 WITH_LOGGING
 - Default: 0
-- Purpose: Have log_message() write messages to the screen.
+- Purpose: Have log_message() and UIP_LOG() write messages to the screen.
 
 WITH_BOOST
 - Default: 0
diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h
index 5fccc5626..eba23ce59 100644
--- a/platform/apple2enh/contiki-conf.h
+++ b/platform/apple2enh/contiki-conf.h
@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.15 2009/10/18 09:33:08 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.16 2010/01/30 20:48:31 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -40,8 +40,6 @@
 
 #include "pfs.h"
 
-#define UIP_CONF_LOGGING 0
-
 #define CTK_CONF_MENU_KEY         CH_ESC
 #define CTK_CONF_WINDOWSWITCH_KEY 0x17	/* Ctrl-W */
 #define CTK_CONF_WIDGETUP_KEY     0x01	/* Ctrl-A */
diff --git a/platform/c128/contiki-conf.h b/platform/c128/contiki-conf.h
index dcb36fc9c..59a114908 100644
--- a/platform/c128/contiki-conf.h
+++ b/platform/c128/contiki-conf.h
@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.2 2009/10/18 09:33:08 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.3 2010/01/30 20:48:31 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -38,8 +38,6 @@
 
 #include "6502def.h"
 
-#define UIP_CONF_LOGGING 0
-
 #define CTK_CONF_MENU_KEY         CH_F1
 #define CTK_CONF_WINDOWSWITCH_KEY CH_F3
 #define CTK_CONF_WIDGETUP_KEY     CH_F5
diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h
index 4ee83237e..32072b0e3 100644
--- a/platform/c64/contiki-conf.h
+++ b/platform/c64/contiki-conf.h
@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.16 2009/10/18 09:33:08 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.17 2010/01/30 20:48:31 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -38,8 +38,6 @@
 
 #include "6502def.h"
 
-#define UIP_CONF_LOGGING 0
-
 #define CTK_CONF_MENU_KEY         CH_F1
 #define CTK_CONF_WINDOWSWITCH_KEY CH_F3
 #define CTK_CONF_WIDGETUP_KEY     CH_F5