--- libelwix/inc/elwix.h 2013/06/19 00:11:16 1.5 +++ libelwix/inc/elwix.h 2013/06/28 08:39:41 1.6.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: elwix.h,v 1.5 2013/06/19 00:11:16 misho Exp $ +* $Id: elwix.h,v 1.6.4.1 2013/06/28 08:39:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -50,6 +50,8 @@ SUCH DAMAGE. #include #include #include +#include +#include #include #include #include @@ -67,12 +69,17 @@ SUCH DAMAGE. #include #include #include +#include #ifndef STRSIZ #define STRSIZ 256 #endif +#ifndef NBBY +#define NBBY 8 /* number of bits in a byte */ +#endif + #ifndef be16toh #define be16toh betoh16 #endif @@ -92,14 +99,59 @@ SUCH DAMAGE. #define le64toh letoh64 #endif -#define E_ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) +/* Bit map related macros. */ +#ifndef setbit +#define setbit(a, i) (((unsigned char *)(a))[(i) / NBBY] |= 1 << ((i) % NBBY)) +#endif +#ifndef clrbit +#define clrbit(a, i) (((unsigned char *)(a))[(i) / NBBY] &= ~(1 << ((i) % NBBY))) +#endif +#ifndef isset +#define isset(a, i) (((const unsigned char *)(a))[(i) / NBBY] & (1 << ((i) % NBBY))) +#endif +#ifndef isclr +#define isclr(a, i) ((((const unsigned char *)(a))[(i) / NBBY] & (1 << ((i) % NBBY))) == 0) +#endif +/* Macros for counting and rounding. */ +#ifndef howmany +#define howmany(x, y) (((x) + ((y) - 1)) / (y)) +#endif +#ifndef nitems +#define nitems(x) (sizeof((x)) / sizeof((x)[0])) +#endif +#ifndef rounddown +#define rounddown(x, y) (((x) / (y)) * (y)) +#endif +#ifndef rounddown2 +#define rounddown2(x, y) ((x) & (~((y) - 1))) /* if y is power of two */ +#endif +#ifndef roundup +#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) /* to any y */ +#endif +#ifndef roundup2 +#define roundup2(x, y) (((x) + ((y) - 1)) & (~((y) - 1))) /* if y is powers of two */ +#endif +#ifndef powerof2 +#define powerof2(x) ((((x) - 1) & (x)) == 0) +#endif -#define ELWIX_SYSM 0 -#define ELWIX_MPOOL 1 +/* Macros for min/max. */ +#ifndef MIN +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#endif -#define VACUUM_LEFT 1 -#define VACUUM_BETWEEN 2 +#define E_ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) + + +#define ELWIX_SYSM 0 +#define ELWIX_MPOOL 1 + +#define VACUUM_LEFT 1 +#define VACUUM_BETWEEN 2 // elwix_SetProg() Set program memory pool name