mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Update wsf_types.h to support updated CMSIS
							parent
							
								
									b4d5f0e10f
								
							
						
					
					
						commit
						38df9306d7
					
				| 
						 | 
					@ -25,22 +25,6 @@
 | 
				
			||||||
#ifndef WSF_TYPES_H
 | 
					#ifndef WSF_TYPES_H
 | 
				
			||||||
#define WSF_TYPES_H
 | 
					#define WSF_TYPES_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**************************************************************************************************
 | 
					 | 
				
			||||||
  Macros
 | 
					 | 
				
			||||||
**************************************************************************************************/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef NULL
 | 
					 | 
				
			||||||
#define NULL  0
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef TRUE
 | 
					 | 
				
			||||||
#define TRUE  1
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef FALSE
 | 
					 | 
				
			||||||
#define FALSE 0
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**************************************************************************************************
 | 
					/**************************************************************************************************
 | 
				
			||||||
  Data Types
 | 
					  Data Types
 | 
				
			||||||
**************************************************************************************************/
 | 
					**************************************************************************************************/
 | 
				
			||||||
| 
						 | 
					@ -60,7 +44,6 @@ typedef unsigned long uint32_t;
 | 
				
			||||||
typedef unsigned long long uint64_t;
 | 
					typedef unsigned long long uint64_t;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Boolean data type */
 | 
					#include <rtx_core_cm.h>
 | 
				
			||||||
typedef uint8_t bool_t;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* WSF_TYPES_H */
 | 
					#endif /* WSF_TYPES_H */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,42 +22,6 @@
 | 
				
			||||||
#ifndef WSF_TYPES_H
 | 
					#ifndef WSF_TYPES_H
 | 
				
			||||||
#define WSF_TYPES_H
 | 
					#define WSF_TYPES_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**************************************************************************************************
 | 
					#include <rtx_core_cm.h>
 | 
				
			||||||
  Macros
 | 
					 | 
				
			||||||
**************************************************************************************************/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef NULL
 | 
					 | 
				
			||||||
#define NULL  0
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef TRUE
 | 
					 | 
				
			||||||
#define TRUE  1
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef FALSE
 | 
					 | 
				
			||||||
#define FALSE 0
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**************************************************************************************************
 | 
					 | 
				
			||||||
  Data Types
 | 
					 | 
				
			||||||
**************************************************************************************************/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Integer data types */
 | 
					 | 
				
			||||||
#if ((defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) && \
 | 
					 | 
				
			||||||
     (__ICC8051__ == 0)) || defined(__CC_ARM) || \
 | 
					 | 
				
			||||||
     (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)) || \
 | 
					 | 
				
			||||||
     defined(__IAR_SYSTEMS_ICC__)
 | 
					 | 
				
			||||||
#include <stdint.h>
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
typedef signed char int8_t;
 | 
					 | 
				
			||||||
typedef unsigned char uint8_t;
 | 
					 | 
				
			||||||
typedef signed short int16_t;
 | 
					 | 
				
			||||||
typedef unsigned short uint16_t;
 | 
					 | 
				
			||||||
typedef signed long int32_t;
 | 
					 | 
				
			||||||
typedef unsigned long uint32_t;
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Boolean data type */
 | 
					 | 
				
			||||||
typedef uint8_t bool_t;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* WSF_TYPES_H */
 | 
					#endif /* WSF_TYPES_H */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,30 +22,7 @@
 | 
				
			||||||
#ifndef WSF_TYPES_H
 | 
					#ifndef WSF_TYPES_H
 | 
				
			||||||
#define WSF_TYPES_H
 | 
					#define WSF_TYPES_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**************************************************************************************************
 | 
					 | 
				
			||||||
  Macros
 | 
					 | 
				
			||||||
**************************************************************************************************/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef NULL
 | 
					 | 
				
			||||||
#define NULL  0
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef TRUE
 | 
					 | 
				
			||||||
#define TRUE  1
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef FALSE
 | 
					 | 
				
			||||||
#define FALSE 0
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**************************************************************************************************
 | 
					 | 
				
			||||||
  Data Types
 | 
					 | 
				
			||||||
**************************************************************************************************/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Integer data types */
 | 
					 | 
				
			||||||
#include <stdint.h>
 | 
					#include <stdint.h>
 | 
				
			||||||
 | 
					#include <rtx_core_cm.h>
 | 
				
			||||||
/* Boolean data type */
 | 
					 | 
				
			||||||
typedef uint8_t bool_t;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* WSF_TYPES_H */
 | 
					#endif /* WSF_TYPES_H */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue