Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Oliver Schmidt 2013-12-03 21:41:16 +01:00
commit 8386be428c
960 changed files with 7250 additions and 43684 deletions

View file

@ -32,8 +32,8 @@
*
*/
#ifndef __6502DEF_H__
#define __6502DEF_H__
#ifndef S502DEF_H_
#define S502DEF_H_
#include <ctype.h>
#include <conio.h>
@ -160,4 +160,4 @@ typedef unsigned short uip_stats_t;
#define cfs_remove remove
#endif /* WITH_PFS */
#endif /* __6502DEF_H__ */
#endif /* S502DEF_H_ */

View file

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

View file

@ -32,9 +32,9 @@
*
*/
#ifndef __ERROR_H__
#define __ERROR_H__
#ifndef ERROR_H_
#define ERROR_H_
void error_exit(void);
#endif /* __ERROR_H__ */
#endif /* ERROR_H_ */

View file

@ -32,8 +32,8 @@
*
*/
#ifndef __PFS_H__
#define __PFS_H__
#ifndef PFS_H_
#define PFS_H_
int __fastcall__ pfs_open(const char* name, int flags);
void __fastcall__ pfs_close(int fd);
@ -42,4 +42,4 @@ int __fastcall__ pfs_write(int fd, void* buf, unsigned int len);
int __fastcall__ pfs_seek(int fd, int offset, int whence);
int __fastcall__ pfs_remove(const char *name);
#endif /* __PFS_H__ */
#endif /* PFS_H_ */

View file

@ -32,11 +32,11 @@
*
*/
#ifndef __UNLOAD_H__
#define __UNLOAD_H__
#ifndef UNLOAD_H_
#define UNLOAD_H_
#define LOADER_UNLOAD unload
void unload(void);
#endif /* __UNLOAD_H__ */
#endif /* UNLOAD_H_ */

View file

@ -30,8 +30,8 @@
*
*/
#ifndef __ETHERNET_DRV_H__
#define __ETHERNET_DRV_H__
#ifndef ETHERNET_DRV_H_
#define ETHERNET_DRV_H_
#include "contiki.h"
@ -44,4 +44,4 @@ PROCESS_NAME(ethernet_process);
uint8_t ethernet_output(void);
#endif /* __ETHERNET_DRV_H__ */
#endif /* ETHERNET_DRV_H_ */

View file

@ -32,12 +32,12 @@
*
*/
#ifndef __ETHERNET_H__
#define __ETHERNET_H__
#ifndef ETHERNET_H_
#define ETHERNET_H_
void CC_FASTCALL ethernet_init(struct ethernet_config *config);
uint16_t ethernet_poll(void);
void ethernet_send(void);
void ethernet_exit(void);
#endif /* __ETHERNET_H__ */
#endif /* ETHERNET_H_ */

View file

@ -35,8 +35,8 @@
within a function.
*/
#ifndef __LC_H__
#define __LC_H__
#ifndef LC_H_
#define LC_H_
typedef void * lc_t;
@ -48,4 +48,4 @@ void __fastcall__ lc_resume(lc_t *lc);
#define LC_INIT(lc) (lc) = NULL
#define LC_END(lc)
#endif /* __LC_H__ */
#endif /* LC_H_ */

View file

@ -32,8 +32,8 @@
*
*/
#ifndef __MTARCH_H__
#define __MTARCH_H__
#ifndef MTARCH_H_
#define MTARCH_H_
#define MTARCH_CPUSTACKSIZE 256
#define MTARCH_CSTACKSIZE 256
@ -46,4 +46,4 @@ struct mtarch_thread {
unsigned char zp [MTARCH_ZPSIZE];
};
#endif /* __MTARCH_H__ */
#endif /* MTARCH_H_ */

View file

@ -30,8 +30,8 @@
*
*/
#ifndef __RTIMER_ARCH_H__
#define __RTIMER_ARCH_H__
#ifndef RTIMER_ARCH_H_
#define RTIMER_ARCH_H_
#include "contiki-conf.h"
@ -39,4 +39,4 @@
#define rtimer_arch_now() clock_time()
#endif /* __RTIMER_ARCH_H__ */
#endif /* RTIMER_ARCH_H_ */