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.

This commit is contained in:
oliverschmidt 2006-08-13 15:06:08 +00:00
parent ffb4edc3e3
commit 48609fb3a3
10 changed files with 38 additions and 5 deletions

View file

@ -267,6 +267,11 @@
#define CC_CONF_FASTCALL fastcall #define CC_CONF_FASTCALL fastcall
/* Interface configuration. */
#define CCI
#define CLI
/* Clock configuration. */ /* Clock configuration. */
#include <time.h> #include <time.h>

View file

@ -22,6 +22,8 @@
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CCI
#define CLI
typedef unsigned short clock_time_t; typedef unsigned short clock_time_t;
#define CLOCK_CONF_SECOND 8 #define CLOCK_CONF_SECOND 8

View file

@ -4,6 +4,9 @@
#define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_REGISTER_ARGS 1
#define CC_CONF_FUNCTION_POINTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1
#define CCI
#define CLI
typedef unsigned short clock_time_t; typedef unsigned short clock_time_t;
#define CLOCK_CONF_SECOND 1000 #define CLOCK_CONF_SECOND 1000

View file

@ -4,6 +4,9 @@
#define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_REGISTER_ARGS 1
#define CC_CONF_FUNCTION_POINTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1
#define CCI
#define CLI
typedef unsigned short clock_time_t; typedef unsigned short clock_time_t;
#define CLOCK_CONF_SECOND 1000 #define CLOCK_CONF_SECOND 1000

View file

@ -7,6 +7,11 @@
#define CCI
#define CLI
typedef unsigned long clock_time_t; typedef unsigned long clock_time_t;
#define CLOCK_CONF_SECOND 1000 #define CLOCK_CONF_SECOND 1000

View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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__ #ifndef __CONTIKI_CONF_H__
@ -41,6 +41,9 @@
#define CC_CONF_FASTCALL #define CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CCI
#define CLI
typedef uint8_t u8_t; typedef uint8_t u8_t;
typedef uint16_t u16_t; typedef uint16_t u16_t;
typedef uint32_t u32_t; typedef uint32_t u32_t;

View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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__ #ifndef __CONTIKI_CONF_H__
@ -45,6 +45,9 @@
#define CC_CONF_FASTCALL #define CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CCI
#define CLI
typedef uint8_t u8_t; typedef uint8_t u8_t;
typedef uint16_t u16_t; typedef uint16_t u16_t;
typedef uint32_t u32_t; typedef uint32_t u32_t;

View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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__ #ifndef __CONTIKI_CONF_H__
@ -42,6 +42,9 @@
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CC_CONF_INLINE inline #define CC_CONF_INLINE inline
#define CCI
#define CLI
typedef uint8_t u8_t; typedef uint8_t u8_t;
typedef uint16_t u16_t; typedef uint16_t u16_t;
typedef uint32_t u32_t; typedef uint32_t u32_t;

View file

@ -32,7 +32,7 @@
* *
* This file is part of the Contiki desktop OS * 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 CC_CONF_VA_ARGS 1
#define CCI
#define CLI
/*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/
/** /**
* \defgroup uipopttypedef uIP type definitions * \defgroup uipopttypedef uIP type definitions

View file

@ -1,9 +1,12 @@
/* -*- C -*- */ /* -*- 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 #ifndef CONTIKI_CONF_H
#define CONTIKI_CONF_H #define CONTIKI_CONF_H
#define CCI
#define CLI
/* This is still experimental. /bg */ /* This is still experimental. /bg */
#define UAODV_BAD_ROUTE #define UAODV_BAD_ROUTE