33c33
< /*$FreeBSD: head/sys/dev/e1000/e1000_osdep.h 287990 2015-09-19 18:22:59Z sbruno $*/
---
> /*$FreeBSD: head/sys/dev/e1000/e1000_osdep.h 295323 2016-02-05 17:14:37Z erj $*/
63c63
< #define usec_delay_irq(x) DELAY(x)
---
> #define usec_delay_irq(x) usec_delay(x)
67,72c67,68
< #define DEBUGFUNC(F) DEBUGOUT(F);
< #define DEBUGOUT(S) do {} while (0)
< #define DEBUGOUT1(S,A) do {} while (0)
< #define DEBUGOUT2(S,A,B) do {} while (0)
< #define DEBUGOUT3(S,A,B,C) do {} while (0)
< #define DEBUGOUT7(S,A,B,C,D,E,F,G) do {} while (0)
---
> /* Enable/disable debugging statements in shared code */
> #define DBG 0
73a70,77
> #define DEBUGOUT(...) \
> do { if (DBG) printf(__VA_ARGS__); } while (0)
> #define DEBUGOUT1(...) DEBUGOUT(__VA_ARGS__)
> #define DEBUGOUT2(...) DEBUGOUT(__VA_ARGS__)
> #define DEBUGOUT3(...) DEBUGOUT(__VA_ARGS__)
> #define DEBUGOUT7(...) DEBUGOUT(__VA_ARGS__)
> #define DEBUGFUNC(F) DEBUGOUT(F "\n")
>
77,80d80
< #ifndef __bool_true_false_are_defined
< #define false FALSE
< #define true TRUE
< #endif
102,104d101
< #ifndef __bool_true_false_are_defined
< typedef boolean_t bool;
< #endif