Deleted Added
sdiff udiff text old ( 302408 ) new ( 320897 )
full compact
ixgbe_osdep.c (302408) ixgbe_osdep.c (320897)
1/******************************************************************************
2
1/******************************************************************************
2
3 Copyright (c) 2001-2015, Intel Corporation
3 Copyright (c) 2001-2017, 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
9 1. Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer.
11

--- 13 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******************************************************************************/
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
9 1. Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer.
11

--- 13 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: stable/11/sys/dev/ixgbe/ixgbe_osdep.c 292674 2015-12-23 22:45:17Z sbruno $*/
33/*$FreeBSD: stable/11/sys/dev/ixgbe/ixgbe_osdep.c 320897 2017-07-11 21:25:07Z erj $*/
34
34
35#include "ixgbe_osdep.h"
36#include "ixgbe.h"
37
35#include "ixgbe.h"
36
38inline device_t
39ixgbe_dev_from_hw(struct ixgbe_hw *hw)
40{
41 return ((struct adapter *)hw->back)->dev;
42}
43
44inline u16
45ixgbe_read_pci_cfg(struct ixgbe_hw *hw, u32 reg)
46{
37inline u16
38ixgbe_read_pci_cfg(struct ixgbe_hw *hw, u32 reg)
39{
47 return pci_read_config(((struct adapter *)hw->back)->dev,
48 reg, 2);
40 return pci_read_config(((struct adapter *)hw->back)->dev, reg, 2);
49}
50
51inline void
52ixgbe_write_pci_cfg(struct ixgbe_hw *hw, u32 reg, u16 value)
53{
41}
42
43inline void
44ixgbe_write_pci_cfg(struct ixgbe_hw *hw, u32 reg, u16 value)
45{
54 pci_write_config(((struct adapter *)hw->back)->dev,
55 reg, value, 2);
46 pci_write_config(((struct adapter *)hw->back)->dev, reg, value, 2);
56}
57
58inline u32
59ixgbe_read_reg(struct ixgbe_hw *hw, u32 reg)
60{
61 return bus_space_read_4(((struct adapter *)hw->back)->osdep.mem_bus_space_tag,
47}
48
49inline u32
50ixgbe_read_reg(struct ixgbe_hw *hw, u32 reg)
51{
52 return bus_space_read_4(((struct adapter *)hw->back)->osdep.mem_bus_space_tag,
62 ((struct adapter *)hw->back)->osdep.mem_bus_space_handle,
63 reg);
53 ((struct adapter *)hw->back)->osdep.mem_bus_space_handle, reg);
64}
65
66inline void
67ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 val)
68{
69 bus_space_write_4(((struct adapter *)hw->back)->osdep.mem_bus_space_tag,
70 ((struct adapter *)hw->back)->osdep.mem_bus_space_handle,
71 reg, val);

--- 17 unchanged lines hidden --- 		54}
55
56inline void
57ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 val)
58{
59 bus_space_write_4(((struct adapter *)hw->back)->osdep.mem_bus_space_tag,
60 ((struct adapter *)hw->back)->osdep.mem_bus_space_handle,
61 reg, val);

--- 17 unchanged lines hidden ---