e1000: minor changes in base driver

[dpdk.git] / lib / librte_pmd_e1000 / e1000 / e1000_api.h

diff --git a/lib/librte_pmd_e1000/e1000/e1000_api.h b/lib/librte_pmd_e1000/e1000/e1000_api.h
index 1e51d1d..9a1e5c7 100644 (file)
--- a/lib/librte_pmd_e1000/e1000/e1000_api.h
+++ b/lib/librte_pmd_e1000/e1000/e1000_api.h
@@ -56,14 +56,13 @@ s32  e1000_check_for_link(struct e1000_hw *hw);
 s32  e1000_reset_hw(struct e1000_hw *hw);
 s32  e1000_init_hw(struct e1000_hw *hw);
 s32  e1000_setup_link(struct e1000_hw *hw);
-s32  e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed,
-                                u16 *duplex);
+s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex);
 s32  e1000_disable_pcie_master(struct e1000_hw *hw);
 void e1000_config_collision_dist(struct e1000_hw *hw);
 void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
 u32  e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr);
-void e1000_update_mc_addr_list(struct e1000_hw *hw,
-                               u8 *mc_addr_list, u32 mc_addr_count);
+void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
+                              u32 mc_addr_count);
 s32  e1000_setup_led(struct e1000_hw *hw);
 s32  e1000_cleanup_led(struct e1000_hw *hw);
 s32  e1000_check_reset_block(struct e1000_hw *hw);
@@ -77,8 +76,8 @@ s32  e1000_get_cable_length(struct e1000_hw *hw);
 s32  e1000_validate_mdi_setting(struct e1000_hw *hw);
 s32  e1000_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data);
 s32  e1000_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
-                               u32 offset, u8 data);
+s32 e1000_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg, u32 offset,
+                             u8 data);
 s32  e1000_get_phy_info(struct e1000_hw *hw);
 void e1000_release_phy(struct e1000_hw *hw);
 s32  e1000_acquire_phy(struct e1000_hw *hw);
@@ -87,8 +86,7 @@ s32  e1000_phy_commit(struct e1000_hw *hw);
 void e1000_power_up_phy(struct e1000_hw *hw);
 void e1000_power_down_phy(struct e1000_hw *hw);
 s32  e1000_read_mac_addr(struct e1000_hw *hw);
-s32  e1000_read_pba_string(struct e1000_hw *hw, u8 *pba_num, 
-                           u32 pba_num_size);
+s32 e1000_read_pba_string(struct e1000_hw *hw, u8 *pba_num, u32 pba_num_size);
 s32  e1000_read_pba_length(struct e1000_hw *hw, u32 *pba_num_size);
 void e1000_reload_nvm(struct e1000_hw *hw);
 s32  e1000_update_nvm_checksum(struct e1000_hw *hw);
@@ -96,20 +94,18 @@ s32  e1000_validate_nvm_checksum(struct e1000_hw *hw);
 s32  e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 s32  e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
 s32  e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words,
-                     u16 *data);
+s32 e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 s32  e1000_wait_autoneg(struct e1000_hw *hw);
 s32  e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active);
 s32  e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active);
 bool e1000_check_mng_mode(struct e1000_hw *hw);
 bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);
 s32  e1000_mng_enable_host_if(struct e1000_hw *hw);
-s32  e1000_mng_host_if_write(struct e1000_hw *hw,
-                             u8 *buffer, u16 length, u16 offset, u8 *sum);
+s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer, u16 length,
+                           u16 offset, u8 *sum);
 s32  e1000_mng_write_cmd_header(struct e1000_hw *hw,
                                 struct e1000_host_mng_command_header *hdr);
-s32  e1000_mng_write_dhcp_info(struct e1000_hw * hw,
-                                    u8 *buffer, u16 length);
+s32 e1000_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
 
 /*
  * TBI_ACCEPT macro definition:
@@ -130,11 +126,11 @@ s32  e1000_mng_write_dhcp_info(struct e1000_hw * hw,
  * Typical use:
  *  ...
  *  if (TBI_ACCEPT) {
- *      accept_frame = TRUE;
+ *      accept_frame = true;
  *      e1000_tbi_adjust_stats(adapter, MacAddress);
  *      frame_length--;
  *  } else {
- *      accept_frame = FALSE;
+ *      accept_frame = false;
  *  }
  *  ...
  */
@@ -142,7 +138,8 @@ s32  e1000_mng_write_dhcp_info(struct e1000_hw * hw,
 /* The carrier extension symbol, as received by the NIC. */
 #define CARRIER_EXTENSION   0x0F
 
-#define TBI_ACCEPT(a, status, errors, length, last_byte, min_frame_size, max_frame_size) \
+#define TBI_ACCEPT(a, status, errors, length, last_byte, \
+                  min_frame_size, max_frame_size) \
     (e1000_tbi_sbp_enabled_82543(a) && \
      (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
      ((last_byte) == CARRIER_EXTENSION) && \
@@ -152,4 +149,3 @@ s32  e1000_mng_write_dhcp_info(struct e1000_hw * hw,
           (((length) > min_frame_size) && \
            ((length) <= (max_frame_size + VLAN_TAG_SIZE + 1)))))
 
-#endif