diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-31 12:22:38 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-31 12:22:38 +0000 |
commit | 2d76aa85de1ae2188becdedbfc00ce4eca3963af (patch) | |
tree | 03c67b88a7bfd0a06f0403d52cc5dc17e5dc970c /c | |
parent | 2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-2d76aa85de1ae2188becdedbfc00ce4eca3963af.tar.bz2 |
2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
PR 1531/newlib
* libchip/network/i82586.c:
Add local copy of ALIGN().
Diffstat (limited to 'c')
-rw-r--r-- | c/src/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/libchip/network/i82586.c | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index de1a601e24..3869b7c521 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,11 @@ 2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org> + PR 1531/newlib + * libchip/network/i82586.c: + Add local copy of ALIGN(). + +2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org> + * libchip/network/cs8900.c: Misc. changes to make code 16bit-target compliant. * libchip/network/i82586.c: diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c index c8e11bf7c1..4dd4a1d3ce 100644 --- a/c/src/libchip/network/i82586.c +++ b/c/src/libchip/network/i82586.c @@ -173,6 +173,15 @@ Mode of operation: #include "i82586reg.h" #include "i82586var.h" +#if defined(ALIGNBYTES) && defined(ALIGN) +/* FIXME: Redefine because some versions of + * RTEMS newlib and the BSDs ship a broken ALIGN */ +#undef ALIGN +#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES) +#else +#define ALIGN(p) (p) +#endif + /* * A global way to change all async cmd requests at once. For RTEMS and running * as tasks I wanted to see if the tx race condition is effected by this. |