Diff for /src/sys/dev/netif/em/if_em_hw.h between versions 1.6 and 1.7

version 1.6, 2004/05/11 14:00:20 version 1.7, 2004/05/11 22:55:15
Line 325  void em_write_pci_cfg(struct em_hw *hw, Line 325  void em_write_pci_cfg(struct em_hw *hw,
 int32_t em_config_dsp_after_link_change(struct em_hw *hw, boolean_t link_up);  int32_t em_config_dsp_after_link_change(struct em_hw *hw, boolean_t link_up);
 int32_t em_set_d3_lplu_state(struct em_hw *hw, boolean_t active);  int32_t em_set_d3_lplu_state(struct em_hw *hw, boolean_t active);
   
   /* Port I/O is only supported on 82544 and newer (not numerical higher!) */
   uint32_t em_read_reg_io(struct em_hw *hw, uint32_t offset);
   void em_write_reg_io(struct em_hw *hw, uint32_t offset, uint32_t value);
   
 #define E1000_READ_REG_IO(a, reg) \  #define E1000_READ_REG_IO(a, reg) \
     em_read_reg_io((a), E1000_##reg)      em_read_reg_io((a), E1000_##reg)
 #define E1000_WRITE_REG_IO(a, reg, val) \  #define E1000_WRITE_REG_IO(a, reg, val) \
Line 979  struct em_hw { Line 983  struct em_hw {
     em_ms_type master_slave;      em_ms_type master_slave;
     em_ms_type original_master_slave;      em_ms_type original_master_slave;
     em_ffe_config ffe_config_state;      em_ffe_config ffe_config_state;
    unsigned long io_base;    bus_space_tag_t reg_io_tag;
     bus_space_tag_t reg_io_handle;
     uint32_t phy_id;      uint32_t phy_id;
     uint32_t phy_revision;      uint32_t phy_revision;
     uint32_t phy_addr;      uint32_t phy_addr;

Removed from v.1.6  
changed lines
  Added in v.1.7