3c3
< Copyright (c) 2001-2012, Intel Corporation
---
> Copyright (c) 2001-2013, Intel Corporation
33c33
< /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_phy.c 247056 2013-02-20 21:16:50Z des $*/
---
> /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_phy.c 247822 2013-03-04 23:07:40Z jfv $*/
49a50,51
> static s32 ixgbe_read_i2c_sff8472_generic(struct ixgbe_hw *hw, u8 byte_offset,
> u8 *sff8472_data);
73a76
> phy->ops.read_i2c_sff8472 = &ixgbe_read_i2c_sff8472_generic;
566d568
< * @autoneg: TRUE if autonegotiation enabled
570d571
< bool autoneg,
573c574
< UNREFERENCED_2PARAMETER(autoneg, autoneg_wait_to_complete);
---
> UNREFERENCED_1PARAMETER(autoneg_wait_to_complete);
972,974c973
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
988,990c987
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
997,999c994
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
1005,1007c1000
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
1105,1107c1098
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
1114,1116c1105
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
1123,1125c1112
< if (status == IXGBE_ERR_SWFW_SYNC ||
< status == IXGBE_ERR_I2C ||
< status == IXGBE_ERR_SFP_NOT_PRESENT)
---
> if (status != IXGBE_SUCCESS)
1335a1323,1338
> * ixgbe_read_i2c_sff8472_generic - Reads 8 bit word over I2C interface
> * @hw: pointer to hardware structure
> * @byte_offset: byte offset at address 0xA2
> * @eeprom_data: value read
> *
> * Performs byte read operation to SFP module's SFF-8472 data over I2C
> **/
> static s32 ixgbe_read_i2c_sff8472_generic(struct ixgbe_hw *hw, u8 byte_offset,
> u8 *sff8472_data)
> {
> return hw->phy.ops.read_i2c_byte(hw, byte_offset,
> IXGBE_I2C_EEPROM_DEV_ADDR2,
> sff8472_data);
> }
>
> /**
1427a1431
> ixgbe_i2c_bus_clear(hw);
1430d1433
< ixgbe_i2c_bus_clear(hw);