mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-31 06:32:00 +00:00
Changed the Contiki Interface declaration macros from CCI/CLI to CCIF/CLIF because of already existing macros: Both CCI and CLI :-(
This commit is contained in:
oliverschmidt
parent
649afd342b
commit
62fa3b8c01
@ -269,8 +269,8 @@
|
||||
|
||||
/* Interface configuration. */
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
/* Clock configuration. */
|
||||
|
||||
|
||||
@ -22,8 +22,8 @@
|
||||
|
||||
#define CC_CONF_VA_ARGS 1
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
typedef unsigned short clock_time_t;
|
||||
#define CLOCK_CONF_SECOND 8
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
#define CC_CONF_REGISTER_ARGS 1
|
||||
#define CC_CONF_FUNCTION_POINTER_ARGS 1
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
typedef unsigned short clock_time_t;
|
||||
#define CLOCK_CONF_SECOND 1000
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
#define CC_CONF_REGISTER_ARGS 1
|
||||
#define CC_CONF_FUNCTION_POINTER_ARGS 1
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
typedef unsigned short clock_time_t;
|
||||
#define CLOCK_CONF_SECOND 1000
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:11:45 oliverschmidt Exp $
|
||||
* @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:00 oliverschmidt Exp $
|
||||
*/
|
||||
|
||||
#ifndef __CONTIKI_CONF_H__
|
||||
@ -41,8 +41,8 @@
|
||||
#define CC_CONF_FASTCALL
|
||||
#define CC_CONF_VA_ARGS 1
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
typedef uint8_t u8_t;
|
||||
typedef uint16_t u16_t;
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:12:37 oliverschmidt Exp $
|
||||
* @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:18 oliverschmidt Exp $
|
||||
*/
|
||||
|
||||
#ifndef __CONTIKI_CONF_H__
|
||||
@ -45,8 +45,8 @@
|
||||
#define CC_CONF_FASTCALL
|
||||
#define CC_CONF_VA_ARGS 1
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
typedef uint8_t u8_t;
|
||||
typedef uint16_t u16_t;
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:13:21 oliverschmidt Exp $
|
||||
* @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:33 oliverschmidt Exp $
|
||||
*/
|
||||
|
||||
#ifndef __CONTIKI_CONF_H__
|
||||
@ -42,8 +42,8 @@
|
||||
#define CC_CONF_VA_ARGS 1
|
||||
#define CC_CONF_INLINE inline
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
typedef uint8_t u8_t;
|
||||
typedef uint16_t u16_t;
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*
|
||||
* This file is part of the Contiki desktop OS
|
||||
*
|
||||
* $Id: contiki-conf.h,v 1.2 2006/08/13 15:13:53 oliverschmidt Exp $
|
||||
* $Id: contiki-conf.h,v 1.3 2006/08/15 14:48:47 oliverschmidt Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -42,8 +42,8 @@
|
||||
|
||||
#define CC_CONF_VA_ARGS 1
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/**
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
/* -*- C -*- */
|
||||
/* @(#)$Id: contiki-conf.h,v 1.3 2006/08/13 15:15:48 oliverschmidt Exp $ */
|
||||
/* @(#)$Id: contiki-conf.h,v 1.4 2006/08/15 14:49:32 oliverschmidt Exp $ */
|
||||
|
||||
#ifndef CONTIKI_CONF_H
|
||||
#define CONTIKI_CONF_H
|
||||
|
||||
#define CCI
|
||||
#define CLI
|
||||
#define CCIF
|
||||
#define CLIF
|
||||
|
||||
/* This is still experimental. /bg */
|
||||
#define UAODV_BAD_ROUTE
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
|
||||
#if _USRDLL
|
||||
#define CCI __declspec(dllimport)
|
||||
#define CLI __declspec(dllexport)
|
||||
#define CCIF __declspec(dllimport)
|
||||
#define CLIF __declspec(dllexport)
|
||||
#else
|
||||
#define CCI __declspec(dllexport)
|
||||
#define CLI
|
||||
#define CCIF __declspec(dllexport)
|
||||
#define CLIF
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
*
|
||||
* Author: Oliver Schmidt <ol.sc@web.de>
|
||||
*
|
||||
* $Id: dll-loader.h,v 1.2 2006/08/14 23:46:43 oliverschmidt Exp $
|
||||
* $Id: dll-loader.h,v 1.3 2006/08/15 14:50:13 oliverschmidt Exp $
|
||||
*/
|
||||
#ifndef __DLL_LOADER_H__
|
||||
#define __DLL_LOADER_H__
|
||||
@ -40,9 +40,9 @@
|
||||
#define LOADER_LOAD_DSC(name) dll_loader_load_dsc(name)
|
||||
#define LOADER_UNLOAD_DSC(dsc) dll_loader_unload_dsc(dsc)
|
||||
|
||||
CCI int dll_loader_load(char *name, char *arg);
|
||||
CCI void dll_loader_unload(void *addr);
|
||||
CCI struct dsc *dll_loader_load_dsc(char *name);
|
||||
CCI void __stdcall dll_loader_unload_dsc(void *addr);
|
||||
CCIF int dll_loader_load(char *name, char *arg);
|
||||
CCIF void dll_loader_unload(void *addr);
|
||||
CCIF struct dsc *dll_loader_load_dsc(char *name);
|
||||
CCIF void __stdcall dll_loader_unload_dsc(void *addr);
|
||||
|
||||
#endif /* __DLL_LOADER_H__ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user