X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Freplacements.h;h=069519d1a8906f6e027532d05a3f4a9c15598995;hb=a28eaa85f73759bb189a46308642502c9fa5aa4b;hp=ca042d6059707e06d500877f6c87ed485cf02e51;hpb=4b97f3cbb9603c13f69f8d3b5371c12045593126;p=openocd.git diff --git a/src/helper/replacements.h b/src/helper/replacements.h index ca042d6059..069519d1a8 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -2,6 +2,12 @@ * Copyright (C) 2006 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * 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 * @@ -26,6 +32,12 @@ #include "types.h" +#if BUILD_ECOSBOARD +#include +#include +#include +#endif + /* include necessary headers for socket functionality */ #ifdef _WIN32 #include @@ -48,9 +60,14 @@ #ifndef MAX #define MAX(a,b) (((a)>(b))?(a):(b)) #endif - -/* gettimeofday() */ -#ifndef HAVE_GETTIMEOFDAY + +/* for systems that do not support ENOTSUP + * win32 being one of them */ +#ifndef ENOTSUP +#define ENOTSUP 134 /* Not supported */ +#endif + +#ifndef HAVE_SYS_TIME_H #ifndef _TIMEVAL_DEFINED #define _TIMEVAL_DEFINED @@ -59,16 +76,59 @@ 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_dsttime; }; +#endif +struct timezone; extern int gettimeofday(struct timeval *tv, struct timezone *tz); #endif +/**** clear_malloc & fill_malloc ****/ +void *clear_malloc(size_t size); +void *fill_malloc(size_t size); + +/* + * Now you have 3 ways for the malloc function: + * + * 1. Do not change anything, use the original malloc + * + * 2. Use the clear_malloc function instead of the original malloc. + * In this case you must use the following define: + * #define malloc((_a)) clear_malloc((_a)) + * + * 3. Use the fill_malloc function instead of the original malloc. + * In this case you must use the following define: + * #define malloc((_a)) fill_malloc((_a)) + * + * 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. + * + * 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) */ + /* 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); @@ -79,15 +139,19 @@ extern size_t strnlen(const char *s, size_t maxlen); #endif /* HAVE_STRNLEN */ #ifndef HAVE_USLEEP +#ifdef _WIN32 static __inline unsigned usleep(unsigned int usecs) { -#ifdef _WIN32 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 */ /* Windows specific */ @@ -97,8 +161,6 @@ static __inline unsigned usleep(unsigned int usecs) #include #include -#undef ERROR - #if IS_MINGW == 1 static __inline unsigned char inb(unsigned short int port) { @@ -146,7 +208,7 @@ static __inline int close_socket(int sock) static __inline void socket_nonblock(int fd) { #ifdef _WIN32 - long nonblock = 1; + unsigned long nonblock = 1; ioctlsocket(fd, FIONBIO, &nonblock ); #else int oldopts = fcntl(fd, F_GETFL, 0); @@ -187,14 +249,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 */ + 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_Phdr; #define PT_LOAD 1 /* Loadable program segment */