X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Freplacements.h;h=565fe9dca83600bb68dc9489ace7b814a5d7eaf8;hb=677b02b475870b7d9e5d86e9bf61dc28dae5a6e4;hp=3598dd9fefa2f721ac945498d505c419018bcca2;hpb=75cfda4cd1fe057f0557bd86963a71e530edd584;p=openocd.git diff --git a/src/helper/replacements.h b/src/helper/replacements.h index 3598dd9fef..565fe9dca8 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -21,17 +21,18 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ + #ifndef REPLACEMENTS_H #define REPLACEMENTS_H /* MIN,MAX macros */ #ifndef MIN -#define MIN(a,b) (((a) < (b))?(a):(b)) +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif #ifndef MAX -#define MAX(a,b) (((a) > (b))?(a):(b)) +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) #endif /* for systems that do not support ENOTSUP @@ -56,7 +57,7 @@ struct timeval { long tv_usec; }; -#endif /* _TIMEVAL_DEFINED */ +#endif /* _TIMEVAL_DEFINED */ #endif @@ -107,33 +108,29 @@ void *fill_malloc(size_t size); * the following macros. Which is the default way. */ -/* #define malloc(_a) clear_malloc(_a) */ -/* #define malloc(_a) fill_malloc(_a) */ +/* #define malloc(_a) clear_malloc(_a) + * #define malloc(_a) fill_malloc(_a) */ /* GNU extensions to the C library that may be missing on some systems */ #ifndef HAVE_STRNDUP -char* strndup(const char *s, size_t n); -#endif /* HAVE_STRNDUP */ +char *strndup(const char *s, size_t n); +#endif /* HAVE_STRNDUP */ #ifndef HAVE_STRNLEN size_t strnlen(const char *s, size_t maxlen); -#endif /* HAVE_STRNLEN */ +#endif /* HAVE_STRNLEN */ #ifndef HAVE_USLEEP #ifdef _WIN32 -static __inline unsigned usleep(unsigned int usecs) +static inline unsigned usleep(unsigned int usecs) { Sleep((usecs/1000)); return 0; } #else -#if BUILD_ECOSBOARD -void usleep(int us); -#else #error no usleep defined for your platform #endif -#endif -#endif /* HAVE_USLEEP */ +#endif /* HAVE_USLEEP */ /* Windows specific */ #ifdef _WIN32 @@ -142,6 +139,13 @@ void usleep(int us); #include #include +/* Windows does not declare sockaddr_un */ +#define UNIX_PATH_LEN 108 +struct sockaddr_un { + uint16_t sun_family; + char sun_path[UNIX_PATH_LEN]; +}; + /* win32 systems do not support ETIMEDOUT */ #ifndef ETIMEDOUT @@ -149,26 +153,29 @@ void usleep(int us); #endif #if IS_MINGW == 1 -static __inline unsigned char inb(unsigned short int port) +static inline unsigned char inb(unsigned short int port) { unsigned char _v; - __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port)); + __asm__ __volatile__ ("inb %w1,%0" : "=a" (_v) : "Nd" (port)); return _v; } -static __inline void outb(unsigned char value, unsigned short int port) +static inline void outb(unsigned char value, unsigned short int port) { - __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port)); + __asm__ __volatile__ ("outb %b0,%w1" : : "a" (value), "Nd" (port)); } -#endif /* IS_MINGW */ +/* mingw does not have ffs, so use gcc builtin types */ +#define ffs __builtin_ffs + +#endif /* IS_MINGW */ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv); -#endif /* _WIN32 */ +#endif /* _WIN32 */ /* generic socket functions for Windows and Posix */ -static __inline int write_socket(int handle, const void *buffer, unsigned int count) +static inline int write_socket(int handle, const void *buffer, unsigned int count) { #ifdef _WIN32 return send(handle, buffer, count, 0); @@ -177,7 +184,7 @@ static __inline int write_socket(int handle, const void *buffer, unsigned int co #endif } -static __inline int read_socket(int handle, void *buffer, unsigned int count) +static inline int read_socket(int handle, void *buffer, unsigned int count) { #ifdef _WIN32 return recv(handle, buffer, count, 0); @@ -186,7 +193,7 @@ static __inline int read_socket(int handle, void *buffer, unsigned int count) #endif } -static __inline int close_socket(int sock) +static inline int close_socket(int sock) { #ifdef _WIN32 return closesocket(sock); @@ -195,7 +202,7 @@ static __inline int close_socket(int sock) #endif } -static __inline void socket_nonblock(int fd) +static inline void socket_nonblock(int fd) { #ifdef _WIN32 unsigned long nonblock = 1; @@ -206,7 +213,11 @@ static __inline void socket_nonblock(int fd) #endif } -static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv) +static inline int socket_select(int max_fd, + fd_set *rfds, + fd_set *wfds, + fd_set *efds, + struct timeval *tv) { #ifdef _WIN32 return win_select(max_fd, rfds, wfds, efds, tv); @@ -217,47 +228,43 @@ static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set #ifndef HAVE_ELF_H -#include - -typedef uint32_t Elf32_Addr; -typedef uint16_t Elf32_Half; -typedef uint32_t Elf32_Off; -typedef int32_t Elf32_Sword; -typedef uint32_t Elf32_Word; -typedef uint32_t Elf32_Size; -typedef Elf32_Off Elf32_Hashelt; - -typedef struct -{ - unsigned char e_ident[16]; /* Magic number and other info */ - Elf32_Half e_type; /* Object file type */ - Elf32_Half e_machine; /* Architecture */ - Elf32_Word e_version; /* Object file version */ - Elf32_Addr e_entry; /* Entry point virtual address */ - Elf32_Off e_phoff; /* Program header table file offset */ - Elf32_Off e_shoff; /* Section header table file offset */ - Elf32_Word e_flags; /* Processor-specific flags */ - Elf32_Half e_ehsize; /* ELF header size in bytes */ - Elf32_Half e_phentsize; /* Program header table entry size */ - Elf32_Half e_phnum; /* Program header table entry count */ - Elf32_Half e_shentsize; /* Section header table entry size */ - Elf32_Half e_shnum; /* Section header table entry count */ - Elf32_Half e_shstrndx; /* Section header string table index */ +typedef uint32_t Elf32_Addr; +typedef uint16_t Elf32_Half; +typedef uint32_t Elf32_Off; +typedef int32_t Elf32_Sword; +typedef uint32_t Elf32_Word; +typedef uint32_t Elf32_Size; +typedef Elf32_Off Elf32_Hashelt; + +typedef struct { + unsigned char e_ident[16]; /* Magic number and other info */ + Elf32_Half e_type; /* Object file type */ + Elf32_Half e_machine; /* Architecture */ + Elf32_Word e_version; /* Object file version */ + Elf32_Addr e_entry; /* Entry point virtual address */ + Elf32_Off e_phoff; /* Program header table file offset */ + Elf32_Off e_shoff; /* Section header table file offset */ + Elf32_Word e_flags; /* Processor-specific flags */ + Elf32_Half e_ehsize; /* ELF header size in bytes */ + Elf32_Half e_phentsize; /* Program header table entry size */ + Elf32_Half e_phnum; /* Program header table entry count */ + Elf32_Half e_shentsize; /* Section header table entry size */ + Elf32_Half e_shnum; /* Section header table entry count */ + Elf32_Half e_shstrndx; /* Section header string table index */ } Elf32_Ehdr; -#define ELFMAG "\177ELF" -#define SELFMAG 4 +#define ELFMAG "\177ELF" +#define SELFMAG 4 -#define EI_CLASS 4 /* File class byte index */ -#define ELFCLASS32 1 /* 32-bit objects */ -#define ELFCLASS64 2 /* 64-bit objects */ +#define EI_CLASS 4 /* File class byte index */ +#define ELFCLASS32 1 /* 32-bit objects */ +#define ELFCLASS64 2 /* 64-bit objects */ -#define EI_DATA 5 /* Data encoding byte index */ -#define ELFDATA2LSB 1 /* 2's complement, little endian */ -#define ELFDATA2MSB 2 /* 2's complement, big endian */ +#define EI_DATA 5 /* Data encoding byte index */ +#define ELFDATA2LSB 1 /* 2's complement, little endian */ +#define ELFDATA2MSB 2 /* 2's complement, big endian */ -typedef struct -{ +typedef struct { Elf32_Word p_type; /* Segment type */ Elf32_Off p_offset; /* Segment file offset */ Elf32_Addr p_vaddr; /* Segment virtual address */ @@ -268,8 +275,12 @@ typedef struct Elf32_Size p_align; /* Segment alignment */ } Elf32_Phdr; -#define PT_LOAD 1 /* Loadable program segment */ +#define PT_LOAD 1 /* Loadable program segment */ + +#endif /* HAVE_ELF_H */ -#endif /* HAVE_ELF_H */ +#if defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME +const char *libusb_error_name(int error_code); +#endif /* defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME */ -#endif /* REPLACEMENTS_H */ +#endif /* REPLACEMENTS_H */