From 48609fb3a3bc0a7400edb4efa679709c73aad19d Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Sun, 13 Aug 2006 15:06:08 +0000
Subject: [PATCH] Added defines for declaring functions/data which are part of
 the CCI (Contiki Core Interface) and CLI (Contiki Loadable Interface). Both
 defines are empty for all platforms but the upcoming Win32 port.

---
 platform/c64/contiki-conf.h         | 5 +++++
 platform/esb/contiki-conf.h         | 2 ++
 platform/ethernut1/contiki-conf.h   | 3 +++
 platform/ethernut2/contiki-conf.h   | 3 +++
 platform/gtk/contiki-conf.h         | 5 +++++
 platform/minimal-net/contiki-conf.h | 5 ++++-
 platform/minimal-ppp/contiki-conf.h | 5 ++++-
 platform/native/contiki-conf.h      | 5 ++++-
 platform/netsim/contiki-conf.h      | 5 ++++-
 platform/sky/contiki-conf.h         | 5 ++++-
 10 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h
index 3248dd4c5..29293ffe0 100644
--- a/platform/c64/contiki-conf.h
+++ b/platform/c64/contiki-conf.h
@@ -267,6 +267,11 @@
 
 #define CC_CONF_FASTCALL               fastcall
 
+/* Interface configuration. */
+
+#define CCI
+#define CLI
+
 /* Clock configuration. */
 
 #include <time.h>
diff --git a/platform/esb/contiki-conf.h b/platform/esb/contiki-conf.h
index 41a452a78..e5737c090 100644
--- a/platform/esb/contiki-conf.h
+++ b/platform/esb/contiki-conf.h
@@ -22,6 +22,8 @@
 
 #define CC_CONF_VA_ARGS                1
 
+#define CCI
+#define CLI
 
 typedef unsigned short clock_time_t;
 #define CLOCK_CONF_SECOND 8
diff --git a/platform/ethernut1/contiki-conf.h b/platform/ethernut1/contiki-conf.h
index a809bb45b..d174a8db3 100644
--- a/platform/ethernut1/contiki-conf.h
+++ b/platform/ethernut1/contiki-conf.h
@@ -4,6 +4,9 @@
 #define CC_CONF_REGISTER_ARGS          1
 #define CC_CONF_FUNCTION_POINTER_ARGS  1
 
+#define CCI
+#define CLI
+
 typedef unsigned short clock_time_t;
 #define CLOCK_CONF_SECOND 1000
 
diff --git a/platform/ethernut2/contiki-conf.h b/platform/ethernut2/contiki-conf.h
index bd92af78c..62b9f7d45 100644
--- a/platform/ethernut2/contiki-conf.h
+++ b/platform/ethernut2/contiki-conf.h
@@ -4,6 +4,9 @@
 #define CC_CONF_REGISTER_ARGS          1
 #define CC_CONF_FUNCTION_POINTER_ARGS  1
 
+#define CCI
+#define CLI
+
 typedef unsigned short clock_time_t;
 #define CLOCK_CONF_SECOND 1000
 
diff --git a/platform/gtk/contiki-conf.h b/platform/gtk/contiki-conf.h
index 21cb30b3a..52430f557 100644
--- a/platform/gtk/contiki-conf.h
+++ b/platform/gtk/contiki-conf.h
@@ -7,6 +7,11 @@
 
 
 
+#define CCI
+#define CLI
+
+
+
 typedef unsigned long clock_time_t;
 #define CLOCK_CONF_SECOND 1000
 
diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h
index 72c1cded7..3114ae1d6 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.1 2006/06/17 22:41:30 adamdunkels Exp $
+ * @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:11:45 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -41,6 +41,9 @@
 #define CC_CONF_FASTCALL
 #define CC_CONF_VA_ARGS                1
 
+#define CCI
+#define CLI
+
 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
 typedef uint32_t u32_t;
diff --git a/platform/minimal-ppp/contiki-conf.h b/platform/minimal-ppp/contiki-conf.h
index 76f60d286..6929170d2 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.1 2006/06/17 22:41:30 adamdunkels Exp $
+ * @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:12:37 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -45,6 +45,9 @@
 #define CC_CONF_FASTCALL
 #define CC_CONF_VA_ARGS                1
 
+#define CCI
+#define CLI
+
 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
 typedef uint32_t u32_t;
diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h
index 5cc540c31..d4f11f02c 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.1 2006/06/17 22:41:31 adamdunkels Exp $
+ * @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:13:21 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -42,6 +42,9 @@
 #define CC_CONF_VA_ARGS                1
 #define CC_CONF_INLINE                 inline
 
+#define CCI
+#define CLI
+
 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
 typedef uint32_t u32_t;
diff --git a/platform/netsim/contiki-conf.h b/platform/netsim/contiki-conf.h
index cc02ee0fa..f0a0e846a 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.1 2006/06/17 22:41:31 adamdunkels Exp $
+ * $Id: contiki-conf.h,v 1.2 2006/08/13 15:13:53 oliverschmidt Exp $
  *
  */
 
@@ -42,6 +42,9 @@
 
 #define CC_CONF_VA_ARGS                1
 
+#define CCI
+#define CLI
+
 /*------------------------------------------------------------------------------*/
 /**
  * \defgroup uipopttypedef uIP type definitions
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 60aeb9549..2af4adb99 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,9 +1,12 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.2 2006/08/11 13:41:31 bg- Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.3 2006/08/13 15:15:48 oliverschmidt Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
 
+#define CCI
+#define CLI
+
 /* This is still experimental. /bg */
 #define UAODV_BAD_ROUTE