Deleted Added
full compact
ixgbe_osdep.h (230790) ixgbe_osdep.h (238149)
1/******************************************************************************
2
3 Copyright (c) 2001-2012, Intel Corporation
4 All rights reserved.
5
6 Redistribution and use in source and binary forms, with or without
7 modification, are permitted provided that the following conditions are met:
8

--- 16 unchanged lines hidden (view full) ---

25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 POSSIBILITY OF SUCH DAMAGE.
31
32******************************************************************************/
1/******************************************************************************
2
3 Copyright (c) 2001-2012, Intel Corporation
4 All rights reserved.
5
6 Redistribution and use in source and binary forms, with or without
7 modification, are permitted provided that the following conditions are met:
8

--- 16 unchanged lines hidden (view full) ---

25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 POSSIBILITY OF SUCH DAMAGE.
31
32******************************************************************************/
33/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_osdep.h 230790 2012-01-30 23:03:21Z jfv $*/
33/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_osdep.h 238149 2012-07-05 20:51:44Z jfv $*/
34
35#ifndef _IXGBE_OS_H_
36#define _IXGBE_OS_H_
37
38#include <sys/types.h>
39#include <sys/param.h>
40#include <sys/endian.h>
41#include <sys/systm.h>

--- 8 unchanged lines hidden (view full) ---

50#include <machine/resource.h>
51#include <vm/vm.h>
52#include <vm/pmap.h>
53#include <machine/clock.h>
54#include <dev/pci/pcivar.h>
55#include <dev/pci/pcireg.h>
56
57#define ASSERT(x) if(!(x)) panic("IXGBE: x")
34
35#ifndef _IXGBE_OS_H_
36#define _IXGBE_OS_H_
37
38#include <sys/types.h>
39#include <sys/param.h>
40#include <sys/endian.h>
41#include <sys/systm.h>

--- 8 unchanged lines hidden (view full) ---

50#include <machine/resource.h>
51#include <vm/vm.h>
52#include <vm/pmap.h>
53#include <machine/clock.h>
54#include <dev/pci/pcivar.h>
55#include <dev/pci/pcireg.h>
56
57#define ASSERT(x) if(!(x)) panic("IXGBE: x")
58#define EWARN(H, W, S) printf(W)
58
59/* The happy-fun DELAY macro is defined in /usr/src/sys/i386/include/clock.h */
60#define usec_delay(x) DELAY(x)
61#define msec_delay(x) DELAY(1000*(x))
62
63#define DBG 0
64#define MSGOUT(S, A, B) printf(S "\n", A, B)
65#define DEBUGFUNC(F) DEBUGOUT(F);

--- 39 unchanged lines hidden (view full) ---

105typedef uint16_t u16;
106typedef uint32_t u32;
107typedef int32_t s32;
108typedef uint64_t u64;
109#ifndef __bool_true_false_are_defined
110typedef boolean_t bool;
111#endif
112
59
60/* The happy-fun DELAY macro is defined in /usr/src/sys/i386/include/clock.h */
61#define usec_delay(x) DELAY(x)
62#define msec_delay(x) DELAY(1000*(x))
63
64#define DBG 0
65#define MSGOUT(S, A, B) printf(S "\n", A, B)
66#define DEBUGFUNC(F) DEBUGOUT(F);

--- 39 unchanged lines hidden (view full) ---

106typedef uint16_t u16;
107typedef uint32_t u32;
108typedef int32_t s32;
109typedef uint64_t u64;
110#ifndef __bool_true_false_are_defined
111typedef boolean_t bool;
112#endif
113
114/* shared code requires this */
115#define __le16 u16
116#define __le32 u32
117#define __le64 u64
118#define __be16 u16
119#define __be32 u32
120#define __be64 u64
121
113#define le16_to_cpu
114
115#if __FreeBSD_version < 800000
116#if defined(__i386__) || defined(__amd64__)
117#define mb() __asm volatile("mfence" ::: "memory")
118#define wmb() __asm volatile("sfence" ::: "memory")
119#define rmb() __asm volatile("lfence" ::: "memory")
120#else

--- 56 unchanged lines hidden ---
122#define le16_to_cpu
123
124#if __FreeBSD_version < 800000
125#if defined(__i386__) || defined(__amd64__)
126#define mb() __asm volatile("mfence" ::: "memory")
127#define wmb() __asm volatile("sfence" ::: "memory")
128#define rmb() __asm volatile("lfence" ::: "memory")
129#else

--- 56 unchanged lines hidden ---