Deleted Added
full compact
e1000_api.c (194865) e1000_api.c (200243)
1/******************************************************************************
2
3 Copyright (c) 2001-2009, 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-2009, 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_api.c 194865 2009-06-24 17:41:29Z jfv $*/
33/*$FreeBSD: head/sys/dev/e1000/e1000_api.c 200243 2009-12-08 01:07:44Z jfv $*/
34
35#include "e1000_api.h"
36
37/**
38 * e1000_init_mac_params - Initialize MAC function pointers
39 * @hw: pointer to the HW structure
40 *
41 * This function initializes the function pointers for the MAC

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

227 break;
228 case E1000_DEV_ID_ICH8_IFE:
229 case E1000_DEV_ID_ICH8_IFE_GT:
230 case E1000_DEV_ID_ICH8_IFE_G:
231 case E1000_DEV_ID_ICH8_IGP_M:
232 case E1000_DEV_ID_ICH8_IGP_M_AMT:
233 case E1000_DEV_ID_ICH8_IGP_AMT:
234 case E1000_DEV_ID_ICH8_IGP_C:
34
35#include "e1000_api.h"
36
37/**
38 * e1000_init_mac_params - Initialize MAC function pointers
39 * @hw: pointer to the HW structure
40 *
41 * This function initializes the function pointers for the MAC

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

227 break;
228 case E1000_DEV_ID_ICH8_IFE:
229 case E1000_DEV_ID_ICH8_IFE_GT:
230 case E1000_DEV_ID_ICH8_IFE_G:
231 case E1000_DEV_ID_ICH8_IGP_M:
232 case E1000_DEV_ID_ICH8_IGP_M_AMT:
233 case E1000_DEV_ID_ICH8_IGP_AMT:
234 case E1000_DEV_ID_ICH8_IGP_C:
235 case E1000_DEV_ID_ICH8_82567V_3:
235 mac->type = e1000_ich8lan;
236 break;
237 case E1000_DEV_ID_ICH9_IFE:
238 case E1000_DEV_ID_ICH9_IFE_GT:
239 case E1000_DEV_ID_ICH9_IFE_G:
240 case E1000_DEV_ID_ICH9_IGP_M:
241 case E1000_DEV_ID_ICH9_IGP_M_AMT:
242 case E1000_DEV_ID_ICH9_IGP_M_V:

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

264 case E1000_DEV_ID_82575GB_QUAD_COPPER_PM:
265 mac->type = e1000_82575;
266 break;
267 case E1000_DEV_ID_82576:
268 case E1000_DEV_ID_82576_FIBER:
269 case E1000_DEV_ID_82576_SERDES:
270 case E1000_DEV_ID_82576_QUAD_COPPER:
271 case E1000_DEV_ID_82576_NS:
236 mac->type = e1000_ich8lan;
237 break;
238 case E1000_DEV_ID_ICH9_IFE:
239 case E1000_DEV_ID_ICH9_IFE_GT:
240 case E1000_DEV_ID_ICH9_IFE_G:
241 case E1000_DEV_ID_ICH9_IGP_M:
242 case E1000_DEV_ID_ICH9_IGP_M_AMT:
243 case E1000_DEV_ID_ICH9_IGP_M_V:

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

265 case E1000_DEV_ID_82575GB_QUAD_COPPER_PM:
266 mac->type = e1000_82575;
267 break;
268 case E1000_DEV_ID_82576:
269 case E1000_DEV_ID_82576_FIBER:
270 case E1000_DEV_ID_82576_SERDES:
271 case E1000_DEV_ID_82576_QUAD_COPPER:
272 case E1000_DEV_ID_82576_NS:
273 case E1000_DEV_ID_82576_NS_SERDES:
272 case E1000_DEV_ID_82576_SERDES_QUAD:
273 mac->type = e1000_82576;
274 break;
274 case E1000_DEV_ID_82576_SERDES_QUAD:
275 mac->type = e1000_82576;
276 break;
277 case E1000_DEV_ID_82580_COPPER:
278 case E1000_DEV_ID_82580_FIBER:
279 case E1000_DEV_ID_82580_SERDES:
280 case E1000_DEV_ID_82580_SGMII:
281 case E1000_DEV_ID_82580_COPPER_DUAL:
282 mac->type = e1000_82580;
283 break;
284 case E1000_DEV_ID_82580_ER:
285 case E1000_DEV_ID_82580_ER_DUAL:
286 mac->type = e1000_82580er;
287 break;
275 default:
276 /* Should never have loaded on this device */
277 ret_val = -E1000_ERR_MAC_INIT;
278 break;
279 }
280
281 return ret_val;
282}

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

357 case e1000_ich8lan:
358 case e1000_ich9lan:
359 case e1000_ich10lan:
360 case e1000_pchlan:
361 e1000_init_function_pointers_ich8lan(hw);
362 break;
363 case e1000_82575:
364 case e1000_82576:
288 default:
289 /* Should never have loaded on this device */
290 ret_val = -E1000_ERR_MAC_INIT;
291 break;
292 }
293
294 return ret_val;
295}

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

370 case e1000_ich8lan:
371 case e1000_ich9lan:
372 case e1000_ich10lan:
373 case e1000_pchlan:
374 e1000_init_function_pointers_ich8lan(hw);
375 break;
376 case e1000_82575:
377 case e1000_82576:
378 case e1000_82580:
379 case e1000_82580er:
365 e1000_init_function_pointers_82575(hw);
366 break;
367 default:
368 DEBUGOUT("Hardware not supported\n");
369 ret_val = -E1000_ERR_CONFIG;
370 break;
371 }
372

--- 878 unchanged lines hidden ---
380 e1000_init_function_pointers_82575(hw);
381 break;
382 default:
383 DEBUGOUT("Hardware not supported\n");
384 ret_val = -E1000_ERR_CONFIG;
385 break;
386 }
387

--- 878 unchanged lines hidden ---