3c3
< Copyright (c) 2001-2011, Intel Corporation
---
> Copyright (c) 2001-2012, Intel Corporation
33c33
< /*$FreeBSD: head/sys/dev/e1000/e1000_defines.h 228386 2011-12-10 06:55:02Z jfv $*/
---
> /*$FreeBSD: head/sys/dev/e1000/e1000_defines.h 238148 2012-07-05 20:26:57Z jfv $*/
1346a1347,1356
> #define E1000_EECD_FLUPD_I210 0x00800000 /* Update FLASH */
> #define E1000_EECD_FLUDONE_I210 0x04000000 /* Update FLASH done */
> #define E1000_EECD_FLASH_DETECTED_I210 0x00080000 /* FLASH detected */
> #define E1000_FLUDONE_ATTEMPTS 20000
> #define E1000_EERD_EEWR_MAX_COUNT 512 /* buffered EEPROM words rw */
> #define E1000_I210_FIFO_SEL_RX 0x00
> #define E1000_I210_FIFO_SEL_TX_QAV(_i) (0x02 + (_i))
> #define E1000_I210_FIFO_SEL_TX_LEGACY E1000_I210_FIFO_SEL_TX_QAV(0)
> #define E1000_I210_FIFO_SEL_BMC2OS_TX 0x06
> #define E1000_I210_FIFO_SEL_BMC2OS_RX 0x01
1363a1374,1387
> #define NVM_ETRACK_WORD 0x0042
> #define NVM_COMB_VER_OFF 0x0083
> #define NVM_COMB_VER_PTR 0x003d
>
> #define NVM_MAC_ADDR 0x0000
> #define NVM_SUB_DEV_ID 0x000B
> #define NVM_SUB_VEN_ID 0x000C
> #define NVM_DEV_ID 0x000D
> #define NVM_VEN_ID 0x000E
> #define NVM_INIT_CTRL_2 0x000F
> #define NVM_INIT_CTRL_4 0x0013
> #define NVM_LED_1_CFG 0x001C
> #define NVM_LED_0_2_CFG 0x001F
>
1383c1407
< #define NVM_82580_LAN_FUNC_OFFSET(a) (a ? (0x40 + (0x40 * a)) : 0)
---
> #define NVM_82580_LAN_FUNC_OFFSET(a) ((a) ? (0x40 + (0x40 * (a))) : 0)
1388c1412
< /* Offset of Link Mode bits for 82575 up to Kawela */
---
> /* Offset of Link Mode bits for 82575/82576 */
1527a1552
> #define I210_I_PHY_ID 0x01410C00
1789a1815,1816
> /* DMA Coalescing BMC-to-OS Watchdog Enable */
> #define E1000_DMACR_DC_BMC2OSW_EN 0x00008000
1810d1836
< #define E1000_LTRC_EEEMS_EN 0x00000005 /* Enable EEE LTR max send */
1811a1838,1839
> #define E1000_TXPB0S_SIZE_I210_MASK 0x0000003F /* Tx packet buffer 0 size */
> #define E1000_LTRC_EEEMS_EN 0x00000020 /* Enable EEE LTR max send */
1828a1857
> #define E1000_LTRMINV_LSNP_REQ 0x00008000 /* LTR Snoop Requirement */
1834a1864
> #define E1000_LTRMAXV_LSNP_REQ 0x00008000 /* LTR Snoop Requirement */
< Copyright (c) 2001-2011, Intel Corporation
---
> Copyright (c) 2001-2012, Intel Corporation
33c33
< /*$FreeBSD: head/sys/dev/e1000/e1000_defines.h 228386 2011-12-10 06:55:02Z jfv $*/
---
> /*$FreeBSD: head/sys/dev/e1000/e1000_defines.h 238148 2012-07-05 20:26:57Z jfv $*/
1346a1347,1356
> #define E1000_EECD_FLUPD_I210 0x00800000 /* Update FLASH */
> #define E1000_EECD_FLUDONE_I210 0x04000000 /* Update FLASH done */
> #define E1000_EECD_FLASH_DETECTED_I210 0x00080000 /* FLASH detected */
> #define E1000_FLUDONE_ATTEMPTS 20000
> #define E1000_EERD_EEWR_MAX_COUNT 512 /* buffered EEPROM words rw */
> #define E1000_I210_FIFO_SEL_RX 0x00
> #define E1000_I210_FIFO_SEL_TX_QAV(_i) (0x02 + (_i))
> #define E1000_I210_FIFO_SEL_TX_LEGACY E1000_I210_FIFO_SEL_TX_QAV(0)
> #define E1000_I210_FIFO_SEL_BMC2OS_TX 0x06
> #define E1000_I210_FIFO_SEL_BMC2OS_RX 0x01
1363a1374,1387
> #define NVM_ETRACK_WORD 0x0042
> #define NVM_COMB_VER_OFF 0x0083
> #define NVM_COMB_VER_PTR 0x003d
>
> #define NVM_MAC_ADDR 0x0000
> #define NVM_SUB_DEV_ID 0x000B
> #define NVM_SUB_VEN_ID 0x000C
> #define NVM_DEV_ID 0x000D
> #define NVM_VEN_ID 0x000E
> #define NVM_INIT_CTRL_2 0x000F
> #define NVM_INIT_CTRL_4 0x0013
> #define NVM_LED_1_CFG 0x001C
> #define NVM_LED_0_2_CFG 0x001F
>
1383c1407
< #define NVM_82580_LAN_FUNC_OFFSET(a) (a ? (0x40 + (0x40 * a)) : 0)
---
> #define NVM_82580_LAN_FUNC_OFFSET(a) ((a) ? (0x40 + (0x40 * (a))) : 0)
1388c1412
< /* Offset of Link Mode bits for 82575 up to Kawela */
---
> /* Offset of Link Mode bits for 82575/82576 */
1527a1552
> #define I210_I_PHY_ID 0x01410C00
1789a1815,1816
> /* DMA Coalescing BMC-to-OS Watchdog Enable */
> #define E1000_DMACR_DC_BMC2OSW_EN 0x00008000
1810d1836
< #define E1000_LTRC_EEEMS_EN 0x00000005 /* Enable EEE LTR max send */
1811a1838,1839
> #define E1000_TXPB0S_SIZE_I210_MASK 0x0000003F /* Tx packet buffer 0 size */
> #define E1000_LTRC_EEEMS_EN 0x00000020 /* Enable EEE LTR max send */
1828a1857
> #define E1000_LTRMINV_LSNP_REQ 0x00008000 /* LTR Snoop Requirement */
1834a1864
> #define E1000_LTRMAXV_LSNP_REQ 0x00008000 /* LTR Snoop Requirement */