diff options
| -rw-r--r-- | sys/dev/pci/fms.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/igc_api.h | 20 | ||||
| -rw-r--r-- | sys/dev/pci/igc_mac.h | 13 | ||||
| -rw-r--r-- | sys/dev/pci/igc_nvm.h | 8 | ||||
| -rw-r--r-- | sys/dev/pci/igc_phy.h | 7 | ||||
| -rw-r--r-- | sys/dev/pci/ixgbe.h | 6 |
7 files changed, 7 insertions, 56 deletions
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 51f22b606d1..fd4e2131e2a 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.38 2024/05/24 06:02:53 jsg Exp $ */ +/* $OpenBSD: fms.c,v 1.39 2024/06/09 05:18:12 jsg Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -118,9 +118,6 @@ int fms_read_codec(void *, u_int8_t, u_int16_t *); int fms_write_codec(void *, u_int8_t, u_int16_t); void fms_reset_codec(void *); -int fms_allocmem(struct fms_softc *, size_t, size_t, - struct fms_dma *); - int fms_match(struct device *parent, void *match, void *aux) { diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h index 68deb7cf2b2..41b03775272 100644 --- a/sys/dev/pci/if_em_hw.h +++ b/sys/dev/pci/if_em_hw.h @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.h,v 1.94 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.95 2024/06/09 05:18:12 jsg Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -408,8 +408,6 @@ struct em_host_mng_dhcp_cookie{ }; int32_t em_read_part_num(struct em_hw *hw, uint32_t *part_num); -int32_t em_mng_write_dhcp_info(struct em_hw *hw, uint8_t *buffer, - uint16_t length); boolean_t em_check_mng_mode(struct em_hw *hw); boolean_t em_enable_tx_pkt_filtering(struct em_hw *hw); int32_t em_read_eeprom(struct em_hw *hw, uint16_t reg, uint16_t words, uint16_t *data); diff --git a/sys/dev/pci/igc_api.h b/sys/dev/pci/igc_api.h index dee8557c7cb..ea56c526584 100644 --- a/sys/dev/pci/igc_api.h +++ b/sys/dev/pci/igc_api.h @@ -1,4 +1,4 @@ -/* $OpenBSD: igc_api.h,v 1.2 2022/05/11 06:14:15 kevlo Exp $ */ +/* $OpenBSD: igc_api.h,v 1.3 2024/06/09 05:18:12 jsg Exp $ */ /*- * Copyright 2021 Intel Corp * Copyright 2021 Rubicon Communications, LLC (Netgate) @@ -20,35 +20,17 @@ int igc_setup_init_funcs(struct igc_hw *, bool); int igc_init_mac_params(struct igc_hw *); int igc_init_nvm_params(struct igc_hw *); int igc_init_phy_params(struct igc_hw *); -int igc_get_bus_info(struct igc_hw *); -void igc_clear_vfta(struct igc_hw *); -void igc_write_vfta(struct igc_hw *, uint32_t, uint32_t); -int igc_force_mac_fc(struct igc_hw *); int igc_check_for_link(struct igc_hw *); int igc_reset_hw(struct igc_hw *); int igc_init_hw(struct igc_hw *); -int igc_setup_link(struct igc_hw *); int igc_get_speed_and_duplex(struct igc_hw *, uint16_t *, uint16_t *); -int igc_disable_pcie_master(struct igc_hw *); -void igc_config_collision_dist(struct igc_hw *); int igc_rar_set(struct igc_hw *, uint8_t *, uint32_t); -uint32_t igc_hash_mc_addr(struct igc_hw *, uint8_t *); void igc_update_mc_addr_list(struct igc_hw *, uint8_t *, uint32_t); int igc_check_reset_block(struct igc_hw *); -int igc_get_cable_length(struct igc_hw *); -int igc_validate_mdi_setting(struct igc_hw *); int igc_get_phy_info(struct igc_hw *); int igc_phy_hw_reset(struct igc_hw *); -void igc_power_up_phy(struct igc_hw *); -void igc_power_down_phy(struct igc_hw *); int igc_read_mac_addr(struct igc_hw *); -int igc_read_pba_string(struct igc_hw *, uint8_t *, uint32_t); -void igc_reload_nvm(struct igc_hw *); int igc_validate_nvm_checksum(struct igc_hw *); -int igc_read_nvm(struct igc_hw *, uint16_t, uint16_t, uint16_t *); -int igc_write_nvm(struct igc_hw *, uint16_t, uint16_t, uint16_t *); -int igc_set_d3_lplu_state(struct igc_hw *, bool); -int igc_set_d0_lplu_state(struct igc_hw *, bool); #endif /* _IGC_API_H_ */ diff --git a/sys/dev/pci/igc_mac.h b/sys/dev/pci/igc_mac.h index 0b800e9a1f9..524cd4caad8 100644 --- a/sys/dev/pci/igc_mac.h +++ b/sys/dev/pci/igc_mac.h @@ -1,4 +1,4 @@ -/* $OpenBSD: igc_mac.h,v 1.1 2021/10/31 14:52:57 patrick Exp $ */ +/* $OpenBSD: igc_mac.h,v 1.2 2024/06/09 05:18:12 jsg Exp $ */ /*- * Copyright 2021 Intel Corp * Copyright 2021 Rubicon Communications, LLC (Netgate) @@ -12,34 +12,23 @@ void igc_init_mac_ops_generic(struct igc_hw *); int igc_null_ops_generic(struct igc_hw *); -int igc_null_link_info(struct igc_hw *, uint16_t *, uint16_t *); -bool igc_null_mng_mode(struct igc_hw *); -void igc_null_update_mc(struct igc_hw *, uint8_t *h, uint32_t); -void igc_null_write_vfta(struct igc_hw *, uint32_t a, uint32_t); -int igc_check_for_copper_link_generic(struct igc_hw *); int igc_config_fc_after_link_up_generic(struct igc_hw *); int igc_disable_pcie_master_generic(struct igc_hw *); int igc_force_mac_fc_generic(struct igc_hw *); int igc_get_auto_rd_done_generic(struct igc_hw *); -int igc_get_bus_info_pcie_generic(struct igc_hw *); -void igc_set_lan_id_single_port(struct igc_hw *); int igc_get_speed_and_duplex_copper_generic(struct igc_hw *, uint16_t *, uint16_t *); void igc_update_mc_addr_list_generic(struct igc_hw *, uint8_t *, uint32_t); int igc_rar_set_generic(struct igc_hw *, uint8_t *, uint32_t); int igc_set_fc_watermarks_generic(struct igc_hw *); int igc_setup_link_generic(struct igc_hw *); -int igc_validate_mdi_setting_crossover_generic(struct igc_hw *); int igc_hash_mc_addr_generic(struct igc_hw *, uint8_t *); void igc_clear_hw_cntrs_base_generic(struct igc_hw *); -void igc_clear_vfta_generic(struct igc_hw *); void igc_init_rx_addrs_generic(struct igc_hw *, uint16_t); -void igc_pcix_mmrbc_workaround_generic(struct igc_hw *); void igc_put_hw_semaphore_generic(struct igc_hw *); int igc_check_alt_mac_addr_generic(struct igc_hw *); -void igc_set_pcie_no_snoop_generic(struct igc_hw *, uint32_t); void igc_write_vfta_generic(struct igc_hw *, uint32_t, uint32_t); void igc_config_collision_dist_generic(struct igc_hw *); diff --git a/sys/dev/pci/igc_nvm.h b/sys/dev/pci/igc_nvm.h index 39404cee085..cc1ec3d8ec6 100644 --- a/sys/dev/pci/igc_nvm.h +++ b/sys/dev/pci/igc_nvm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: igc_nvm.h,v 1.1 2021/10/31 14:52:57 patrick Exp $ */ +/* $OpenBSD: igc_nvm.h,v 1.2 2024/06/09 05:18:12 jsg Exp $ */ /*- * Copyright 2021 Intel Corp * Copyright 2021 Rubicon Communications, LLC (Netgate) @@ -13,17 +13,11 @@ void igc_init_nvm_ops_generic(struct igc_hw *); int igc_null_read_nvm(struct igc_hw *, uint16_t, uint16_t, uint16_t *); void igc_null_nvm_generic(struct igc_hw *); -int igc_null_led_default(struct igc_hw *, uint16_t *); int igc_null_write_nvm(struct igc_hw *, uint16_t, uint16_t, uint16_t *); int igc_poll_eerd_eewr_done(struct igc_hw *, int); int igc_read_mac_addr_generic(struct igc_hw *); -int igc_read_pba_string_generic(struct igc_hw *, uint8_t *, uint32_t); int igc_read_nvm_eerd(struct igc_hw *, uint16_t, uint16_t, uint16_t *); -int igc_valid_led_default_generic(struct igc_hw *, uint16_t *); int igc_validate_nvm_checksum_generic(struct igc_hw *); -int igc_write_nvm_spi(struct igc_hw *, uint16_t, uint16_t, uint16_t *); -int igc_update_nvm_checksum_generic(struct igc_hw *); -void igc_release_nvm_generic(struct igc_hw *); void igc_reload_nvm_generic(struct igc_hw *); #endif /* _IGC_NVM_H_ */ diff --git a/sys/dev/pci/igc_phy.h b/sys/dev/pci/igc_phy.h index 9dafd927fe4..db9e41124b8 100644 --- a/sys/dev/pci/igc_phy.h +++ b/sys/dev/pci/igc_phy.h @@ -1,4 +1,4 @@ -/* $OpenBSD: igc_phy.h,v 1.2 2022/05/11 06:14:15 kevlo Exp $ */ +/* $OpenBSD: igc_phy.h,v 1.3 2024/06/09 05:18:12 jsg Exp $ */ /*- * Copyright 2021 Intel Corp * Copyright 2021 Rubicon Communications, LLC (Netgate) @@ -20,13 +20,8 @@ int igc_check_downshift_generic(struct igc_hw *); int igc_check_reset_block_generic(struct igc_hw *); int igc_get_phy_id(struct igc_hw *); int igc_phy_hw_reset_generic(struct igc_hw *); -int igc_phy_reset_dsp_generic(struct igc_hw *); -int igc_set_d3_lplu_state_generic(struct igc_hw *, bool); int igc_setup_copper_link_generic(struct igc_hw *); int igc_phy_has_link_generic(struct igc_hw *, uint32_t, uint32_t, bool *); -int igc_determine_phy_address(struct igc_hw *); -int igc_enable_phy_wakeup_reg_access_bm(struct igc_hw *, uint16_t *); -int igc_disable_phy_wakeup_reg_access_bm(struct igc_hw *, uint16_t *); void igc_power_up_phy_copper(struct igc_hw *); void igc_power_down_phy_copper(struct igc_hw *); int igc_read_phy_reg_mdic(struct igc_hw *, uint32_t offset, uint16_t *); diff --git a/sys/dev/pci/ixgbe.h b/sys/dev/pci/ixgbe.h index 2851b2858b6..e0a03bd26c8 100644 --- a/sys/dev/pci/ixgbe.h +++ b/sys/dev/pci/ixgbe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ixgbe.h,v 1.35 2024/04/12 19:27:43 jan Exp $ */ +/* $OpenBSD: ixgbe.h,v 1.36 2024/06/09 05:18:12 jsg Exp $ */ /****************************************************************************** @@ -268,10 +268,6 @@ int32_t ixgbe_init_hw(struct ixgbe_hw *hw); enum ixgbe_media_type ixgbe_get_media_type(struct ixgbe_hw *hw); int32_t ixgbe_identify_phy(struct ixgbe_hw *hw); void ixgbe_flap_tx_laser(struct ixgbe_hw *hw); -int32_t ixgbe_setup_link(struct ixgbe_hw *hw, ixgbe_link_speed speed, - bool autoneg_wait_to_complete); -int32_t ixgbe_setup_mac_link(struct ixgbe_hw *hw, ixgbe_link_speed speed, - bool autoneg_wait_to_complete); int32_t ixgbe_check_link(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *link_up, bool link_up_wait_to_complete); |