Deleted Added
sdiff udiff text old ( 169248 ) new ( 169589 )
full compact
e1000_nvm.h (169248) e1000_nvm.h (169589)
1/*******************************************************************************
2
3 Copyright (c) 2001-2007, 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-2007, 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/em/e1000_nvm.h 169589 2007-05-16 00:14:23Z jfv $*/
33
34
34/*
35 * $FreeBSD: head/sys/dev/em/e1000_nvm.h 169248 2007-05-04 13:30:44Z rwatson $
36 */
37
35
38
39#ifndef _E1000_NVM_H_
40#define _E1000_NVM_H_
41
36#ifndef _E1000_NVM_H_
37#define _E1000_NVM_H_
38
42#include "e1000_api.h"
43
44s32 e1000_acquire_nvm_generic(struct e1000_hw *hw);
45
46s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
47s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);
48s32 e1000_read_part_num_generic(struct e1000_hw *hw, u32 *part_num);
49s32 e1000_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
50s32 e1000_read_nvm_microwire(struct e1000_hw *hw, u16 offset,
51 u16 words, u16 *data);

--- 20 unchanged lines hidden --- 		39s32 e1000_acquire_nvm_generic(struct e1000_hw *hw);
40
41s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
42s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);
43s32 e1000_read_part_num_generic(struct e1000_hw *hw, u32 *part_num);
44s32 e1000_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
45s32 e1000_read_nvm_microwire(struct e1000_hw *hw, u16 offset,
46 u16 words, u16 *data);

--- 20 unchanged lines hidden ---