Update wsf_types.h to support updated CMSIS

pull/6273/head
Bartek Szatkowski 2018-04-30 12:32:04 +01:00
parent b4d5f0e10f
commit 38df9306d7
3 changed files with 3 additions and 79 deletions

View File

@ -25,22 +25,6 @@
#ifndef 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
**************************************************************************************************/
@ -60,7 +44,6 @@ typedef unsigned long uint32_t;
typedef unsigned long long uint64_t;
#endif
/* Boolean data type */
typedef uint8_t bool_t;
#include <rtx_core_cm.h>
#endif /* WSF_TYPES_H */

View File

@ -22,42 +22,6 @@
#ifndef 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 */
#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;
#include <rtx_core_cm.h>
#endif /* WSF_TYPES_H */

View File

@ -22,30 +22,7 @@
#ifndef 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>
/* Boolean data type */
typedef uint8_t bool_t;
#include <rtx_core_cm.h>
#endif /* WSF_TYPES_H */