X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Freplacements.h;h=34e5daa44fd209ef4e0137c1373583146567f286;hp=3f88f7f66913c730a1510620e25b440aa8dcaef4;hb=dd85eebf2225ee77dedd679f745c7fb1975d8203;hpb=526fe3d83e118d87af34353a7140c02f3f1a3c19 diff --git a/src/helper/replacements.h b/src/helper/replacements.h index 3f88f7f669..34e5daa44f 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -2,9 +2,12 @@ * 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 * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -23,33 +26,8 @@ #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)) @@ -64,8 +42,7 @@ #define ENOTSUP 134 /* Not supported */ #endif -/* gettimeofday() */ -#ifndef HAVE_GETTIMEOFDAY +#ifndef HAVE_SYS_TIME_H #ifndef _TIMEVAL_DEFINED #define _TIMEVAL_DEFINED @@ -74,19 +51,30 @@ struct timeval { long tv_sec; long tv_usec; }; + #endif /* _TIMEVAL_DEFINED */ +#endif + +/* gettimeofday() */ +#ifndef HAVE_GETTIMEOFDAY + +#ifdef _WIN32 struct timezone { - int tz_minuteswest; + int tz_minuteswest; int tz_dsttime; }; +#endif +struct timezone; extern 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: @@ -103,17 +91,17 @@ void *fill_malloc(size_t size); * * We have figured out that there could exist some malloc problems * where variables are using without to be initialise. To find this - * places, use the fill_malloc function. With this function we want - * to initialize memory to some known bad state. This is quite easily - * spotted in the debugger and will trap to an invalid address. + * places, use the fill_malloc function. With this function we want + * to initialize memory to some known bad state. This is quite easily + * spotted in the debugger and will trap to an invalid address. * - * clear_malloc can be used if you want to set not initialise + * clear_malloc can be used if you want to set not initialise * variable to 0. * * If you do not want to change the malloc function, to not use one of * the following macros. Which is the default way. */ - + /* #define malloc(_a) clear_malloc(_a) */ /* #define malloc(_a) fill_malloc(_a) */ @@ -136,7 +124,7 @@ static __inline unsigned usleep(unsigned int usecs) #else #if BUILD_ECOSBOARD void usleep(int us); -#else +#else #error no usleep defined for your platform #endif #endif @@ -149,6 +137,12 @@ void usleep(int us); #include #include +/* win32 systems do not support ETIMEDOUT */ + +#ifndef ETIMEDOUT +#define ETIMEDOUT WSAETIMEDOUT +#endif + #if IS_MINGW == 1 static __inline unsigned char inb(unsigned short int port) { @@ -163,33 +157,36 @@ 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 ) { #ifdef _WIN32 - return send(handle, buffer, count, 0); + return send(handle, buffer, count, 0); #else - return write(handle, buffer, count); + return write(handle, buffer, count); #endif } static __inline int read_socket( int handle, void *buffer, unsigned int count ) { #ifdef _WIN32 - return recv(handle, buffer, count, 0); + return recv(handle, buffer, count, 0); #else - return read(handle, buffer, count); + return read(handle, buffer, count); #endif } static __inline int close_socket(int sock) { #ifdef _WIN32 - return closesocket(sock); + return closesocket(sock); #else - return close(sock); + return close(sock); #endif } @@ -204,6 +201,15 @@ 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) +{ +#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 typedef struct @@ -217,9 +223,9 @@ typedef struct 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_phentsize; /* Program header table entry size */ u16 e_phnum; /* Program header table entry count */ - u16 e_shentsize; /* Section header table entry size */ + 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_Ehdr;