deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

CC_CONST_FUNCTION replaces some const keywords in order to workaround a sdcc bug, which cannot handle function pointers as const.

Browse source
This commit is contained in:
matsutsuka 2008-07-02 15:02:33 +00:00
parent b8820a7d89
commit d194d54e8e
6 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/net/rime/chameleon-raw.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: chameleon-raw.c,v 1.1 2008/02/25 02:14:34 adamdunkels Exp $
* $Id: chameleon-raw.c,v 1.2 2008/07/02 15:02:33 matsutsuka Exp $
*/
/**
@ -183,4 +183,4 @@ hdrsize(const struct rimebuf_attrlist *a)
return size / 8;
}
/*---------------------------------------------------------------------------*/
const struct chameleon_module chameleon_raw = { input, output, hdrsize, NULL };
CC_CONST_FUNCTION struct chameleon_module chameleon_raw = { input, output, hdrsize, NULL };

4
core/net/rime/chameleon-raw.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: chameleon-raw.h,v 1.1 2008/02/25 02:14:34 adamdunkels Exp $
* $Id: chameleon-raw.h,v 1.2 2008/07/02 15:02:33 matsutsuka Exp $
*/
/**
@ -41,6 +41,6 @@
#ifndef __CHAMELEON_RAW_H__
#define __CHAMELEON_RAW_H__
extern const struct chameleon_module chameleon_raw;
extern CC_CONST_FUNCTION struct chameleon_module chameleon_raw;
#endif /* __CHAMELEON_RAW_H__ */

6
core/net/rime/neighbor-discovery.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: neighbor-discovery.c,v 1.6 2008/06/26 11:19:22 adamdunkels Exp $
* $Id: neighbor-discovery.c,v 1.7 2008/07/02 15:02:33 matsutsuka Exp $
*/
/**
@ -124,7 +124,7 @@ static void
send_timer(void *ptr)
{
struct neighbor_discovery_conn *tc = ptr;
send_adv(tc, tc->max_interval);
/* ctimer_set(&tc->t,
MIN_INTERVAL + random_rand() % (MAX_INTERVAL - MIN_INTERVAL),
@ -136,7 +136,7 @@ send_timer(void *ptr)
/*---------------------------------------------------------------------------*/
/*static const struct ibc_callbacks ibc_callbacks =
{adv_packet_received};*/
static const struct ipolite_callbacks ipolite_callbacks =
CC_CONST_FUNCTION static struct ipolite_callbacks ipolite_callbacks =
{adv_packet_received};
/*---------------------------------------------------------------------------*/
void