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

Merge pull request #1347 from oliverschmidt/master

Browse source 
Removed CC_FASTCALL.
This commit is contained in:
Oliver Schmidt 2015-11-01 19:36:07 +01:00
parent 19cb3227ca 1639b712bb
commit 9962d0720a
20 changed files with 37 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/cmdd/cmdd.c
View file

@ -24,7 +24,7 @@ static char send_udp = 0;
static const char *prompt = "contiki> "; static const char *prompt = "contiki> ";
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static char * CC_FASTCALL static char *
n(uint16_t num, char *ptr) n(uint16_t num, char *ptr)
{ {
uint16_t d; uint16_t d;

12
apps/webbrowser/htmlparser.c
View file

@ -222,7 +222,7 @@ static const char *tags[] = {
}; };
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static unsigned char CC_FASTCALL static unsigned char
iswhitespace(char c) iswhitespace(char c)
{ {
return (c == ISO_space || return (c == ISO_space ||
@ -255,7 +255,7 @@ htmlparser_init(void)
#endif /* WWW_CONF_FORMS */ #endif /* WWW_CONF_FORMS */
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static char CC_FASTCALL static char
lowercase(char c) lowercase(char c)
{ {
/* XXX: This is a *brute force* approach to lower-case /* XXX: This is a *brute force* approach to lower-case
@ -276,7 +276,7 @@ endtagfound(void)
s.tagattrparam[s.tagattrparamptr] = 0; s.tagattrparam[s.tagattrparamptr] = 0;
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void CC_FASTCALL static void
switch_majorstate(unsigned char newstate) switch_majorstate(unsigned char newstate)
{ {
if(s.majorstate != newstate) { if(s.majorstate != newstate) {
@ -286,7 +286,7 @@ switch_majorstate(unsigned char newstate)
} }
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void CC_FASTCALL static void
add_char(unsigned char c) add_char(unsigned char c)
{ {
if(s.wordlen < WWW_CONF_WEBPAGE_WIDTH - 1 && c < 0x80) { if(s.wordlen < WWW_CONF_WEBPAGE_WIDTH - 1 && c < 0x80) {
@ -320,7 +320,7 @@ newline(void)
htmlparser_newline(); htmlparser_newline();
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static unsigned char CC_FASTCALL static unsigned char
find_tag(char *tag) find_tag(char *tag)
{ {
static unsigned char first, last, i, tabi; static unsigned char first, last, i, tabi;
@ -521,7 +521,7 @@ parse_tag(void)
} }
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static uint16_t CC_FASTCALL static uint16_t
parse_word(char *data, uint8_t dlen) parse_word(char *data, uint8_t dlen)
{ {
static uint8_t i; static uint8_t i;

18
apps/webbrowser/www.c
View file

@ -196,7 +196,7 @@ PROCESS(www_process, "Web browser");
AUTOSTART_PROCESSES(&www_process); AUTOSTART_PROCESSES(&www_process);
static void CC_FASTCALL formsubmit(struct inputattrib *trigger); static void formsubmit(struct inputattrib *trigger);
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
/* make_window() /* make_window()
@ -232,7 +232,7 @@ redraw_window(void)
ctk_window_redraw(&mainwindow); ctk_window_redraw(&mainwindow);
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static char * CC_FASTCALL static char *
add_pageattrib(unsigned size) add_pageattrib(unsigned size)
{ {
char *ptr; char *ptr;
@ -246,7 +246,7 @@ add_pageattrib(unsigned size)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if WWW_CONF_FORMS #if WWW_CONF_FORMS
static void CC_FASTCALL static void
add_forminput(struct inputattrib *inputptr) add_forminput(struct inputattrib *inputptr)
{ {
inputptr->nextptr = NULL; inputptr->nextptr = NULL;
@ -285,7 +285,7 @@ start_loading(void)
clear_page(); clear_page();
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void CC_FASTCALL static void
show_statustext(char *text) show_statustext(char *text)
{ {
ctk_label_set_text(&statustext, text); ctk_label_set_text(&statustext, text);
@ -398,7 +398,7 @@ open_url(void)
* Will format a link from the current web pages so that it suits the * Will format a link from the current web pages so that it suits the
* open_url() function. * open_url() function.
*/ */
static void CC_FASTCALL static void
set_link(char *link) set_link(char *link)
{ {
register char *urlptr; register char *urlptr;
@ -618,7 +618,7 @@ PROCESS_THREAD(www_process, ev, data)
* "url" variable and the visible "editurl" (which is shown in the URL * "url" variable and the visible "editurl" (which is shown in the URL
* text entry widget in the browser window). * text entry widget in the browser window).
*/ */
static void CC_FASTCALL static void
set_url(char *host, uint16_t port, char *file) set_url(char *host, uint16_t port, char *file)
{ {
char *urlptr; char *urlptr;
@ -732,7 +732,7 @@ webclient_datahandler(char *data, uint16_t len)
} }
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void CC_FASTCALL static void
add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type, add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
unsigned char border) unsigned char border)
{ {
@ -939,7 +939,7 @@ htmlparser_inputfield(unsigned char type, unsigned char size, char *text, char *
} }
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void CC_FASTCALL static void
add_query(char delimiter, char *string) add_query(char delimiter, char *string)
{ {
static char *query; static char *query;
@ -967,7 +967,7 @@ add_query(char delimiter, char *string)
query += length; query += length;
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void CC_FASTCALL static void
formsubmit(struct inputattrib *trigger) formsubmit(struct inputattrib *trigger)
{ {
struct inputattrib *input; struct inputattrib *input;

16
core/ctk/ctk.c
View file

@ -185,7 +185,7 @@ unsigned short ctk_screensaver_timeout = (5*60);
static struct timer timer; static struct timer timer;
#endif /* CTK_CONF_SCREENSAVER */ #endif /* CTK_CONF_SCREENSAVER */
static void CC_FASTCALL static void
textentry_input(ctk_arch_key_t c, textentry_input(ctk_arch_key_t c,
CC_REGISTER_ARG struct ctk_textentry *t); CC_REGISTER_ARG struct ctk_textentry *t);
@ -555,7 +555,7 @@ ctk_menu_remove(struct ctk_menu *menu)
* \param clipy2 The lower bound of the clip interval * \param clipy2 The lower bound of the clip interval
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void CC_FASTCALL static void
do_redraw_all(unsigned char clipy1, unsigned char clipy2) do_redraw_all(unsigned char clipy1, unsigned char clipy2)
{ {
#if CTK_CONF_WINDOWS #if CTK_CONF_WINDOWS
@ -818,7 +818,7 @@ ctk_menuitem_add(CC_REGISTER_ARG struct ctk_menu *menu, char *name)
* \param w The widget that should be redrawn. * \param w The widget that should be redrawn.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void CC_FASTCALL static void
add_redrawwidget(struct ctk_widget *w) add_redrawwidget(struct ctk_widget *w)
{ {
static unsigned char i; static unsigned char i;
@ -921,7 +921,7 @@ ctk_widget_redraw(struct ctk_widget *widget)
* \param widget The widget to be added. * \param widget The widget to be added.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void CC_FASTCALL void
ctk_widget_add(CC_REGISTER_ARG struct ctk_window *window, ctk_widget_add(CC_REGISTER_ARG struct ctk_window *window,
CC_REGISTER_ARG struct ctk_widget *widget) CC_REGISTER_ARG struct ctk_widget *widget)
{ {
@ -973,7 +973,7 @@ ctk_desktop_height(struct ctk_desktop *d)
* \param focus The widget to be focused. * \param focus The widget to be focused.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void CC_FASTCALL static void
select_widget(struct ctk_widget *focus) select_widget(struct ctk_widget *focus)
{ {
struct ctk_window *window; struct ctk_window *window;
@ -1001,7 +1001,7 @@ select_widget(struct ctk_widget *focus)
#define DOWN 1 #define DOWN 1
#define LEFT 2 #define LEFT 2
#define RIGHT 3 #define RIGHT 3
static void CC_FASTCALL static void
switch_focus_widget(unsigned char direction) switch_focus_widget(unsigned char direction)
{ {
#if CTK_CONF_WINDOWS #if CTK_CONF_WINDOWS
@ -1126,7 +1126,7 @@ switch_menu_item(unsigned char updown)
} }
#endif /* CTK_CONF_MENUS */ #endif /* CTK_CONF_MENUS */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static unsigned char CC_FASTCALL static unsigned char
activate(CC_REGISTER_ARG struct ctk_widget *w) activate(CC_REGISTER_ARG struct ctk_widget *w)
{ {
if(w->type == CTK_WIDGET_BUTTON) { if(w->type == CTK_WIDGET_BUTTON) {
@ -1183,7 +1183,7 @@ ctk_textentry_input_null(ctk_arch_key_t c, struct ctk_textentry *t)
} }
#endif /* SDCC */ #endif /* SDCC */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void CC_FASTCALL static void
textentry_input(ctk_arch_key_t c, CC_REGISTER_ARG struct ctk_textentry *t) textentry_input(ctk_arch_key_t c, CC_REGISTER_ARG struct ctk_textentry *t)
{ {
register char *cptr, *cptr2; register char *cptr, *cptr2;

4
core/ctk/ctk.h
View file

@ -743,8 +743,8 @@ void ctk_icon_add(struct ctk_widget *icon, struct process *p);
*/ */
#define CTK_WIDGET_ADD(win, widg) \ #define CTK_WIDGET_ADD(win, widg) \
ctk_widget_add(win, (struct ctk_widget *)widg) ctk_widget_add(win, (struct ctk_widget *)widg)
CCIF void CC_FASTCALL ctk_widget_add(struct ctk_window *window, CCIF void ctk_widget_add(struct ctk_window *window,
struct ctk_widget *widget); struct ctk_widget *widget);
/** /**
* Set focus to a widget. * Set focus to a widget.

14
core/sys/cc.h
View file

@ -67,24 +67,14 @@
#define CC_FUNCTION_POINTER_ARGS 0 #define CC_FUNCTION_POINTER_ARGS 0
#endif /* CC_CONF_FUNCTION_POINTER_ARGS */ #endif /* CC_CONF_FUNCTION_POINTER_ARGS */
/**
* Configure if the C compiler supports fastcall function
* declarations.
*/
#ifdef CC_CONF_FASTCALL
#define CC_FASTCALL CC_CONF_FASTCALL
#else /* CC_CONF_FASTCALL */
#define CC_FASTCALL
#endif /* CC_CONF_FASTCALL */
/** /**
* Configure if the C compiler have problems with const function pointers * Configure if the C compiler have problems with const function pointers
*/ */
#ifdef CC_CONF_CONST_FUNCTION_BUG #ifdef CC_CONF_CONST_FUNCTION_BUG
#define CC_CONST_FUNCTION #define CC_CONST_FUNCTION
#else /* CC_CONF_FASTCALL */ #else /* CC_CONF_CONST_FUNCTION_BUG */
#define CC_CONST_FUNCTION const #define CC_CONST_FUNCTION const
#endif /* CC_CONF_FASTCALL */ #endif /* CC_CONF_CONST_FUNCTION_BUG */
/** /**
* Configure work-around for unsigned char bugs with sdcc. * Configure work-around for unsigned char bugs with sdcc.

1
cpu/6502/6502def.h
View file

@ -51,7 +51,6 @@ typedef uint32_t u32_t;
typedef int32_t s32_t; typedef int32_t s32_t;
#define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_REGISTER_ARGS 1
#define CC_CONF_FASTCALL __fastcall__
#define ARCH_DOESNT_NEED_ALIGNED_STRUCTS 1 #define ARCH_DOESNT_NEED_ALIGNED_STRUCTS 1

4
cpu/6502/lib/config.c
View file

@ -43,7 +43,7 @@
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if LOG_CONF_ENABLED #if LOG_CONF_ENABLED
static char * CC_FASTCALL static char *
ipaddrtoa(uip_ipaddr_t *ipaddr, char *buffer) ipaddrtoa(uip_ipaddr_t *ipaddr, char *buffer)
{ {
char *ptr = buffer; char *ptr = buffer;
@ -59,7 +59,7 @@ ipaddrtoa(uip_ipaddr_t *ipaddr, char *buffer)
} }
#endif /* LOG_CONF_ENABLED */ #endif /* LOG_CONF_ENABLED */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
struct ethernet_config * CC_FASTCALL struct ethernet_config *
config_read(char *filename) config_read(char *filename)
{ {
static struct { static struct {

2
cpu/6502/lib/config.h
View file

@ -35,6 +35,6 @@
#ifndef CONFIG_H_ #ifndef CONFIG_H_
#define CONFIG_H_ #define CONFIG_H_
struct ethernet_config * CC_FASTCALL config_read(char *filename); struct ethernet_config * config_read(char *filename);
#endif /* CONFIG_H_ */ #endif /* CONFIG_H_ */

2
cpu/6502/net/ethernet.c
View file

@ -58,7 +58,7 @@ struct {
} *module; } *module;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void CC_FASTCALL void
ethernet_init(struct ethernet_config *config) ethernet_init(struct ethernet_config *config)
{ {
static const char signature[4] = {0x65, 0x74, 0x68, 0x01}; static const char signature[4] = {0x65, 0x74, 0x68, 0x01};

2
cpu/6502/net/ethernet.h
View file

@ -35,7 +35,7 @@
#ifndef ETHERNET_H_ #ifndef ETHERNET_H_
#define ETHERNET_H_ #define ETHERNET_H_
void CC_FASTCALL ethernet_init(struct ethernet_config *config); void ethernet_init(struct ethernet_config *config);
uint16_t ethernet_poll(void); uint16_t ethernet_poll(void);
void ethernet_send(void); void ethernet_send(void);
void ethernet_exit(void); void ethernet_exit(void);

1
cpu/cc2430/8051def.h
View file

@ -38,7 +38,6 @@
#endif #endif
#define CC_CONF_FUNCTION_POINTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1
#define CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CC_CONF_UNSIGNED_CHAR_BUGS 0 #define CC_CONF_UNSIGNED_CHAR_BUGS 0
#define CC_CONF_REGISTER_ARGS 0 #define CC_CONF_REGISTER_ARGS 0

1
cpu/cc253x/8051def.h
View file

@ -38,7 +38,6 @@
#endif #endif
#define CC_CONF_FUNCTION_POINTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1
#define CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CC_CONF_UNSIGNED_CHAR_BUGS 0 #define CC_CONF_UNSIGNED_CHAR_BUGS 0
#define CC_CONF_REGISTER_ARGS 0 #define CC_CONF_REGISTER_ARGS 0

1
platform/cooja/contiki-conf.h
View file

@ -183,7 +183,6 @@
#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 CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CC_CONF_INLINE inline #define CC_CONF_INLINE inline

1
platform/jn516x/platform-conf.h
View file

@ -158,7 +158,6 @@
#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 CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CC_CONF_INLINE inline #define CC_CONF_INLINE inline

1
platform/mbxxx/platform-conf.h
View file

@ -62,7 +62,6 @@
/* Platform-dependent definitions */ /* Platform-dependent definitions */
#define CC_CONF_REGISTER_ARGS 0 #define CC_CONF_REGISTER_ARGS 0
#define CC_CONF_FUNCTION_POINTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1
#define CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CC_CONF_INLINE inline #define CC_CONF_INLINE inline

1
platform/minimal-net/contiki-conf.h
View file

@ -47,7 +47,6 @@ int select_set_callback(int fd, const struct select_callback *callback);
#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 CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
#define CCIF #define CCIF

1
platform/native/contiki-conf.h
View file

@ -46,7 +46,6 @@ int select_set_callback(int fd, const struct select_callback *callback);
#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 CC_CONF_FASTCALL
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
/*#define CC_CONF_INLINE inline*/ /*#define CC_CONF_INLINE inline*/

3
platform/win32/contiki-conf.h
View file

@ -6,8 +6,7 @@
#endif #endif
#define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_REGISTER_ARGS 1
#define CC_CONF_FASTCALL __fastcall #define CC_CONF_INLINE __inline
#define CC_CONF_INLINE __inline
#define ARCH_DOESNT_NEED_ALIGNED_STRUCTS 1 #define ARCH_DOESNT_NEED_ALIGNED_STRUCTS 1

6
tools/wpcapslip/tcpdump.c
View file

@ -156,7 +156,7 @@ tcpflags(unsigned char flags, char *flagsstr)
*flagsstr = 0; *flagsstr = 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static char * CC_FASTCALL static char *
n(uint16_t num, char *ptr) n(uint16_t num, char *ptr)
{ {
uint16_t d; uint16_t d;
@ -179,14 +179,14 @@ n(uint16_t num, char *ptr)
return ptr; return ptr;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static char * CC_FASTCALL static char *
d(char *ptr) d(char *ptr)
{ {
*ptr = '.'; *ptr = '.';
return ptr + 1; return ptr + 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static char * CC_FASTCALL static char *
s(char *str, char *ptr) s(char *str, char *ptr)
{ {
strcpy(ptr, str); strcpy(ptr, str);