Deleted Added
sdiff udiff text old ( 287990 ) new ( 295323 )
full compact
e1000_nvm.h (287990) e1000_nvm.h (295323)
1/******************************************************************************
2
3 Copyright (c) 2001-2015, 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-2015, 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/e1000/e1000_nvm.h 287990 2015-09-19 18:22:59Z sbruno $*/
33/*$FreeBSD: head/sys/dev/e1000/e1000_nvm.h 295323 2016-02-05 17:14:37Z erj $*/
34
35#ifndef _E1000_NVM_H_
36#define _E1000_NVM_H_
37
34
35#ifndef _E1000_NVM_H_
36#define _E1000_NVM_H_
37
38#if !defined(NO_READ_PBA_RAW) || !defined(NO_WRITE_PBA_RAW)
39struct e1000_pba {
40 u16 word[2];
41 u16 *pba_block;
42};
38struct e1000_pba {
39 u16 word[2];
40 u16 *pba_block;
41};
43#endif
44
45
46void e1000_init_nvm_ops_generic(struct e1000_hw *hw);
47s32 e1000_null_read_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c);
48void e1000_null_nvm_generic(struct e1000_hw *hw);
49s32 e1000_null_led_default(struct e1000_hw *hw, u16 *data);
50s32 e1000_null_write_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c);
51s32 e1000_acquire_nvm_generic(struct e1000_hw *hw);

--- 31 unchanged lines hidden --- 		42
43
44void e1000_init_nvm_ops_generic(struct e1000_hw *hw);
45s32 e1000_null_read_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c);
46void e1000_null_nvm_generic(struct e1000_hw *hw);
47s32 e1000_null_led_default(struct e1000_hw *hw, u16 *data);
48s32 e1000_null_write_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c);
49s32 e1000_acquire_nvm_generic(struct e1000_hw *hw);

--- 31 unchanged lines hidden ---