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

Added the CCIF (Contiki Core InterFace) declarations used by the applications which are currently part of the Win32 build.

Browse source
This commit is contained in:
oliverschmidt 2006-08-26 23:54:00 +00:00
parent 67d7c515a4
commit 424fde144d
12 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/program-handler/program-handler.h
View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment for the C64. * This file is part of the Contiki desktop environment for the C64.
* *
* $Id: program-handler.h,v 1.1 2006/06/17 22:41:12 adamdunkels Exp $ * $Id: program-handler.h,v 1.2 2006/08/26 23:54:00 oliverschmidt Exp $
* *
*/ */
#ifndef __PROGRAM_HANDLER_H__ #ifndef __PROGRAM_HANDLER_H__
@ -42,7 +42,7 @@
extern char program_handler_screensaver[]; extern char program_handler_screensaver[];
void program_handler_init(void); void program_handler_init(void);
void program_handler_load(char *name, char *arg); CCIF void program_handler_load(char *name, char *arg);
void program_handler_setscreensaver(char *name); void program_handler_setscreensaver(char *name);
void program_handler_add(struct dsc *dsc, char *menuname, void program_handler_add(struct dsc *dsc, char *menuname,

4
core/cfs/cfs.h
View file

@ -54,7 +54,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: cfs.h,v 1.2 2006/08/15 09:38:33 nifi Exp $ * $Id: cfs.h,v 1.3 2006/08/26 23:54:38 oliverschmidt Exp $
*/ */
#ifndef __CFS_H__ #ifndef __CFS_H__
#define __CFS_H__ #define __CFS_H__
@ -185,7 +185,7 @@ int cfs_readdir(struct cfs_dir *dirp, struct cfs_dirent *dirent);
*/ */
int cfs_closedir(struct cfs_dir *dirp); int cfs_closedir(struct cfs_dir *dirp);
const struct cfs_service_interface *cfs_find_service(void); CCIF const struct cfs_service_interface *cfs_find_service(void);
#define cfs_open(name, flags) (cfs_find_service()->open(name, flags)) #define cfs_open(name, flags) (cfs_find_service()->open(name, flags))
#define cfs_close(fd) (cfs_find_service()->close(fd)) #define cfs_close(fd) (cfs_find_service()->close(fd))

6
core/ctk/ctk-draw.h
View file

@ -45,7 +45,7 @@
* *
* This file is part of the Contiki desktop OS. * This file is part of the Contiki desktop OS.
* *
* $Id: ctk-draw.h,v 1.1 2006/06/17 22:41:15 adamdunkels Exp $ * $Id: ctk-draw.h,v 1.2 2006/08/26 23:56:18 oliverschmidt Exp $
* *
*/ */
@ -273,8 +273,8 @@ void ctk_draw_menus(struct ctk_menus *menus);
/* Returns width and height of screen. */ /* Returns width and height of screen. */
unsigned char ctk_draw_width(void); CCIF unsigned char ctk_draw_width(void);
unsigned char ctk_draw_height(void); CCIF unsigned char ctk_draw_height(void);
extern unsigned char ctk_draw_windowborder_width, extern unsigned char ctk_draw_windowborder_width,

44
core/ctk/ctk.h
View file

@ -43,7 +43,7 @@
* *
* This file is part of the Contiki desktop OS. * This file is part of the Contiki desktop OS.
* *
* $Id: ctk.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $ * $Id: ctk.h,v 1.2 2006/08/26 23:55:32 oliverschmidt Exp $
* *
*/ */
@ -677,28 +677,28 @@ unsigned char ctk_mode_get(void);
/*void ctk_redraw(void);*/ /*void ctk_redraw(void);*/
/* Functions for manipulating windows. */ /* Functions for manipulating windows. */
void ctk_window_new(struct ctk_window *window, CCIF void ctk_window_new(struct ctk_window *window,
unsigned char w, unsigned char h, unsigned char w, unsigned char h,
char *title); char *title);
void ctk_window_clear(struct ctk_window *w); CCIF void ctk_window_clear(struct ctk_window *w);
void ctk_window_open(struct ctk_window *w); CCIF void ctk_window_open(struct ctk_window *w);
#define ctk_window_move(w,xpos,ypos) do { (w)->x=xpos; (w)->y=ypos; } while(0) #define ctk_window_move(w,xpos,ypos) do { (w)->x=xpos; (w)->y=ypos; } while(0)
void ctk_window_close(struct ctk_window *w); CCIF void ctk_window_close(struct ctk_window *w);
void ctk_window_redraw(struct ctk_window *w); CCIF void ctk_window_redraw(struct ctk_window *w);
#define ctk_window_isopen(w) ((w)->next != NULL) #define ctk_window_isopen(w) ((w)->next != NULL)
/* Functions for manipulating dialogs. */ /* Functions for manipulating dialogs. */
void ctk_dialog_new(struct ctk_window *window, CCIF void ctk_dialog_new(struct ctk_window *window,
unsigned char w, unsigned char h); unsigned char w, unsigned char h);
void ctk_dialog_open(struct ctk_window *d); CCIF void ctk_dialog_open(struct ctk_window *d);
void ctk_dialog_close(void); CCIF void ctk_dialog_close(void);
/* Functions for manipulating menus. */ /* Functions for manipulating menus. */
void ctk_menu_new(struct ctk_menu *menu, char *title); CCIF void ctk_menu_new(struct ctk_menu *menu, char *title);
void ctk_menu_add(struct ctk_menu *menu); CCIF void ctk_menu_add(struct ctk_menu *menu);
void ctk_menu_remove(struct ctk_menu *menu); CCIF void ctk_menu_remove(struct ctk_menu *menu);
unsigned char ctk_menuitem_add(struct ctk_menu *menu, char *name); CCIF unsigned char ctk_menuitem_add(struct ctk_menu *menu, char *name);
/* Functions for icons. */ /* Functions for icons. */
@ -726,8 +726,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)
void CC_FASTCALL ctk_widget_add(struct ctk_window *window, CCIF void CC_FASTCALL 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.
@ -745,7 +745,7 @@ void CC_FASTCALL ctk_widget_add(struct ctk_window *window,
*/ */
#define CTK_WIDGET_REDRAW(widg) \ #define CTK_WIDGET_REDRAW(widg) \
ctk_widget_redraw((struct ctk_widget *)widg) ctk_widget_redraw((struct ctk_widget *)widg)
void ctk_widget_redraw(struct ctk_widget *w); CCIF void ctk_widget_redraw(struct ctk_widget *w);
/** /**
* Obtain the type of a widget. * Obtain the type of a widget.
@ -912,11 +912,11 @@ void ctk_widget_redraw(struct ctk_widget *w);
/* Desktop interface. */ /* Desktop interface. */
void ctk_desktop_redraw(struct ctk_desktop *d); void ctk_desktop_redraw(struct ctk_desktop *d);
unsigned char ctk_desktop_width(struct ctk_desktop *d); CCIF unsigned char ctk_desktop_width(struct ctk_desktop *d);
unsigned char ctk_desktop_height(struct ctk_desktop *d); unsigned char ctk_desktop_height(struct ctk_desktop *d);
/* Signals. */ /* Signals. */
extern process_event_t ctk_signal_keypress, CCIF extern process_event_t ctk_signal_keypress,
ctk_signal_widget_activate, ctk_signal_widget_activate,
ctk_signal_widget_select, ctk_signal_widget_select,
ctk_signal_timer, ctk_signal_timer,
@ -945,7 +945,7 @@ extern unsigned short ctk_screensaver_timeout;
#endif /* CTK_CONF_SCREENSAVER */ #endif /* CTK_CONF_SCREENSAVER */
/* These should no longer be used: */ /* These should no longer be used: */
extern process_event_t ctk_signal_button_activate, CCIF extern process_event_t ctk_signal_button_activate,
ctk_signal_button_hover, ctk_signal_button_hover,
ctk_signal_hyperlink_activate, ctk_signal_hyperlink_activate,
ctk_signal_hyperlink_hover; ctk_signal_hyperlink_hover;

12
core/net/resolv.h
View file

@ -34,7 +34,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: resolv.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $ * $Id: resolv.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
* *
*/ */
#ifndef __RESOLV_H__ #ifndef __RESOLV_H__
@ -45,17 +45,17 @@
/** /**
* Event that is broadcasted when a DNS name has been resolved. * Event that is broadcasted when a DNS name has been resolved.
*/ */
extern process_event_t resolv_event_found; CCIF extern process_event_t resolv_event_found;
/* Callbacks. */ /* Callbacks. */
void resolv_found(char *name, u16_t *ipaddr); void resolv_found(char *name, u16_t *ipaddr);
/* Functions. */ /* Functions. */
void resolv_conf(u16_t *dnsserver); CCIF void resolv_conf(u16_t *dnsserver);
u16_t *resolv_getserver(void); CCIF u16_t *resolv_getserver(void);
void resolv_init(char *arg); void resolv_init(char *arg);
u16_t *resolv_lookup(char *name); CCIF u16_t *resolv_lookup(char *name);
void resolv_query(char *name); CCIF void resolv_query(char *name);
PROCESS_NAME(resolv_process); PROCESS_NAME(resolv_process);

22
core/net/tcpip.h
View file

@ -60,7 +60,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: tcpip.h,v 1.3 2006/08/10 16:43:32 bg- Exp $ * $Id: tcpip.h,v 1.4 2006/08/26 23:58:45 oliverschmidt Exp $
*/ */
#ifndef __TCPIP_H__ #ifndef __TCPIP_H__
#define __TCPIP_H__ #define __TCPIP_H__
@ -105,8 +105,8 @@ void tcpip_uipcall(void);
* process whenever an event occurs on the connection. * process whenever an event occurs on the connection.
* *
*/ */
void tcp_attach(struct uip_conn *conn, CCIF void tcp_attach(struct uip_conn *conn,
void *appstate); void *appstate);
#define tcp_markconn(conn, appstate) tcp_attach(conn, appstate) #define tcp_markconn(conn, appstate) tcp_attach(conn, appstate)
/** /**
@ -123,7 +123,7 @@ void tcp_attach(struct uip_conn *conn,
* \param port The port number in network byte order. * \param port The port number in network byte order.
* *
*/ */
void tcp_listen(u16_t port); CCIF void tcp_listen(u16_t port);
/** /**
* Close a listening TCP port. * Close a listening TCP port.
@ -137,7 +137,7 @@ void tcp_listen(u16_t port);
* \param port The port number in network byte order. * \param port The port number in network byte order.
* *
*/ */
void tcp_unlisten(u16_t port); CCIF void tcp_unlisten(u16_t port);
/** /**
* Open a TCP connection to the specified IP address and port. * Open a TCP connection to the specified IP address and port.
@ -162,8 +162,8 @@ void tcp_unlisten(u16_t port);
* memory could not be allocated for the connection. * memory could not be allocated for the connection.
* *
*/ */
struct uip_conn *tcp_connect(uip_ipaddr_t *ripaddr, u16_t port, CCIF struct uip_conn *tcp_connect(uip_ipaddr_t *ripaddr, u16_t port,
void *appstate); void *appstate);
/** /**
* Cause a specified TCP connection to be polled. * Cause a specified TCP connection to be polled.
@ -223,8 +223,8 @@ void udp_attach(struct uip_udp_conn *conn,
* \return A pointer to the newly created connection, or NULL if * \return A pointer to the newly created connection, or NULL if
* memory could not be allocated for the connection. * memory could not be allocated for the connection.
*/ */
struct uip_udp_conn *udp_new(uip_ipaddr_t *ripaddr, u16_t port, CCIF struct uip_udp_conn *udp_new(uip_ipaddr_t *ripaddr, u16_t port,
void *appstate); void *appstate);
/** /**
* Create a new UDP broadcast connection. * Create a new UDP broadcast connection.
@ -269,7 +269,7 @@ struct uip_udp_conn *udp_broadcast_new(u16_t port, void *appstate);
* \param conn A pointer to the UDP connection that should be polled. * \param conn A pointer to the UDP connection that should be polled.
* *
*/ */
void tcpip_poll_udp(struct uip_udp_conn *conn); CCIF void tcpip_poll_udp(struct uip_udp_conn *conn);
/** @} */ /** @} */
@ -278,7 +278,7 @@ void tcpip_poll_udp(struct uip_udp_conn *conn);
* *
* This event is posted to a process whenever a uIP event has occured. * This event is posted to a process whenever a uIP event has occured.
*/ */
extern process_event_t tcpip_event; CCIF extern process_event_t tcpip_event;
/** /**
* \name TCP/IP packet processing * \name TCP/IP packet processing

20
core/net/uip.h
View file

@ -46,7 +46,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip.h,v 1.3 2006/08/14 13:58:28 bg- Exp $ * $Id: uip.h,v 1.4 2006/08/26 23:58:45 oliverschmidt Exp $
* *
*/ */
@ -548,7 +548,7 @@ struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, u16_t port);
* *
* \hideinitializer * \hideinitializer
*/ */
void uip_send(const void *data, int len); CCIF void uip_send(const void *data, int len);
/** /**
* The length of any incoming data that is currently avaliable (if avaliable) * The length of any incoming data that is currently avaliable (if avaliable)
@ -1089,7 +1089,7 @@ struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport);
* network byte order, use the HTONS() macro instead. * network byte order, use the HTONS() macro instead.
*/ */
#ifndef htons #ifndef htons
u16_t htons(u16_t val); CCIF u16_t htons(u16_t val);
#endif /* htons */ #endif /* htons */
#ifndef ntohs #ifndef ntohs
#define ntohs htons #define ntohs htons
@ -1104,7 +1104,7 @@ u16_t htons(u16_t val);
* called. If the application wishes to send data, the application may * called. If the application wishes to send data, the application may
* use this space to write the data into before calling uip_send(). * use this space to write the data into before calling uip_send().
*/ */
extern void *uip_appdata; CCIF extern void *uip_appdata;
#if UIP_URGDATA > 0 #if UIP_URGDATA > 0
/* u8_t *uip_urgdata: /* u8_t *uip_urgdata:
@ -1139,7 +1139,7 @@ extern void *uip_urgdata;
* packet. * packet.
* *
*/ */
extern u16_t uip_len; CCIF extern u16_t uip_len;
/** @} */ /** @} */
@ -1195,9 +1195,9 @@ struct uip_conn {
* The uip_conn pointer can be used to access the current TCP * The uip_conn pointer can be used to access the current TCP
* connection. * connection.
*/ */
extern struct uip_conn *uip_conn; CCIF extern struct uip_conn *uip_conn;
/* The array containing all uIP connections. */ /* The array containing all uIP connections. */
extern struct uip_conn uip_conns[UIP_CONNS]; CCIF extern struct uip_conn uip_conns[UIP_CONNS];
/** /**
* \addtogroup uiparch * \addtogroup uiparch
* @{ * @{
@ -1310,7 +1310,7 @@ extern struct uip_stats uip_stat;
* that are defined in this file. Please read below for more * that are defined in this file. Please read below for more
* infomation. * infomation.
*/ */
extern u8_t uip_flags; CCIF extern u8_t uip_flags;
/* The following flags may be set in the global variable uip_flags /* The following flags may be set in the global variable uip_flags
before calling the application callback. The UIP_ACKDATA, before calling the application callback. The UIP_ACKDATA,
@ -1535,9 +1535,9 @@ struct uip_udpip_hdr {
#if UIP_FIXEDADDR #if UIP_FIXEDADDR
extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr; CCIF extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
#else /* UIP_FIXEDADDR */ #else /* UIP_FIXEDADDR */
extern uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr; CCIF extern uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
#endif /* UIP_FIXEDADDR */ #endif /* UIP_FIXEDADDR */
extern const uip_ipaddr_t uip_broadcast_addr; extern const uip_ipaddr_t uip_broadcast_addr;
extern const uip_ipaddr_t all_zeroes_addr; extern const uip_ipaddr_t all_zeroes_addr;

4
core/net/uip_arp.h
View file

@ -45,7 +45,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip_arp.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $ * $Id: uip_arp.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
* *
*/ */
@ -55,7 +55,7 @@
#include "net/uip.h" #include "net/uip.h"
extern struct uip_eth_addr uip_ethaddr; CCIF extern struct uip_eth_addr uip_ethaddr;
/** /**
* The Ethernet header. * The Ethernet header.

4
core/net/uiplib.h
View file

@ -37,7 +37,7 @@
* *
* This file is part of the Contiki desktop environment for the C64. * This file is part of the Contiki desktop environment for the C64.
* *
* $Id: uiplib.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $ * $Id: uiplib.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
* *
*/ */
#ifndef __UIPLIB_H__ #ifndef __UIPLIB_H__
@ -64,7 +64,7 @@
* \retval 0 If the IP address could not be parsed. * \retval 0 If the IP address could not be parsed.
* \retval Non-zero If the IP address was parsed. * \retval Non-zero If the IP address was parsed.
*/ */
unsigned char uiplib_ipaddrconv(char *addrstr, unsigned char *addr); CCIF unsigned char uiplib_ipaddrconv(char *addrstr, unsigned char *addr);
/** @} */ /** @} */

4
core/sys/dsc.h
View file

@ -56,7 +56,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: dsc.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $ * $Id: dsc.h,v 1.2 2006/08/26 23:59:39 oliverschmidt Exp $
* *
*/ */
#ifndef __DSC_H__ #ifndef __DSC_H__
@ -110,7 +110,7 @@ struct dsc {
*/ */
#if WITH_LOADER_ARCH #if WITH_LOADER_ARCH
#define DSC(dscname, description, prgname, process, icon) \ #define DSC(dscname, description, prgname, process, icon) \
const struct dsc dscname = {description, prgname, icon} CLIF const struct dsc dscname = {description, prgname, icon}
#else /* WITH_LOADER_ARCH */ #else /* WITH_LOADER_ARCH */
#define DSC(dscname, description, prgname, process, icon) \ #define DSC(dscname, description, prgname, process, icon) \
PROCESS_NAME(process); \ PROCESS_NAME(process); \

6
core/sys/etimer.h
View file

@ -58,7 +58,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: etimer.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $ * $Id: etimer.h,v 1.2 2006/08/26 23:59:39 oliverschmidt Exp $
*/ */
#ifndef __ETIMER_H__ #ifndef __ETIMER_H__
#define __ETIMER_H__ #define __ETIMER_H__
@ -96,7 +96,7 @@ struct etimer {
* process that called the etimer_set() function. * process that called the etimer_set() function.
* *
*/ */
void etimer_set(struct etimer *et, clock_time_t interval); CCIF void etimer_set(struct etimer *et, clock_time_t interval);
/** /**
* \brief Reset an event timer with the same interval as was * \brief Reset an event timer with the same interval as was
@ -181,7 +181,7 @@ clock_time_t etimer_start_time(struct etimer *et);
* This function tests if an event timer has expired and * This function tests if an event timer has expired and
* returns true or false depending on its status. * returns true or false depending on its status.
*/ */
int etimer_expired(struct etimer *et); CCIF int etimer_expired(struct etimer *et);
/** /**
* \brief Stop a pending event timer. * \brief Stop a pending event timer.

12
core/sys/process.h
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: process.h,v 1.2 2006/08/17 15:39:25 bg- Exp $ * @(#)$Id: process.h,v 1.3 2006/08/26 23:59:39 oliverschmidt Exp $
*/ */
/** /**
@ -279,7 +279,7 @@ static PT_THREAD(process_thread_##name(struct pt *process_pt, \
#else /* PROCESS_LOADABLE */ #else /* PROCESS_LOADABLE */
#define PROCESS_LOAD(name) #define PROCESS_LOAD(name)
#endif /* PROCESS_LOADABLE */ #endif /* PROCESS_LOADABLE */
extern const struct process *process_load; CLIF extern const struct process *process_load;
/** /**
* Declare the name of a process. * Declare the name of a process.
@ -374,7 +374,7 @@ void process_start(struct process *p, char *arg);
* \retval PROCESS_ERR_FULL The event queue was full and the event could * \retval PROCESS_ERR_FULL The event queue was full and the event could
* not be posted. * not be posted.
*/ */
int process_post(struct process *p, process_event_t ev, process_data_t data); CCIF int process_post(struct process *p, process_event_t ev, process_data_t data);
/** /**
* Post a synchronous event to a process. * Post a synchronous event to a process.
@ -399,7 +399,7 @@ void process_post_synch(struct process *p,
* *
* \sa PROCESS_CURRENT() * \sa PROCESS_CURRENT()
*/ */
void process_exit(struct process *p); CCIF void process_exit(struct process *p);
/** /**
@ -412,7 +412,7 @@ void process_exit(struct process *p);
* \hideinitializer * \hideinitializer
*/ */
#define PROCESS_CURRENT() process_current #define PROCESS_CURRENT() process_current
extern struct process *process_current; CCIF extern struct process *process_current;
#define PROCESS_SET_FLAGS(flags) #define PROCESS_SET_FLAGS(flags)
#define PROCESS_NO_BROADCAST #define PROCESS_NO_BROADCAST
@ -524,7 +524,7 @@ int process_nevents(void);
/** @} */ /** @} */
extern struct process *process_list; CCIF extern struct process *process_list;
#define PROCESS_LIST() process_list #define PROCESS_LIST() process_list