ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicate sydefs.h confusion.

This commit is contained in:
Stefan `Sec` Zehl 2012-01-15 14:04:26 +01:00
parent 7ec64c04ad
commit f38fb4c148
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/core/sysdefs.h
View File

@ -39,20 +39,12 @@
#ifndef _SYSDEFS_H_ #ifndef _SYSDEFS_H_
#define _SYSDEFS_H_ #define _SYSDEFS_H_
#include "../sysdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
// Stay compatible with ugly "windows" style
#define BOOL bool
#define TRUE true
#define FALSE false
typedef volatile uint8_t REG8;
typedef volatile uint16_t REG16;
typedef volatile uint32_t REG32;
typedef unsigned char byte_t;
#define pREG8 (REG8 *) #define pREG8 (REG8 *)
#define pREG16 (REG16 *) #define pREG16 (REG16 *)
#define pREG32 (REG32 *) #define pREG32 (REG32 *)

15
firmware/sysdefs.h
View File

@ -36,10 +36,10 @@
*/ */
/**************************************************************************/ /**************************************************************************/
#ifndef _SYSDEFS_H_ #ifndef _GLOBAL_SYSDEFS_H_
#define _SYSDEFS_H_ #define _GLOBAL_SYSDEFS_H_
#include <stdio.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@ -53,18 +53,9 @@ typedef volatile uint16_t REG16;
typedef volatile uint32_t REG32; typedef volatile uint32_t REG32;
typedef unsigned char byte_t; typedef unsigned char byte_t;
#define pREG8 (REG8 *)
#define pREG16 (REG16 *)
#define pREG32 (REG32 *)
#ifndef NULL
#define NULL ((void *) 0)
#endif
// Save some space // Save some space
#ifndef SIMULATOR #ifndef SIMULATOR
#define memcpy memmove #define memcpy memmove
#endif #endif
#endif #endif