diff options
| author | Julien Delange <julien.delange@gmail.com> | 2012-03-26 09:51:49 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-03-26 09:51:49 -0500 |
| commit | a52104cf463a461f6fcccd2cc6b11bd6691908c8 (patch) | |
| tree | 31a617ce2a74d3e799bd95fd634332f20347583f /freebsd/dev/e1000/e1000_ich8lan.c | |
| parent | Use new block device API (diff) | |
| download | rtems-libbsd-a52104cf463a461f6fcccd2cc6b11bd6691908c8.tar.bz2 | |
e1000 driver now compiles with fewer modifications
- Change some include path in the e1000 drivers
- Add some files from the FreeBSD source tree (modification in
freebsd-to-rtems.py)
- Avoid inconsistent functions declarations: the bool_t and/or
boolean_t are not the same between rtems and freebsd so that a
function with the prototype bool_t foobar() and another boolean_t
foobar() does not compile on rtems. (see if_igb.c for example)
Joel Note: These are still inconsistent on the FreeBSD side and need
to be addressed by them. We will just make the prototype
match the body until they give us a solution.
Diffstat (limited to 'freebsd/dev/e1000/e1000_ich8lan.c')
| -rw-r--r-- | freebsd/dev/e1000/e1000_ich8lan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freebsd/dev/e1000/e1000_ich8lan.c b/freebsd/dev/e1000/e1000_ich8lan.c index 41c118ee..d8c02cb5 100644 --- a/freebsd/dev/e1000/e1000_ich8lan.c +++ b/freebsd/dev/e1000/e1000_ich8lan.c @@ -64,10 +64,10 @@ * 82579V Gigabit Network Connection */ -#ifndef __rtems__ -#include <freebsd/local/e1000_api.h> -#else +#ifdef __rtems__ #include <freebsd/dev/e1000/e1000_api.h> +#else +#include <freebsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw); |