X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Freplacements.h;h=a029674f7a05f22373dcca579ffb2083cbcd6ac1;hb=c0d14dc7f19d785702eee5f69de5b1a63902554b;hp=b6165085a889ac2304913d18812fac14e3c2cb2a;hpb=9d1f95e01a4d273bd0e82a98719a4ea5ff435647;p=openocd.git diff --git a/src/helper/replacements.h b/src/helper/replacements.h index b6165085a8..a029674f7a 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -2,7 +2,7 @@ * Copyright (C) 2006 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -26,39 +26,12 @@ #ifndef REPLACEMENTS_H #define REPLACEMENTS_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "types.h" - -#if BUILD_ECOSBOARD -#include -#include -#include -#endif - -/* include necessary headers for socket functionality */ -#ifdef _WIN32 -#include -#else -#include -#include -#include -#include -#include -#endif - -#ifdef HAVE_SYS_PARAM_H -#include /* for MIN/MAX macros */ -#endif - /* 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 @@ -92,12 +65,15 @@ struct timezone { #endif struct timezone; -extern int gettimeofday(struct timeval *tv, struct timezone *tz); +int gettimeofday(struct timeval *tv, struct timezone *tz); + #endif +#ifndef IN_REPLACEMENTS_C /**** clear_malloc & fill_malloc ****/ void *clear_malloc(size_t size); void *fill_malloc(size_t size); +#endif /* * Now you have 3 ways for the malloc function: @@ -130,11 +106,11 @@ void *fill_malloc(size_t size); /* GNU extensions to the C library that may be missing on some systems */ #ifndef HAVE_STRNDUP -extern char* strndup(const char *s, size_t n); +char* strndup(const char *s, size_t n); #endif /* HAVE_STRNDUP */ #ifndef HAVE_STRNLEN -extern size_t strnlen(const char *s, size_t maxlen); +size_t strnlen(const char *s, size_t maxlen); #endif /* HAVE_STRNLEN */ #ifndef HAVE_USLEEP @@ -180,10 +156,13 @@ static __inline void outb(unsigned char value, unsigned short int port) } #endif /* IS_MINGW */ + +int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv); + #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); @@ -192,7 +171,7 @@ static __inline int write_socket( int handle, const void *buffer, unsigned int c #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); @@ -214,31 +193,50 @@ static __inline void socket_nonblock(int fd) { #ifdef _WIN32 unsigned long nonblock = 1; - ioctlsocket(fd, FIONBIO, &nonblock ); + ioctlsocket(fd, FIONBIO, &nonblock); #else int oldopts = fcntl(fd, F_GETFL, 0); fcntl(fd, F_SETFL, oldopts | O_NONBLOCK); #endif } +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); +#else + return select(max_fd, rfds, wfds, efds, tv); +#endif +} + #ifndef HAVE_ELF_H +#include "types.h" + +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 */ - u16 e_type; /* Object file type */ - u16 e_machine; /* Architecture */ - u32 e_version; /* Object file version */ - u32 e_entry; /* Entry point virtual address */ - u32 e_phoff; /* Program header table file offset */ - u32 e_shoff; /* Section header table file offset */ - u32 e_flags; /* Processor-specific flags */ - u16 e_ehsize; /* ELF header size in bytes */ - u16 e_phentsize; /* Program header table entry size */ - u16 e_phnum; /* Program header table entry count */ - u16 e_shentsize; /* Section header table entry size */ - u16 e_shnum; /* Section header table entry count */ - u16 e_shstrndx; /* Section header string table index */ + 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" @@ -254,14 +252,14 @@ typedef struct typedef struct { - u32 p_type; /* Segment type */ - u32 p_offset; /* Segment file offset */ - u32 p_vaddr; /* Segment virtual address */ - u32 p_paddr; /* Segment physical address */ - u32 p_filesz; /* Segment size in file */ - u32 p_memsz; /* Segment size in memory */ - u32 p_flags; /* Segment flags */ - u32 p_align; /* Segment alignment */ + Elf32_Word p_type; /* Segment type */ + Elf32_Off p_offset; /* Segment file offset */ + Elf32_Addr p_vaddr; /* Segment virtual address */ + Elf32_Addr p_paddr; /* Segment physical address */ + Elf32_Size p_filesz; /* Segment size in file */ + Elf32_Size p_memsz; /* Segment size in memory */ + Elf32_Word p_flags; /* Segment flags */ + Elf32_Size p_align; /* Segment alignment */ } Elf32_Phdr; #define PT_LOAD 1 /* Loadable program segment */