ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use retarget defines where possible 

Remove the condition code around the defines in mbed_retarget.h so
all toolchains use the defined values. Exclude a small subset of
values for GCC since these are in its standard header files.
pull/5528/head
Russ Butler 2017-11-17 19:40:47 -06:00
parent 41eb565d9c
commit beb0b20e32
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/mbed_retarget.cpp
View File

@ -63,7 +63,6 @@ static SingletonPtr<PlatformMutex> _mutex;
# define STDERR_FILENO 2 # define STDERR_FILENO 2
#else #else
# include <sys/stat.h>
# include <sys/syslimits.h> # include <sys/syslimits.h>
# define PREFIX(x) x # define PREFIX(x) x
#endif #endif

17
platform/mbed_retarget.h
View File

@ -28,15 +28,16 @@
/* We can get the following standard types from sys/types for gcc, but we /* We can get the following standard types from sys/types for gcc, but we
* need to define the types ourselves for the other compilers that normally * need to define the types ourselves for the other compilers that normally
* target embedded systems */ * target embedded systems */
#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
typedef signed int ssize_t; ///< Signed size type, usually encodes negative errors typedef signed int ssize_t; ///< Signed size type, usually encodes negative errors
typedef signed long off_t; ///< Offset in a data stream typedef signed long off_t; ///< Offset in a data stream
#if defined(__ARMCC_VERSION) || !defined(__GNUC__)
typedef unsigned int mode_t; ///< Mode for opening files typedef unsigned int mode_t; ///< Mode for opening files
typedef unsigned int dev_t; ///< Device ID type typedef unsigned int dev_t; ///< Device ID type
typedef unsigned long ino_t; ///< File serial number typedef unsigned long ino_t; ///< File serial number
typedef unsigned int nlink_t; ///< Number of links to a file typedef unsigned int nlink_t; ///< Number of links to a file
typedef unsigned int uid_t; ///< User ID typedef unsigned int uid_t; ///< User ID
typedef unsigned int gid_t; ///< Group ID typedef unsigned int gid_t; ///< Group ID
#endif
#define O_RDONLY 0 ///< Open for reading #define O_RDONLY 0 ///< Open for reading
#define O_WRONLY 1 ///< Open for writing #define O_WRONLY 1 ///< Open for writing
@ -45,19 +46,12 @@ typedef unsigned int gid_t; ///< Group ID
#define O_TRUNC 0x0400 ///< Truncate file to zero length #define O_TRUNC 0x0400 ///< Truncate file to zero length
#define O_EXCL 0x0800 ///< Fail if file exists #define O_EXCL 0x0800 ///< Fail if file exists
#define O_APPEND 0x0008 ///< Set file offset to end of file prior to each write #define O_APPEND 0x0008 ///< Set file offset to end of file prior to each write
#define O_BINARY 0x8000 ///< Open file in binary mode
#define NAME_MAX 255 ///< Maximum size of a name in a file path #define NAME_MAX 255 ///< Maximum size of a name in a file path
#include <time.h> #include <time.h>
#else
#include <sys/fcntl.h>
#include <sys/types.h>
#include <sys/syslimits.h>
#endif
/** \addtogroup platform */ /** \addtogroup platform */
/** @{*/ /** @{*/
/** /**
@ -94,7 +88,6 @@ extern "C" {
#endif #endif
#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
/* The intent of this section is to unify the errno error values to match /* The intent of this section is to unify the errno error values to match
* the POSIX definitions for the GCC_ARM, ARMCC and IAR compilers. This is * the POSIX definitions for the GCC_ARM, ARMCC and IAR compilers. This is
* necessary because the ARMCC/IAR errno.h, or sys/stat.h are missing some * necessary because the ARMCC/IAR errno.h, or sys/stat.h are missing some
@ -365,9 +358,7 @@ extern "C" {
#define EOWNERDEAD 130 /* Owner died */ #define EOWNERDEAD 130 /* Owner died */
#undef ENOTRECOVERABLE #undef ENOTRECOVERABLE
#define ENOTRECOVERABLE 131 /* State not recoverable */ #define ENOTRECOVERABLE 131 /* State not recoverable */
#endif
#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
/* Missing stat.h defines. /* Missing stat.h defines.
* The following are sys/stat.h definitions not currently present in the ARMCC * The following are sys/stat.h definitions not currently present in the ARMCC
* errno.h. Note, ARMCC errno.h defines some symbol values differing from * errno.h. Note, ARMCC errno.h defines some symbol values differing from
@ -424,8 +415,6 @@ struct stat {
time_t st_ctime; ///< Time of last status change time_t st_ctime; ///< Time of last status change
}; };
#endif /* defined(__ARMCC_VERSION) || defined(__ICCARM__) */
/* The following are dirent.h definitions are declared here to garuntee /* The following are dirent.h definitions are declared here to garuntee
* consistency where structure may be different with different toolchains * consistency where structure may be different with different toolchains