From 8d2c75e49a1f1e140a0efd2b93f23844e8cb679f Mon Sep 17 00:00:00 2001 From: mpi Date: Fri, 11 Mar 2022 18:00:45 +0000 Subject: [PATCH] Constify struct cfattach. --- sys/dev/pci/aac_pci.c | 4 ++-- sys/dev/pci/adv_pci.c | 4 ++-- sys/dev/pci/adw_pci.c | 4 ++-- sys/dev/pci/agp.c | 4 ++-- sys/dev/pci/agp_ali.c | 4 ++-- sys/dev/pci/agp_amd.c | 4 ++-- sys/dev/pci/agp_i810.c | 4 ++-- sys/dev/pci/agp_intel.c | 4 ++-- sys/dev/pci/agp_sis.c | 4 ++-- sys/dev/pci/agp_via.c | 4 ++-- sys/dev/pci/ahc_pci.c | 6 +++--- sys/dev/pci/ahci_pci.c | 6 +++--- sys/dev/pci/ahd_pci.c | 4 ++-- sys/dev/pci/alipm.c | 4 ++-- sys/dev/pci/amas.c | 4 ++-- sys/dev/pci/amdiic.c | 4 ++-- sys/dev/pci/amdpcib.c | 4 ++-- sys/dev/pci/amdpm.c | 4 ++-- sys/dev/pci/ami_pci.c | 4 ++-- sys/dev/pci/arc.c | 4 ++-- sys/dev/pci/auacer.c | 4 ++-- sys/dev/pci/auglx.c | 4 ++-- sys/dev/pci/auich.c | 4 ++-- sys/dev/pci/auixp.c | 4 ++-- sys/dev/pci/autri.c | 4 ++-- sys/dev/pci/auvia.c | 4 ++-- sys/dev/pci/azalia.c | 4 ++-- sys/dev/pci/berkwdt.c | 4 ++-- sys/dev/pci/bktr/bktr_os.c | 4 ++-- sys/dev/pci/cac_pci.c | 4 ++-- sys/dev/pci/ccp_pci.c | 4 ++-- sys/dev/pci/ciss_pci.c | 4 ++-- sys/dev/pci/cmpci.c | 4 ++-- sys/dev/pci/cs4280.c | 4 ++-- sys/dev/pci/cs4281.c | 4 ++-- sys/dev/pci/cy_pci.c | 4 ++-- sys/dev/pci/cz.c | 4 ++-- sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c | 2 +- sys/dev/pci/drm/drm_drv.c | 2 +- sys/dev/pci/drm/i915/i915_drv.c | 2 +- sys/dev/pci/drm/radeon/radeon_kms.c | 2 +- sys/dev/pci/dwiic_pci.c | 4 ++-- sys/dev/pci/eap.c | 4 ++-- sys/dev/pci/ehci_pci.c | 4 ++-- sys/dev/pci/emuxki.c | 4 ++-- sys/dev/pci/envy.c | 4 ++-- sys/dev/pci/esa.c | 4 ++-- sys/dev/pci/eso.c | 4 ++-- sys/dev/pci/fms.c | 4 ++-- sys/dev/pci/gcu.c | 4 ++-- sys/dev/pci/gdt_pci.c | 4 ++-- sys/dev/pci/glxpcib.c | 4 ++-- sys/dev/pci/i82365_pci.c | 4 ++-- sys/dev/pci/ichiic.c | 4 ++-- sys/dev/pci/ichwdt.c | 4 ++-- sys/dev/pci/if_acx_pci.c | 4 ++-- sys/dev/pci/if_age.c | 4 ++-- sys/dev/pci/if_alc.c | 4 ++-- sys/dev/pci/if_ale.c | 4 ++-- sys/dev/pci/if_an_pci.c | 4 ++-- sys/dev/pci/if_ath_pci.c | 4 ++-- sys/dev/pci/if_athn_pci.c | 4 ++-- sys/dev/pci/if_atw_pci.c | 4 ++-- sys/dev/pci/if_bce.c | 4 ++-- sys/dev/pci/if_bge.c | 4 ++-- sys/dev/pci/if_bnx.c | 4 ++-- sys/dev/pci/if_bnxt.c | 4 ++-- sys/dev/pci/if_bwfm_pci.c | 4 ++-- sys/dev/pci/if_bwi_pci.c | 4 ++-- sys/dev/pci/if_cas.c | 4 ++-- sys/dev/pci/if_dc_pci.c | 4 ++-- sys/dev/pci/if_de.c | 4 ++-- sys/dev/pci/if_devar.h | 3 +-- sys/dev/pci/if_em.c | 4 ++-- sys/dev/pci/if_ep_pci.c | 4 ++-- sys/dev/pci/if_epic_pci.c | 4 ++-- sys/dev/pci/if_et.c | 4 ++-- sys/dev/pci/if_fxp_pci.c | 4 ++-- sys/dev/pci/if_gem_pci.c | 4 ++-- sys/dev/pci/if_hme_pci.c | 4 ++-- sys/dev/pci/if_iavf.c | 4 ++-- sys/dev/pci/if_ipw.c | 4 ++-- sys/dev/pci/if_iwi.c | 4 ++-- sys/dev/pci/if_iwm.c | 4 ++-- sys/dev/pci/if_iwn.c | 4 ++-- sys/dev/pci/if_ix.c | 4 ++-- sys/dev/pci/if_ixgb.c | 4 ++-- sys/dev/pci/if_ixl.c | 4 ++-- sys/dev/pci/if_jme.c | 4 ++-- sys/dev/pci/if_lge.c | 4 ++-- sys/dev/pci/if_lii.c | 4 ++-- sys/dev/pci/if_malo_pci.c | 4 ++-- sys/dev/pci/if_mcx.c | 4 ++-- sys/dev/pci/if_msk.c | 6 +++--- sys/dev/pci/if_mtd_pci.c | 4 ++-- sys/dev/pci/if_myx.c | 4 ++-- sys/dev/pci/if_ne_pci.c | 4 ++-- sys/dev/pci/if_nep.c | 4 ++-- sys/dev/pci/if_nfe.c | 4 ++-- sys/dev/pci/if_nge.c | 4 ++-- sys/dev/pci/if_nxe.c | 4 ++-- sys/dev/pci/if_oce.c | 4 ++-- sys/dev/pci/if_pcn.c | 4 ++-- sys/dev/pci/if_pgt_pci.c | 4 ++-- sys/dev/pci/if_ral_pci.c | 4 ++-- sys/dev/pci/if_re_pci.c | 4 ++-- sys/dev/pci/if_rge.c | 4 ++-- sys/dev/pci/if_rl_pci.c | 4 ++-- sys/dev/pci/if_rtw_pci.c | 4 ++-- sys/dev/pci/if_sf_pci.c | 4 ++-- sys/dev/pci/if_sis.c | 4 ++-- sys/dev/pci/if_sk.c | 6 +++--- sys/dev/pci/if_ste.c | 4 ++-- sys/dev/pci/if_stge.c | 4 ++-- sys/dev/pci/if_tht.c | 6 +++--- sys/dev/pci/if_ti_pci.c | 4 ++-- sys/dev/pci/if_tl.c | 4 ++-- sys/dev/pci/if_txp.c | 4 ++-- sys/dev/pci/if_vge.c | 4 ++-- sys/dev/pci/if_vic.c | 4 ++-- sys/dev/pci/if_vmx.c | 4 ++-- sys/dev/pci/if_vr.c | 4 ++-- sys/dev/pci/if_vte.c | 4 ++-- sys/dev/pci/if_wb.c | 4 ++-- sys/dev/pci/if_wi_pci.c | 4 ++-- sys/dev/pci/if_wpi.c | 4 ++-- sys/dev/pci/if_xge.c | 4 ++-- sys/dev/pci/if_xl_pci.c | 4 ++-- sys/dev/pci/iha_pci.c | 4 ++-- sys/dev/pci/ips.c | 4 ++-- sys/dev/pci/itherm.c | 2 +- sys/dev/pci/jmb.c | 4 ++-- sys/dev/pci/kate.c | 4 ++-- sys/dev/pci/km.c | 4 ++-- sys/dev/pci/ksmn.c | 4 ++-- sys/dev/pci/maestro.c | 4 ++-- sys/dev/pci/mbg.c | 4 ++-- sys/dev/pci/mfi_pci.c | 4 ++-- sys/dev/pci/mfii.c | 4 ++-- sys/dev/pci/mmuagp.c | 2 +- sys/dev/pci/mpi_pci.c | 4 ++-- sys/dev/pci/mpii.c | 4 ++-- sys/dev/pci/neo.c | 4 ++-- sys/dev/pci/nviic.c | 4 ++-- sys/dev/pci/nvme_pci.c | 4 ++-- sys/dev/pci/ohci_pci.c | 4 ++-- sys/dev/pci/pccbb.c | 4 ++-- sys/dev/pci/pchtemp.c | 4 ++-- sys/dev/pci/pci.c | 4 ++-- sys/dev/pci/pciide.c | 6 +++--- sys/dev/pci/pcscp.c | 4 ++-- sys/dev/pci/piixpm.c | 4 ++-- sys/dev/pci/ppb.c | 4 ++-- sys/dev/pci/puc.c | 4 ++-- sys/dev/pci/pwdog.c | 4 ++-- sys/dev/pci/qla_pci.c | 4 ++-- sys/dev/pci/qle.c | 4 ++-- sys/dev/pci/qlw_pci.c | 4 ++-- sys/dev/pci/rtsx_pci.c | 4 ++-- sys/dev/pci/sdhc_pci.c | 4 ++-- sys/dev/pci/sili_pci.c | 4 ++-- sys/dev/pci/siop_pci.c | 4 ++-- sys/dev/pci/sti_pci.c | 4 ++-- sys/dev/pci/sv.c | 4 ++-- sys/dev/pci/tcpcib.c | 4 ++-- sys/dev/pci/tga.c | 4 ++-- sys/dev/pci/twe_pci.c | 4 ++-- sys/dev/pci/uhci_pci.c | 4 ++-- sys/dev/pci/vga_pci.c | 4 ++-- sys/dev/pci/viapm.c | 4 ++-- sys/dev/pci/virtio_pci.c | 4 ++-- sys/dev/pci/vmwpvs.c | 4 ++-- sys/dev/pci/wdt.c | 4 ++-- sys/dev/pci/xhci_pci.c | 4 ++-- sys/dev/pci/xspd.c | 4 ++-- sys/dev/pci/yds.c | 4 ++-- 176 files changed, 351 insertions(+), 352 deletions(-) diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index 21d2e29239b..480ad4e15e6 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.25 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.26 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -194,7 +194,7 @@ struct aac_ident { { 0, 0, 0, 0 } }; -struct cfattach aac_pci_ca = { +const struct cfattach aac_pci_ca = { sizeof (struct aac_softc), aac_pci_probe, aac_pci_attach }; diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index dc585eea330..b870cc1d11c 100644 --- a/sys/dev/pci/adv_pci.c +++ b/sys/dev/pci/adv_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv_pci.c,v 1.14 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: adv_pci.c,v 1.15 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: adv_pci.c,v 1.5 1998/09/26 15:52:55 dante Exp $ */ /* @@ -84,7 +84,7 @@ int adv_pci_match(struct device *, void *, void *); void adv_pci_attach(struct device *, struct device *, void *); -struct cfattach adv_pci_ca = +const struct cfattach adv_pci_ca = { sizeof(ASC_SOFTC), adv_pci_match, adv_pci_attach }; diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index a6f537f9596..995e71ec8d3 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw_pci.c,v 1.19 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: adw_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */ /* @@ -71,7 +71,7 @@ int adw_pci_match(struct device *, void *, void *); void adw_pci_attach(struct device *, struct device *, void *); -struct cfattach adw_pci_ca = +const struct cfattach adw_pci_ca = { sizeof(ADW_SOFTC), adw_pci_match, adw_pci_attach }; diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c index aef103b5f9f..a0bab2839b4 100644 --- a/sys/dev/pci/agp.c +++ b/sys/dev/pci/agp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp.c,v 1.49 2015/12/22 21:05:37 kettenis Exp $ */ +/* $OpenBSD: agp.c,v 1.50 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2000 Doug Rabson * All rights reserved. @@ -161,7 +161,7 @@ agp_attach(struct device *parent, struct device *self, void *aux) (u_long)sc->sc_apsize); } -struct cfattach agp_ca = { +const struct cfattach agp_ca = { sizeof(struct agp_softc), agp_probe, agp_attach, NULL, NULL }; diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c index 7d50c137f87..308299f660d 100644 --- a/sys/dev/pci/agp_ali.c +++ b/sys/dev/pci/agp_ali.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_ali.c,v 1.16 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: agp_ali.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: agp_ali.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */ @@ -68,7 +68,7 @@ void agp_ali_bind_page(void *, bus_addr_t, paddr_t, int); void agp_ali_unbind_page(void *, bus_addr_t); void agp_ali_flush_tlb(void *); -struct cfattach aliagp_ca = { +const struct cfattach aliagp_ca = { sizeof(struct agp_ali_softc), agp_ali_probe, agp_ali_attach, NULL, agp_ali_activate }; diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c index 7b5133a7406..a57e8efec81 100644 --- a/sys/dev/pci/agp_amd.c +++ b/sys/dev/pci/agp_amd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_amd.c,v 1.22 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: agp_amd.c,v 1.23 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $ */ /*- @@ -87,7 +87,7 @@ void agp_amd_bind_page(void *, bus_size_t, paddr_t, int); void agp_amd_unbind_page(void *, bus_size_t); void agp_amd_flush_tlb(void *); -struct cfattach amdagp_ca = { +const struct cfattach amdagp_ca = { sizeof(struct agp_amd_softc), agp_amd_probe, agp_amd_attach, NULL, agp_amd_activate }; diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index e87da94ac10..f0863f0b491 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_i810.c,v 1.94 2019/04/14 10:14:50 jsg Exp $ */ +/* $OpenBSD: agp_i810.c,v 1.95 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -107,7 +107,7 @@ int intagp_gmch_match(struct pci_attach_args *); extern void intagp_dma_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, bus_size_t, int); -struct cfattach intagp_ca = { +const struct cfattach intagp_ca = { sizeof(struct agp_i810_softc), agp_i810_probe, agp_i810_attach, NULL, agp_i810_activate, }; diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c index 1e0ff0135cf..628b122187e 100644 --- a/sys/dev/pci/agp_intel.c +++ b/sys/dev/pci/agp_intel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_intel.c,v 1.24 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: agp_intel.c,v 1.25 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $ */ /*- @@ -78,7 +78,7 @@ void agp_intel_bind_page(void *, bus_addr_t, paddr_t, int); void agp_intel_unbind_page(void *, bus_addr_t); void agp_intel_flush_tlb(void *); -struct cfattach intelagp_ca = { +const struct cfattach intelagp_ca = { sizeof(struct agp_intel_softc), agp_intel_probe, agp_intel_attach, NULL, agp_intel_activate }; diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c index 260c9850be3..f0d59d05494 100644 --- a/sys/dev/pci/agp_sis.c +++ b/sys/dev/pci/agp_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_sis.c,v 1.19 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: agp_sis.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: agp_sis.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */ /*- @@ -66,7 +66,7 @@ void agp_sis_bind_page(void *, bus_addr_t, paddr_t, int); void agp_sis_unbind_page(void *, bus_addr_t); void agp_sis_flush_tlb(void *); -struct cfattach sisagp_ca = { +const struct cfattach sisagp_ca = { sizeof(struct agp_sis_softc), agp_sis_probe, agp_sis_attach, NULL, agp_sis_activate }; diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c index 7a8000273ed..75828c10a6c 100644 --- a/sys/dev/pci/agp_via.c +++ b/sys/dev/pci/agp_via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_via.c,v 1.21 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: agp_via.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */ /*- @@ -75,7 +75,7 @@ const struct agp_methods agp_via_methods = { agp_via_flush_tlb, }; -struct cfattach viaagp_ca = { +const struct cfattach viaagp_ca = { sizeof(struct agp_via_softc), agp_via_probe, agp_via_attach, NULL, agp_via_activate }; diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 8a54a945fe1..d131b2a4078 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.61 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.62 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: ahc_pci.c,v 1.43 2003/08/18 09:16:22 taca Exp $ */ /* @@ -42,7 +42,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.61 2022/01/09 05:42:45 jsg Exp $ + * $Id: ahc_pci.c,v 1.62 2022/03/11 18:00:45 mpi Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -643,7 +643,7 @@ int ahc_pci_probe(struct device *, void *, void *); void ahc_pci_attach(struct device *, struct device *, void *); -struct cfattach ahc_pci_ca = { +const struct cfattach ahc_pci_ca = { sizeof(struct ahc_softc), ahc_pci_probe, ahc_pci_attach }; diff --git a/sys/dev/pci/ahci_pci.c b/sys/dev/pci/ahci_pci.c index 79044b52dd5..77da17ccb8f 100644 --- a/sys/dev/pci/ahci_pci.c +++ b/sys/dev/pci/ahci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci_pci.c,v 1.15 2018/08/03 22:18:13 kettenis Exp $ */ +/* $OpenBSD: ahci_pci.c,v 1.16 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2006 David Gwynne @@ -164,7 +164,7 @@ void ahci_pci_attach(struct device *, struct device *, int ahci_pci_detach(struct device *, int); int ahci_pci_activate(struct device *, int); -struct cfattach ahci_pci_ca = { +const struct cfattach ahci_pci_ca = { sizeof(struct ahci_pci_softc), ahci_pci_match, ahci_pci_attach, @@ -172,7 +172,7 @@ struct cfattach ahci_pci_ca = { ahci_pci_activate }; -struct cfattach ahci_jmb_ca = { +const struct cfattach ahci_jmb_ca = { sizeof(struct ahci_pci_softc), ahci_pci_match, ahci_pci_attach, diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c index 2f35a654b45..bc6f3401129 100644 --- a/sys/dev/pci/ahd_pci.c +++ b/sys/dev/pci/ahd_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahd_pci.c,v 1.27 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: ahd_pci.c,v 1.28 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -284,7 +284,7 @@ int ahd_pci_probe(struct device *, void *, void *); void ahd_pci_attach(struct device *, struct device *, void *); int ahd_activate(struct device *, int); -struct cfattach ahd_pci_ca = { +const struct cfattach ahd_pci_ca = { sizeof(struct ahd_softc), ahd_pci_probe, ahd_pci_attach, NULL, ahd_activate }; diff --git a/sys/dev/pci/alipm.c b/sys/dev/pci/alipm.c index da1c657dedf..228d5fb9216 100644 --- a/sys/dev/pci/alipm.c +++ b/sys/dev/pci/alipm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alipm.c,v 1.16 2012/10/05 10:51:28 haesbaert Exp $ */ +/* $OpenBSD: alipm.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -114,7 +114,7 @@ void alipm_smb_release_bus(void *, int); int alipm_smb_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t, void *, size_t, int); -struct cfattach alipm_ca = { +const struct cfattach alipm_ca = { sizeof(struct alipm_softc), alipm_match, alipm_attach diff --git a/sys/dev/pci/amas.c b/sys/dev/pci/amas.c index afbbf091b58..4a35077fa9b 100644 --- a/sys/dev/pci/amas.c +++ b/sys/dev/pci/amas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amas.c,v 1.6 2020/01/04 01:34:24 jsg Exp $ */ +/* $OpenBSD: amas.c,v 1.7 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2009 Ariane van der Steldt @@ -119,7 +119,7 @@ static const struct amas_feature_t amas_feature[] = { }; /* Probe code. */ -struct cfattach amas_ca = { +const struct cfattach amas_ca = { sizeof(struct amas_softc), amas_match, amas_attach diff --git a/sys/dev/pci/amdiic.c b/sys/dev/pci/amdiic.c index 612e20cee76..1bee1fb6c73 100644 --- a/sys/dev/pci/amdiic.c +++ b/sys/dev/pci/amdiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdiic.c,v 1.12 2020/01/09 14:35:19 mpi Exp $ */ +/* $OpenBSD: amdiic.c,v 1.13 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2005 Alexander Yurchenko @@ -110,7 +110,7 @@ int amdiic_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t, int amdiic_intr(void *); -struct cfattach amdiic_ca = { +const struct cfattach amdiic_ca = { sizeof(struct amdiic_softc), amdiic_match, amdiic_attach diff --git a/sys/dev/pci/amdpcib.c b/sys/dev/pci/amdpcib.c index d960472ff15..3160e6d4103 100644 --- a/sys/dev/pci/amdpcib.c +++ b/sys/dev/pci/amdpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpcib.c,v 1.3 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: amdpcib.c,v 1.4 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2007 Michael Shalayeff @@ -81,7 +81,7 @@ struct cfdriver amdpcib_cd = { int amdpcib_match(struct device *, void *, void *); void amdpcib_attach(struct device *, struct device *, void *); -struct cfattach amdpcib_ca = { +const struct cfattach amdpcib_ca = { sizeof(struct amdpcib_softc), amdpcib_match, amdpcib_attach }; diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c index af4be9fdb86..c279af6b0f5 100644 --- a/sys/dev/pci/amdpm.c +++ b/sys/dev/pci/amdpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpm.c,v 1.37 2021/02/23 04:44:31 cheloha Exp $ */ +/* $OpenBSD: amdpm.c,v 1.38 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko @@ -185,7 +185,7 @@ int amdpm_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t, int amdpm_intr(void *); -struct cfattach amdpm_ca = { +const struct cfattach amdpm_ca = { sizeof(struct amdpm_softc), amdpm_match, amdpm_attach, NULL, amdpm_activate }; diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c index 8f5b050cef8..07fc567f1eb 100644 --- a/sys/dev/pci/ami_pci.c +++ b/sys/dev/pci/ami_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami_pci.c,v 1.44 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: ami_pci.c,v 1.45 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -65,7 +65,7 @@ int ami_pci_find_device(void *); int ami_pci_match(struct device *, void *, void *); void ami_pci_attach(struct device *, struct device *, void *); -struct cfattach ami_pci_ca = { +const struct cfattach ami_pci_ca = { sizeof(struct ami_softc), ami_pci_match, ami_pci_attach }; diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c index 57878959c63..4aeba9b47ff 100644 --- a/sys/dev/pci/arc.c +++ b/sys/dev/pci/arc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc.c,v 1.121 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: arc.c,v 1.122 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2006 David Gwynne @@ -677,7 +677,7 @@ void arc_refresh_sensors(void *); #endif /* SMALL_KERNEL */ #endif -struct cfattach arc_ca = { +const struct cfattach arc_ca = { sizeof(struct arc_softc), arc_match, arc_attach, arc_detach, arc_activate }; diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c index c042bedc8b9..d42892bbbbd 100644 --- a/sys/dev/pci/auacer.c +++ b/sys/dev/pci/auacer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auacer.c,v 1.23 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: auacer.c,v 1.24 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $ */ /*- @@ -144,7 +144,7 @@ void auacer_attach(struct device *, struct device *, void *); int auacer_activate(struct device *, int); int auacer_intr(void *); -struct cfattach auacer_ca = { +const struct cfattach auacer_ca = { sizeof(struct auacer_softc), auacer_match, auacer_attach, NULL, auacer_activate }; diff --git a/sys/dev/pci/auglx.c b/sys/dev/pci/auglx.c index dd293021742..8316136cef3 100644 --- a/sys/dev/pci/auglx.c +++ b/sys/dev/pci/auglx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auglx.c,v 1.18 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: auglx.c,v 1.19 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2008 Marc Balmer @@ -270,7 +270,7 @@ int auglx_write_codec(void *, u_int8_t, u_int16_t); void auglx_reset_codec(void *); enum ac97_host_flags auglx_flags_codec(void *); -struct cfattach auglx_ca = { +const struct cfattach auglx_ca = { sizeof(struct auglx_softc), auglx_match, auglx_attach, NULL, auglx_activate }; diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 925c960103e..bc27d233f21 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.114 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: auich.c,v 1.115 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -251,7 +251,7 @@ int auich_intr(void *); int auich_activate(struct device *, int); -struct cfattach auich_ca = { +const struct cfattach auich_ca = { sizeof(struct auich_softc), auich_match, auich_attach, NULL, auich_activate }; diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index 66a929bf66d..dca3dfa3007 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.46 2022/02/21 08:50:18 jsg Exp $ */ +/* $OpenBSD: auixp.c,v 1.47 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -95,7 +95,7 @@ int auixp_detach(struct device *, int); int auixp_activate(struct device *, int); -struct cfattach auixp_ca = { +const struct cfattach auixp_ca = { sizeof(struct auixp_softc), auixp_match, auixp_attach, NULL, auixp_activate }; diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 228e3f2d0e5..39db4333a40 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.45 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: autri.c,v 1.46 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -114,7 +114,7 @@ struct cfdriver autri_cd = { NULL, "autri", DV_DULL }; -struct cfattach autri_ca = { +const struct cfattach autri_ca = { sizeof(struct autri_softc), autri_match, autri_attach, NULL, autri_activate }; diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 39145b52e39..8281f448621 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.61 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: auvia.c,v 1.62 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $ */ /*- @@ -103,7 +103,7 @@ struct cfdriver auvia_cd = { NULL, "auvia", DV_DULL }; -struct cfattach auvia_ca = { +const struct cfattach auvia_ca = { sizeof (struct auvia_softc), auvia_match, auvia_attach, NULL, auvia_activate }; diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index ee3da2b6451..b3ae4463941 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.269 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: azalia.c,v 1.270 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -280,7 +280,7 @@ int azalia_resume(azalia_t *); int azalia_resume_codec(codec_t *); /* variables */ -struct cfattach azalia_ca = { +const struct cfattach azalia_ca = { sizeof(azalia_t), azalia_pci_match, azalia_pci_attach, azalia_pci_detach, azalia_pci_activate }; diff --git a/sys/dev/pci/berkwdt.c b/sys/dev/pci/berkwdt.c index 6a7fc822e21..bf9c3377ca0 100644 --- a/sys/dev/pci/berkwdt.c +++ b/sys/dev/pci/berkwdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: berkwdt.c,v 1.10 2020/11/29 03:17:27 kevlo Exp $ */ +/* $OpenBSD: berkwdt.c,v 1.11 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2009 Wim Van Sebroeck @@ -54,7 +54,7 @@ int berkwdt_send_command(struct berkwdt_softc *sc, u_int8_t cmd, int *val); int berkwdt_set_timeout(void *, int); -struct cfattach berkwdt_ca = { +const struct cfattach berkwdt_ca = { sizeof(struct berkwdt_softc), berkwdt_match, berkwdt_attach, NULL, berkwdt_activate }; diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 68557e71a40..cb266015d07 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.34 2021/03/05 12:40:14 jsg Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.35 2022/03/11 18:00:53 mpi Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -110,7 +110,7 @@ paddr_t bktr_mmap(dev_t, off_t, int); static int bktr_probe(struct device *, void *, void *); static void bktr_attach(struct device *, struct device *, void *); -struct cfattach bktr_ca = { +const struct cfattach bktr_ca = { sizeof(struct bktr_softc), bktr_probe, bktr_attach }; diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c index 94db97096bd..d17f9888360 100644 --- a/sys/dev/pci/cac_pci.c +++ b/sys/dev/pci/cac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cac_pci.c,v 1.17 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: cac_pci.c,v 1.18 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: cac_pci.c,v 1.10 2001/01/10 16:48:04 ad Exp $ */ /*- @@ -65,7 +65,7 @@ void cac_pci_l0_intr_enable(struct cac_softc *, int); int cac_pci_l0_intr_pending(struct cac_softc *); void cac_pci_l0_submit(struct cac_softc *, struct cac_ccb *); -struct cfattach cac_pci_ca = { +const struct cfattach cac_pci_ca = { sizeof(struct cac_softc), cac_pci_match, cac_pci_attach }; diff --git a/sys/dev/pci/ccp_pci.c b/sys/dev/pci/ccp_pci.c index 76e215e47f8..d9495ef6247 100644 --- a/sys/dev/pci/ccp_pci.c +++ b/sys/dev/pci/ccp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccp_pci.c,v 1.5 2020/01/04 01:34:24 jsg Exp $ */ +/* $OpenBSD: ccp_pci.c,v 1.6 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2018 David Gwynne @@ -36,7 +36,7 @@ int ccp_pci_match(struct device *, void *, void *); void ccp_pci_attach(struct device *, struct device *, void *); -struct cfattach ccp_pci_ca = { +const struct cfattach ccp_pci_ca = { sizeof(struct ccp_softc), ccp_pci_match, ccp_pci_attach, diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c index 14a92a858db..004aface7d8 100644 --- a/sys/dev/pci/ciss_pci.c +++ b/sys/dev/pci/ciss_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss_pci.c,v 1.21 2020/01/05 01:07:58 jsg Exp $ */ +/* $OpenBSD: ciss_pci.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -41,7 +41,7 @@ int ciss_pci_match(struct device *, void *, void *); void ciss_pci_attach(struct device *, struct device *, void *); int ciss_activate(struct device *, int); -struct cfattach ciss_pci_ca = { +const struct cfattach ciss_pci_ca = { sizeof(struct ciss_softc), ciss_pci_match, ciss_pci_attach, NULL, ciss_activate }; diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 03c0c39b9e2..278400b3042 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.47 2022/02/16 06:21:18 anton Exp $ */ +/* $OpenBSD: cmpci.c,v 1.48 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */ /* @@ -105,7 +105,7 @@ struct cfdriver cmpci_cd = { NULL, "cmpci", DV_DULL }; -struct cfattach cmpci_ca = { +const struct cfattach cmpci_ca = { sizeof (struct cmpci_softc), cmpci_match, cmpci_attach, NULL, cmpci_activate }; diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index e75aa0c034e..ee0b09132c3 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.55 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: cs4280.c,v 1.56 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -185,7 +185,7 @@ struct cfdriver clcs_cd = { NULL, "clcs", DV_DULL }; -struct cfattach clcs_ca = { +const struct cfattach clcs_ca = { sizeof(struct cs4280_softc), cs4280_match, cs4280_attach, NULL, cs4280_activate }; diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index b21149786b1..0c9c1d962c4 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4281.c,v 1.40 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: cs4281.c,v 1.41 2022/03/11 18:00:45 mpi Exp $ */ /* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */ /* @@ -236,7 +236,7 @@ struct midi_hw_if cs4281_midi_hw_if = { }; #endif -struct cfattach clct_ca = { +const struct cfattach clct_ca = { sizeof(struct cs4281_softc), cs4281_match, cs4281_attach, NULL, cs4281_activate }; diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c index 265dceedd79..f8532968919 100644 --- a/sys/dev/pci/cy_pci.c +++ b/sys/dev/pci/cy_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy_pci.c,v 1.15 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: cy_pci.c,v 1.16 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 1996 Timo Rossi. * All rights reserved. @@ -60,7 +60,7 @@ struct cy_pci_softc { bus_space_handle_t sc_ioh; /* PLX i/o handle */ }; -struct cfattach cy_pci_ca = { +const struct cfattach cy_pci_ca = { sizeof(struct cy_pci_softc), cy_pci_match, cy_pci_attach }; diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index d408307aac3..bb88a065365 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cz.c,v 1.26 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: cz.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */ /*- @@ -165,7 +165,7 @@ int cz_match(struct device *, void *, void *); void cz_attach(struct device *, struct device *, void *); int cz_wait_pci_doorbell(struct cz_softc *, char *); -struct cfattach cz_ca = { +const struct cfattach cz_ca = { sizeof(struct cz_softc), cz_match, cz_attach }; diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c index e8cbeabd125..15add19d558 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c @@ -108,7 +108,7 @@ extern int amdgpu_exp_hw_support; */ int amdgpu_fatal_error; -struct cfattach amdgpu_ca = { +const struct cfattach amdgpu_ca = { sizeof (struct amdgpu_device), amdgpu_probe, amdgpu_attach, amdgpu_detach, amdgpu_activate }; diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c index a8060c8d39d..a0a1deaabb1 100644 --- a/sys/dev/pci/drm/drm_drv.c +++ b/sys/dev/pci/drm/drm_drv.c @@ -1501,7 +1501,7 @@ drm_activate(struct device *self, int act) return (0); } -struct cfattach drm_ca = { +const struct cfattach drm_ca = { sizeof(struct drm_softc), drm_probe, drm_attach, drm_detach, drm_activate }; diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index fdb186b5a8b..d8d52895951 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -2316,7 +2316,7 @@ int inteldrm_detach(struct device *, int); int inteldrm_activate(struct device *, int); void inteldrm_attachhook(struct device *); -struct cfattach inteldrm_ca = { +const struct cfattach inteldrm_ca = { sizeof(struct inteldrm_softc), inteldrm_match, inteldrm_attach, inteldrm_detach, inteldrm_activate }; diff --git a/sys/dev/pci/drm/radeon/radeon_kms.c b/sys/dev/pci/drm/radeon/radeon_kms.c index 10fa7bd5667..d72d2ce7c66 100644 --- a/sys/dev/pci/drm/radeon/radeon_kms.c +++ b/sys/dev/pci/drm/radeon/radeon_kms.c @@ -88,7 +88,7 @@ extern const struct drm_driver kms_driver; */ int radeon_fatal_error; -struct cfattach radeondrm_ca = { +const struct cfattach radeondrm_ca = { sizeof (struct radeon_device), radeondrm_probe, radeondrm_attach_kms, radeondrm_detach_kms, radeondrm_activate_kms }; diff --git a/sys/dev/pci/dwiic_pci.c b/sys/dev/pci/dwiic_pci.c index db73d18df42..a90142aee22 100644 --- a/sys/dev/pci/dwiic_pci.c +++ b/sys/dev/pci/dwiic_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwiic_pci.c,v 1.19 2022/01/11 00:37:23 jsg Exp $ */ +/* $OpenBSD: dwiic_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ /* * Synopsys DesignWare I2C controller * PCI attachment @@ -50,7 +50,7 @@ void dwiic_pci_bus_scan(struct device *, struct aml_node *acpi_pci_match(struct device *dev, struct pci_attach_args *pa); #endif -struct cfattach dwiic_pci_ca = { +const struct cfattach dwiic_pci_ca = { sizeof(struct dwiic_softc), dwiic_pci_match, dwiic_pci_attach, diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index e20114c4789..9a0eb2a4125 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.59 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: eap.c,v 1.60 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -153,7 +153,7 @@ int eap_freemem(struct eap_softc *, struct eap_dma *); #define EREAD2(sc, r) bus_space_read_2((sc)->iot, (sc)->ioh, (r)) #define EREAD4(sc, r) bus_space_read_4((sc)->iot, (sc)->ioh, (r)) -struct cfattach eap_ca = { +const struct cfattach eap_ca = { sizeof(struct eap_softc), eap_match, eap_attach, NULL, eap_activate }; diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c index 591f80ec5f2..70ec084a59c 100644 --- a/sys/dev/pci/ehci_pci.c +++ b/sys/dev/pci/ehci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci_pci.c,v 1.31 2019/05/02 20:28:46 kettenis Exp $ */ +/* $OpenBSD: ehci_pci.c,v 1.32 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: ehci_pci.c,v 1.15 2004/04/23 21:13:06 itojun Exp $ */ /* @@ -80,7 +80,7 @@ void ehci_pci_givecontroller(struct ehci_pci_softc *); #endif void ehci_pci_takecontroller(struct ehci_pci_softc *, int); -struct cfattach ehci_pci_ca = { +const struct cfattach ehci_pci_ca = { sizeof(struct ehci_pci_softc), ehci_pci_match, ehci_pci_attach, ehci_pci_detach, ehci_pci_activate }; diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index 792a9b449cc..aeb8e731790 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.56 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: emuxki.c,v 1.57 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -203,7 +203,7 @@ struct cfdriver emu_cd = { NULL, "emu", DV_DULL }; -struct cfattach emu_ca = { +const struct cfattach emu_ca = { sizeof(struct emuxki_softc), emuxki_match, emuxki_attach, diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c index 22ae8ea3cf1..04b985cc131 100644 --- a/sys/dev/pci/envy.c +++ b/sys/dev/pci/envy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envy.c,v 1.82 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: envy.c,v 1.83 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2007 Alexandre Ratchov * @@ -170,7 +170,7 @@ void ak5365_adc_devinfo(struct envy_softc *, struct mixer_devinfo *, int); void ak5365_adc_get(struct envy_softc *, struct mixer_ctrl *, int); int ak5365_adc_set(struct envy_softc *, struct mixer_ctrl *, int); -struct cfattach envy_ca = { +const struct cfattach envy_ca = { sizeof(struct envy_softc), envymatch, envyattach, envydetach, envyactivate }; diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index 7d3627d8862..4374f7a63e7 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esa.c,v 1.36 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: esa.c,v 1.37 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */ /* @@ -180,7 +180,7 @@ struct cfdriver esa_cd = { NULL, "esa", DV_DULL }; -struct cfattach esa_ca = { +const struct cfattach esa_ca = { sizeof(struct esa_softc), esa_match, esa_attach, esa_detach, esa_activate }; diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 21e84e24b8b..7444529845d 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.48 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: eso.c,v 1.49 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $ */ /* @@ -90,7 +90,7 @@ void eso_attach(struct device *, struct device *, void *); int eso_activate(struct device *, int); void eso_defer(struct device *); -struct cfattach eso_ca = { +const struct cfattach eso_ca = { sizeof (struct eso_softc), eso_match, eso_attach, NULL, eso_activate }; diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 1c5aa781a8d..c242371c6b4 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.31 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: fms.c,v 1.32 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -95,7 +95,7 @@ struct cfdriver fms_cd = { NULL, "fms", DV_DULL }; -struct cfattach fms_ca = { +const struct cfattach fms_ca = { sizeof (struct fms_softc), fms_match, fms_attach }; diff --git a/sys/dev/pci/gcu.c b/sys/dev/pci/gcu.c index 46b4de3affb..70b9d6ea420 100644 --- a/sys/dev/pci/gcu.c +++ b/sys/dev/pci/gcu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gcu.c,v 1.5 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: gcu.c,v 1.6 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2009 Dariusz Swiderski @@ -42,7 +42,7 @@ struct cfdriver gcu_cd = { NULL, "gcu", DV_IFNET }; -struct cfattach gcu_ca = { +const struct cfattach gcu_ca = { sizeof(struct gcu_softc), gcu_probe, gcu_attach }; diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index 1a79a1d1efe..ac1a6b2329d 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.26 2020/01/05 01:07:58 jsg Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -143,7 +143,7 @@ void gdt_mpr_release_event(struct gdt_softc *, struct gdt_ccb *); void gdt_mpr_set_sema0(struct gdt_softc *); int gdt_mpr_test_busy(struct gdt_softc *); -struct cfattach gdt_pci_ca = { +const struct cfattach gdt_pci_ca = { sizeof (struct gdt_softc), gdt_pci_probe, gdt_pci_attach }; diff --git a/sys/dev/pci/glxpcib.c b/sys/dev/pci/glxpcib.c index a4458bf2951..08f23f3ed51 100644 --- a/sys/dev/pci/glxpcib.c +++ b/sys/dev/pci/glxpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glxpcib.c,v 1.15 2022/01/09 05:42:45 jsg Exp $ */ +/* $OpenBSD: glxpcib.c,v 1.16 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2007 Marc Balmer @@ -222,7 +222,7 @@ int glxpcib_activate(struct device *, int); int glxpcib_search(struct device *, void *, void *); int glxpcib_print(void *, const char *); -struct cfattach glxpcib_ca = { +const struct cfattach glxpcib_ca = { sizeof(struct glxpcib_softc), glxpcib_match, glxpcib_attach, NULL, glxpcib_activate }; diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c index a7b4a7eb762..5072dd81a3a 100644 --- a/sys/dev/pci/i82365_pci.c +++ b/sys/dev/pci/i82365_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_pci.c,v 1.13 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: i82365_pci.c,v 1.14 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $ */ /* @@ -59,7 +59,7 @@ int pcic_pci_match(struct device *, void *, void *); void pcic_pci_attach(struct device *, struct device *, void *); -struct cfattach pcic_pci_ca = { +const struct cfattach pcic_pci_ca = { sizeof(struct pcic_pci_softc), pcic_pci_match, pcic_pci_attach }; diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c index 1c4ea5ece4d..a3309657f87 100644 --- a/sys/dev/pci/ichiic.c +++ b/sys/dev/pci/ichiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichiic.c,v 1.47 2022/01/11 00:37:23 jsg Exp $ */ +/* $OpenBSD: ichiic.c,v 1.48 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2005, 2006 Alexander Yurchenko @@ -74,7 +74,7 @@ int ichiic_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t, int ichiic_intr(void *); -struct cfattach ichiic_ca = { +const struct cfattach ichiic_ca = { sizeof(struct ichiic_softc), ichiic_match, ichiic_attach diff --git a/sys/dev/pci/ichwdt.c b/sys/dev/pci/ichwdt.c index a87b6844708..81e66b18d1c 100644 --- a/sys/dev/pci/ichwdt.c +++ b/sys/dev/pci/ichwdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichwdt.c,v 1.6 2016/03/19 11:34:22 mpi Exp $ */ +/* $OpenBSD: ichwdt.c,v 1.7 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2004, 2005 Alexander Yurchenko @@ -57,7 +57,7 @@ int ichwdt_activate(struct device *, int); int ichwdt_cb(void *, int); -struct cfattach ichwdt_ca = { +const struct cfattach ichwdt_ca = { sizeof(struct ichwdt_softc), ichwdt_match, ichwdt_attach, diff --git a/sys/dev/pci/if_acx_pci.c b/sys/dev/pci/if_acx_pci.c index 4a9b2e1f0c1..57a5ccc24a2 100644 --- a/sys/dev/pci/if_acx_pci.c +++ b/sys/dev/pci/if_acx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_pci.c,v 1.9 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_acx_pci.c,v 1.10 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt @@ -79,7 +79,7 @@ int acx_pci_match(struct device *, void *, void *); void acx_pci_attach(struct device *, struct device *, void *); int acx_pci_detach(struct device *, int); -struct cfattach acx_pci_ca = { +const struct cfattach acx_pci_ca = { sizeof (struct acx_pci_softc), acx_pci_match, acx_pci_attach, acx_pci_detach }; diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 5a923078129..f035023bf54 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.37 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_age.c,v 1.38 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon @@ -110,7 +110,7 @@ const struct pci_matchid age_devices[] = { { PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L1 } }; -struct cfattach age_ca = { +const struct cfattach age_ca = { sizeof (struct age_softc), age_match, age_attach }; diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index d15cf7ba26b..39e4e9a1aa9 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_alc.c,v 1.54 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_alc.c,v 1.55 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon * All rights reserved. @@ -149,7 +149,7 @@ const struct pci_matchid alc_devices[] = { { PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_E2500 } }; -struct cfattach alc_ca = { +const struct cfattach alc_ca = { sizeof (struct alc_softc), alc_match, alc_attach, alc_detach, alc_activate }; diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index fecc6f0ef27..c1998c8bd30 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ale.c,v 1.48 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_ale.c,v 1.49 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. @@ -113,7 +113,7 @@ const struct pci_matchid ale_devices[] = { { PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L1E } }; -struct cfattach ale_ca = { +const struct cfattach ale_ca = { sizeof (struct ale_softc), ale_match, ale_attach, NULL, ale_activate }; diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c index fb92d9cbc5e..6eeb32f9ca0 100644 --- a/sys/dev/pci/if_an_pci.c +++ b/sys/dev/pci/if_an_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pci.c,v 1.19 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_an_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -86,7 +86,7 @@ int an_pci_match(struct device *, void *, void *); void an_pci_attach(struct device *, struct device *, void *); -struct cfattach an_pci_ca = { +const struct cfattach an_pci_ca = { sizeof (struct an_softc), an_pci_match, an_pci_attach }; diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c index c38fdb09669..8944d4d8d90 100644 --- a/sys/dev/pci/if_ath_pci.c +++ b/sys/dev/pci/if_ath_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ath_pci.c,v 1.26 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_ath_pci.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $ */ /*- @@ -87,7 +87,7 @@ int ath_pci_match(struct device *, void *, void *); void ath_pci_attach(struct device *, struct device *, void *); int ath_pci_detach(struct device *, int); -struct cfattach ath_pci_ca = { +const struct cfattach ath_pci_ca = { sizeof(struct ath_pci_softc), ath_pci_match, ath_pci_attach, diff --git a/sys/dev/pci/if_athn_pci.c b/sys/dev/pci/if_athn_pci.c index 31cae7acacf..b1a9aadb2e4 100644 --- a/sys/dev/pci/if_athn_pci.c +++ b/sys/dev/pci/if_athn_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_pci.c,v 1.21 2021/04/15 18:25:44 stsp Exp $ */ +/* $OpenBSD: if_athn_pci.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini @@ -80,7 +80,7 @@ void athn_pci_write(struct athn_softc *, uint32_t, uint32_t); void athn_pci_write_barrier(struct athn_softc *); void athn_pci_disable_aspm(struct athn_softc *); -struct cfattach athn_pci_ca = { +const struct cfattach athn_pci_ca = { sizeof (struct athn_pci_softc), athn_pci_match, athn_pci_attach, diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c index f12a7c5169d..899c1d5dd19 100644 --- a/sys/dev/pci/if_atw_pci.c +++ b/sys/dev/pci/if_atw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atw_pci.c,v 1.18 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_atw_pci.c,v 1.19 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_atw_pci.c,v 1.7 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -88,7 +88,7 @@ int atw_pci_match(struct device *, void *, void *); void atw_pci_attach(struct device *, struct device *, void *); int atw_pci_detach(struct device *, int); -struct cfattach atw_pci_ca = { +const struct cfattach atw_pci_ca = { sizeof (struct atw_softc), atw_pci_match, atw_pci_attach, atw_pci_detach, atw_activate }; diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 5449eddaab6..68bc288e23e 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bce.c,v 1.54 2022/01/09 05:42:46 jsg Exp $ */ +/* $OpenBSD: if_bce.c,v 1.55 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */ /* @@ -163,7 +163,7 @@ int bcedebug = 0; #define DPRINTFN(n,x) #endif -struct cfattach bce_ca = { +const struct cfattach bce_ca = { sizeof(struct bce_softc), bce_probe, bce_attach, NULL, bce_activate }; struct cfdriver bce_cd = { diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index e354e441c3a..68e9a387442 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.397 2022/01/09 05:42:46 jsg Exp $ */ +/* $OpenBSD: if_bge.c,v 1.398 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -120,7 +120,7 @@ void bge_attach(struct device *, struct device *, void *); int bge_detach(struct device *, int); int bge_activate(struct device *, int); -struct cfattach bge_ca = { +const struct cfattach bge_ca = { sizeof(struct bge_softc), bge_probe, bge_attach, bge_detach, bge_activate }; diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 62be4930d7e..ffc84023caf 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.131 2022/01/09 05:42:46 jsg Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.132 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -391,7 +391,7 @@ void bnx_tick(void *); /****************************************************************************/ /* OpenBSD device dispatch table. */ /****************************************************************************/ -struct cfattach bnx_ca = { +const struct cfattach bnx_ca = { sizeof(struct bnx_softc), bnx_probe, bnx_attach }; diff --git a/sys/dev/pci/if_bnxt.c b/sys/dev/pci/if_bnxt.c index e17be78686b..47903b441d0 100644 --- a/sys/dev/pci/if_bnxt.c +++ b/sys/dev/pci/if_bnxt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnxt.c,v 1.34 2021/07/24 05:49:59 jmatthew Exp $ */ +/* $OpenBSD: if_bnxt.c,v 1.35 2022/03/11 18:00:45 mpi Exp $ */ /*- * Broadcom NetXtreme-C/E network driver. * @@ -399,7 +399,7 @@ int bnxt_hwrm_fw_set_time(struct bnxt_softc *softc, uint16_t year, #endif -struct cfattach bnxt_ca = { +const struct cfattach bnxt_ca = { sizeof(struct bnxt_softc), bnxt_match, bnxt_attach }; diff --git a/sys/dev/pci/if_bwfm_pci.c b/sys/dev/pci/if_bwfm_pci.c index 30c55314baa..7053e27e998 100644 --- a/sys/dev/pci/if_bwfm_pci.c +++ b/sys/dev/pci/if_bwfm_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwfm_pci.c,v 1.69 2022/03/06 18:52:47 kettenis Exp $ */ +/* $OpenBSD: if_bwfm_pci.c,v 1.70 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2017 Patrick Wildt @@ -330,7 +330,7 @@ struct bwfm_proto_ops bwfm_pci_msgbuf_ops = { .proto_rxctl = NULL, }; -struct cfattach bwfm_pci_ca = { +const struct cfattach bwfm_pci_ca = { sizeof(struct bwfm_pci_softc), bwfm_pci_match, bwfm_pci_attach, diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c index c9699036b97..4f2103da492 100644 --- a/sys/dev/pci/if_bwi_pci.c +++ b/sys/dev/pci/if_bwi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwi_pci.c,v 1.17 2019/05/10 16:44:36 bcook Exp $ */ +/* $OpenBSD: if_bwi_pci.c,v 1.18 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2007 Marcus Glocker @@ -72,7 +72,7 @@ struct bwi_pci_softc { bus_size_t psc_mapsize; }; -struct cfattach bwi_pci_ca = { +const struct cfattach bwi_pci_ca = { sizeof(struct bwi_pci_softc), bwi_pci_match, bwi_pci_attach, bwi_pci_detach, bwi_pci_activate }; diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c index 8172e35f5f0..3de0a376fc4 100644 --- a/sys/dev/pci/if_cas.c +++ b/sys/dev/pci/if_cas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cas.c,v 1.53 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_cas.c,v 1.54 2022/03/11 18:00:45 mpi Exp $ */ /* * @@ -95,7 +95,7 @@ int cas_match(struct device *, void *, void *); void cas_attach(struct device *, struct device *, void *); int cas_pci_enaddr(struct cas_softc *, struct pci_attach_args *); -struct cfattach cas_ca = { +const struct cfattach cas_ca = { sizeof(struct cas_softc), cas_match, cas_attach }; diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index 3c279f32485..771154ccd20 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.77 2022/02/22 01:15:01 guenther Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.78 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -520,7 +520,7 @@ dc_pci_detach(struct device *self, int flags) return (0); } -struct cfattach dc_pci_ca = { +const struct cfattach dc_pci_ca = { sizeof(struct dc_softc), dc_pci_match, dc_pci_attach, dc_pci_detach, dc_activate }; diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 9b16a1fae65..4103fc8702e 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.139 2022/02/22 01:15:01 guenther Exp $ */ +/* $OpenBSD: if_de.c,v 1.140 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */ /*- @@ -120,7 +120,7 @@ int tulip_probe(struct device *parent, void *match, void *aux); void tulip_attach(struct device * const parent, struct device * const self, void * const aux); -struct cfattach de_ca = { +const struct cfattach de_ca = { sizeof(tulip_softc_t), tulip_probe, tulip_attach }; diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h index 228a0a350ef..0ecadf3bf32 100644 --- a/sys/dev/pci/if_devar.h +++ b/sys/dev/pci/if_devar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_devar.h,v 1.40 2022/01/09 05:42:50 jsg Exp $ */ +/* $OpenBSD: if_devar.h,v 1.41 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_devar.h,v 1.13 1997/06/08 18:46:36 thorpej Exp $ */ /*- @@ -792,7 +792,6 @@ static const struct { TULIP_MAX_TXSEG, TULIP_DATA_PER_DESC, \ 0, BUS_DMA_NOWAIT, (mapp)) -extern struct cfattach de_ca; extern struct cfdriver de_cd; #define TULIP_UNIT_TO_SOFTC(unit) ((tulip_softc_t *) de_cd.cd_devs[unit]) #define TULIP_IFP_TO_SOFTC(ifp) ((tulip_softc_t *)((ifp)->if_softc)) diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index dec91e59497..8b403ba3554 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.360 2022/01/09 05:42:50 jsg Exp $ */ +/* $OpenBSD: if_em.c,v 1.361 2022/03/11 18:00:45 mpi Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include @@ -319,7 +319,7 @@ void em_tbi_adjust_stats(struct em_softc *, uint32_t, uint8_t *); * OpenBSD Device Interface Entry Points *********************************************************************/ -struct cfattach em_ca = { +const struct cfattach em_ca = { sizeof(struct em_softc), em_probe, em_attach, em_detach, em_activate }; diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index d500903065c..e89878cd964 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pci.c,v 1.35 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: if_ep_pci.c,v 1.36 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */ /* @@ -77,7 +77,7 @@ int ep_pci_match(struct device *, void *, void *); void ep_pci_attach(struct device *, struct device *, void *); -struct cfattach ep_pci_ca = { +const struct cfattach ep_pci_ca = { sizeof(struct ep_softc), ep_pci_match, ep_pci_attach }; diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c index 5ef343f74e7..048ef120673 100644 --- a/sys/dev/pci/if_epic_pci.c +++ b/sys/dev/pci/if_epic_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_epic_pci.c,v 1.16 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_epic_pci.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $ */ /*- @@ -80,7 +80,7 @@ struct epic_pci_softc { int epic_pci_match(struct device *, void *, void *); void epic_pci_attach(struct device *, struct device *, void *); -struct cfattach epic_pci_ca = { +const struct cfattach epic_pci_ca = { sizeof(struct epic_pci_softc), epic_pci_match, epic_pci_attach }; diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index 34ec2ee5f82..df844edba7a 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_et.c,v 1.41 2022/01/09 05:42:50 jsg Exp $ */ +/* $OpenBSD: if_et.c,v 1.42 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. * @@ -158,7 +158,7 @@ const struct pci_matchid et_devices[] = { { PCI_VENDOR_LUCENT, PCI_PRODUCT_LUCENT_ET1310_GBE } }; -struct cfattach et_ca = { +const struct cfattach et_ca = { sizeof (struct et_softc), et_match, et_attach, et_detach }; diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index ea52a67517d..6754ba4fc46 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.66 2020/01/05 01:07:58 jsg Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.67 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -81,7 +81,7 @@ struct fxp_pci_softc { bus_size_t psc_mapsize; }; -struct cfattach fxp_pci_ca = { +const struct cfattach fxp_pci_ca = { sizeof(struct fxp_pci_softc), fxp_pci_match, fxp_pci_attach, fxp_pci_detach, fxp_activate }; diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index eeee62f672b..9dda743ef0e 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.39 2015/11/28 09:42:10 jmatthew Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.40 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -79,7 +79,7 @@ void gem_attach_pci(struct device *, struct device *, void *); int gem_detach_pci(struct device *, int); int gem_pci_enaddr(struct gem_softc *, struct pci_attach_args *); -struct cfattach gem_pci_ca = { +const struct cfattach gem_pci_ca = { sizeof(struct gem_pci_softc), gem_match_pci, gem_attach_pci, gem_detach_pci }; diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index da8714ba640..3019ee18cec 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.23 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.24 2022/03/11 18:00:45 mpi Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -72,7 +72,7 @@ void hmeattach_pci(struct device *, struct device *, void *); int hmedetach_pci(struct device *, int); int hme_pci_enaddr(struct hme_softc *, struct pci_attach_args *); -struct cfattach hme_pci_ca = { +const struct cfattach hme_pci_ca = { sizeof(struct hme_pci_softc), hmematch_pci, hmeattach_pci, hmedetach_pci }; diff --git a/sys/dev/pci/if_iavf.c b/sys/dev/pci/if_iavf.c index f0197bb5f35..d65769d787b 100644 --- a/sys/dev/pci/if_iavf.c +++ b/sys/dev/pci/if_iavf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iavf.c,v 1.10 2020/12/12 11:48:53 jan Exp $ */ +/* $OpenBSD: if_iavf.c,v 1.11 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -680,7 +680,7 @@ struct cfdriver iavf_cd = { DV_IFNET, }; -struct cfattach iavf_ca = { +const struct cfattach iavf_ca = { sizeof(struct iavf_softc), iavf_match, iavf_attach, diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 6a0613760c9..99c00d56d60 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.130 2022/01/09 05:42:50 jsg Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.131 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2004-2008 @@ -129,7 +129,7 @@ int ipw_debug = 0; #define DPRINTFN(n, x) #endif -struct cfattach ipw_ca = { +const struct cfattach ipw_ca = { sizeof (struct ipw_softc), ipw_match, ipw_attach, NULL, ipw_activate }; diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 6a569674596..d7e3f163d85 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.145 2021/04/15 18:32:19 stsp Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.146 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2004-2008 @@ -136,7 +136,7 @@ int iwi_debug = 0; #define DPRINTFN(n, x) #endif -struct cfattach iwi_ca = { +const struct cfattach iwi_ca = { sizeof (struct iwi_softc), iwi_match, iwi_attach, NULL, iwi_activate }; diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index eece4e0d25a..7e0e0f4841d 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.393 2022/03/10 21:00:51 bluhm Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.394 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -11774,7 +11774,7 @@ struct cfdriver iwm_cd = { NULL, "iwm", DV_IFNET }; -struct cfattach iwm_ca = { +const struct cfattach iwm_ca = { sizeof(struct iwm_softc), iwm_match, iwm_attach, NULL, iwm_activate }; diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 2c06d010424..dd629227807 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.255 2022/03/09 11:38:51 stsp Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.256 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini @@ -316,7 +316,7 @@ struct cfdriver iwn_cd = { NULL, "iwn", DV_IFNET }; -struct cfattach iwn_ca = { +const struct cfattach iwn_ca = { sizeof (struct iwn_softc), iwn_match, iwn_attach, iwn_detach, iwn_activate }; diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index a342efa9dd6..54900174ae6 100644 --- a/sys/dev/pci/if_ix.c +++ b/sys/dev/pci/if_ix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ix.c,v 1.183 2022/03/05 17:00:14 deraadt Exp $ */ +/* $OpenBSD: if_ix.c,v 1.184 2022/03/11 18:00:45 mpi Exp $ */ /****************************************************************************** @@ -199,7 +199,7 @@ struct cfdriver ix_cd = { NULL, "ix", DV_IFNET }; -struct cfattach ix_ca = { +const struct cfattach ix_ca = { sizeof(struct ix_softc), ixgbe_probe, ixgbe_attach, ixgbe_detach, ixgbe_activate }; diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c index c9c358da919..8ed13cf2f45 100644 --- a/sys/dev/pci/if_ixgb.c +++ b/sys/dev/pci/if_ixgb.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_ixgb.c,v 1.74 2022/02/21 12:36:21 jsg Exp $ */ +/* $OpenBSD: if_ixgb.c,v 1.75 2022/03/11 18:00:45 mpi Exp $ */ #include @@ -119,7 +119,7 @@ void ixgb_dma_free(struct ixgb_softc *, struct ixgb_dma_alloc *); * OpenBSD Device Interface Entry Points *********************************************************************/ -struct cfattach ixgb_ca = { +const struct cfattach ixgb_ca = { sizeof(struct ixgb_softc), ixgb_probe, ixgb_attach }; diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index 6412e5a0760..deeb6e566a8 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ixl.c,v 1.82 2022/02/10 16:22:00 bluhm Exp $ */ +/* $OpenBSD: if_ixl.c,v 1.83 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -1411,7 +1411,7 @@ struct cfdriver ixl_cd = { DV_IFNET, }; -struct cfattach ixl_ca = { +const struct cfattach ixl_ca = { sizeof(struct ixl_softc), ixl_match, ixl_attach, diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index 82cbd30cc13..5cab59e9d36 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.55 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_jme.c,v 1.56 2022/03/11 18:00:45 mpi Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. @@ -124,7 +124,7 @@ const struct pci_matchid jme_devices[] = { { PCI_VENDOR_JMICRON, PCI_PRODUCT_JMICRON_JMC260 } }; -struct cfattach jme_ca = { +const struct cfattach jme_ca = { sizeof (struct jme_softc), jme_match, jme_attach }; diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index b2bed1804d6..4da1c21d5e3 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.77 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_lge.c,v 1.78 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -112,7 +112,7 @@ int lge_probe(struct device *, void *, void *); void lge_attach(struct device *, struct device *, void *); -struct cfattach lge_ca = { +const struct cfattach lge_ca = { sizeof(struct lge_softc), lge_probe, lge_attach }; diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c index a962c37dd8d..3d0d2f75a38 100644 --- a/sys/dev/pci/if_lii.c +++ b/sys/dev/pci/if_lii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lii.c,v 1.45 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_lii.c,v 1.46 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation. @@ -125,7 +125,7 @@ struct cfdriver lii_cd = { DV_IFNET }; -struct cfattach lii_ca = { +const struct cfattach lii_ca = { sizeof(struct lii_softc), lii_match, lii_attach, diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c index db0f9025619..a8cf0124299 100644 --- a/sys/dev/pci/if_malo_pci.c +++ b/sys/dev/pci/if_malo_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo_pci.c,v 1.10 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_malo_pci.c,v 1.11 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2006 Marcus Glocker @@ -69,7 +69,7 @@ struct malo_pci_softc { bus_size_t sc_mapsize2; }; -struct cfattach malo_pci_ca = { +const struct cfattach malo_pci_ca = { sizeof(struct malo_pci_softc), malo_pci_match, malo_pci_attach, malo_pci_detach, malo_pci_activate }; diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c index eb858880d87..99930d7a2fe 100644 --- a/sys/dev/pci/if_mcx.c +++ b/sys/dev/pci/if_mcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mcx.c,v 1.103 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_mcx.c,v 1.104 2022/03/11 18:00:45 mpi Exp $ */ /* * Copyright (c) 2017 David Gwynne @@ -2628,7 +2628,7 @@ struct cfdriver mcx_cd = { DV_IFNET, }; -struct cfattach mcx_ca = { +const struct cfattach mcx_ca = { sizeof(struct mcx_softc), mcx_match, mcx_attach, diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 5422d6bb96a..a32f431db6c 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.141 2022/01/15 04:10:01 jsg Exp $ */ +/* $OpenBSD: if_msk.c,v 1.142 2022/03/11 18:00:46 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2302,7 +2302,7 @@ msk_stop(struct sk_if_softc *sc_if, int softonly) } } -struct cfattach mskc_ca = { +const struct cfattach mskc_ca = { sizeof(struct sk_softc), mskc_probe, mskc_attach, mskc_detach, mskc_activate }; @@ -2311,7 +2311,7 @@ struct cfdriver mskc_cd = { NULL, "mskc", DV_DULL }; -struct cfattach msk_ca = { +const struct cfattach msk_ca = { sizeof(struct sk_if_softc), msk_probe, msk_attach, msk_detach, msk_activate }; diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c index c46fca532a9..fcda4c40e71 100644 --- a/sys/dev/pci/if_mtd_pci.c +++ b/sys/dev/pci/if_mtd_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mtd_pci.c,v 1.11 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_mtd_pci.c,v 1.12 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2003 Oleg Safiullin @@ -54,7 +54,7 @@ static int mtd_pci_match(struct device *, void *, void *); static void mtd_pci_attach(struct device *, struct device *, void *); -struct cfattach mtd_pci_ca = { +const struct cfattach mtd_pci_ca = { sizeof(struct mtd_softc), mtd_pci_match, mtd_pci_attach }; diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index 99a5d2a3b98..76012c1134a 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.115 2021/02/08 08:18:45 mpi Exp $ */ +/* $OpenBSD: if_myx.c,v 1.116 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2007 Reyk Floeter @@ -247,7 +247,7 @@ void myx_kstat_stop(struct myx_softc *); struct cfdriver myx_cd = { NULL, "myx", DV_IFNET }; -struct cfattach myx_ca = { +const struct cfattach myx_ca = { sizeof(struct myx_softc), myx_match, myx_attach }; diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c index 744a9fa92a6..5ed6bc7b2f2 100644 --- a/sys/dev/pci/if_ne_pci.c +++ b/sys/dev/pci/if_ne_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pci.c,v 1.20 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_ne_pci.c,v 1.21 2022/03/11 18:00:48 mpi Exp $ */ /* $NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $ */ /*- @@ -74,7 +74,7 @@ struct ne_pci_softc { int ne_pci_match(struct device *, void *, void *); void ne_pci_attach(struct device *, struct device *, void *); -struct cfattach ne_pci_ca = { +const struct cfattach ne_pci_ca = { sizeof(struct ne_pci_softc), ne_pci_match, ne_pci_attach }; diff --git a/sys/dev/pci/if_nep.c b/sys/dev/pci/if_nep.c index 35e3c7eec1d..64c8d6a482a 100644 --- a/sys/dev/pci/if_nep.c +++ b/sys/dev/pci/if_nep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nep.c,v 1.33 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_nep.c,v 1.34 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2014, 2015 Mark Kettenis * @@ -457,7 +457,7 @@ struct nep_softc { int nep_match(struct device *, void *, void *); void nep_attach(struct device *, struct device *, void *); -struct cfattach nep_ca = { +const struct cfattach nep_ca = { sizeof(struct nep_softc), nep_match, nep_attach }; diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index b79461f67f2..660fdf70878 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.123 2020/12/12 11:48:53 jan Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.124 2022/03/11 18:00:48 mpi Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini @@ -91,7 +91,7 @@ void nfe_tick(void *); int nfe_wol(struct ifnet*, int); #endif -struct cfattach nfe_ca = { +const struct cfattach nfe_ca = { sizeof (struct nfe_softc), nfe_match, nfe_attach, NULL, nfe_activate }; diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 9a661d36ac5..787e9c92506 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.95 2020/12/12 11:48:53 jan Exp $ */ +/* $OpenBSD: if_nge.c,v 1.96 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -1915,7 +1915,7 @@ nge_stop(struct nge_softc *sc) sizeof(sc->nge_ldata->nge_tx_list)); } -struct cfattach nge_ca = { +const struct cfattach nge_ca = { sizeof(struct nge_softc), nge_probe, nge_attach }; diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c index 1420dc27909..b18938360a5 100644 --- a/sys/dev/pci/if_nxe.c +++ b/sys/dev/pci/if_nxe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nxe.c,v 1.78 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_nxe.c,v 1.79 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2007 David Gwynne @@ -729,7 +729,7 @@ int nxe_match(struct device *, void *, void *); void nxe_attach(struct device *, struct device *, void *); int nxe_intr(void *); -struct cfattach nxe_ca = { +const struct cfattach nxe_ca = { sizeof(struct nxe_softc), nxe_match, nxe_attach diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index 8ea78c81e05..084fc7af888 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.105 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_oce.c,v 1.106 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -499,7 +499,7 @@ struct cfdriver oce_cd = { NULL, "oce", DV_IFNET }; -struct cfattach oce_ca = { +const struct cfattach oce_ca = { sizeof(struct oce_softc), oce_match, oce_attach, NULL, NULL }; diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index 09c1b3b9370..5db8af9da3f 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pcn.c,v 1.46 2022/01/16 11:34:05 dlg Exp $ */ +/* $OpenBSD: if_pcn.c,v 1.47 2022/03/11 18:00:48 mpi Exp $ */ /* $NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $ */ /* @@ -470,7 +470,7 @@ int pcn_copy_small = 0; int pcn_match(struct device *, void *, void *); void pcn_attach(struct device *, struct device *, void *); -struct cfattach pcn_ca = { +const struct cfattach pcn_ca = { sizeof(struct pcn_softc), pcn_match, pcn_attach, }; diff --git a/sys/dev/pci/if_pgt_pci.c b/sys/dev/pci/if_pgt_pci.c index de05789deae..dba3bdb7ed8 100644 --- a/sys/dev/pci/if_pgt_pci.c +++ b/sys/dev/pci/if_pgt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pgt_pci.c,v 1.18 2015/12/11 16:07:02 mpi Exp $ */ +/* $OpenBSD: if_pgt_pci.c,v 1.19 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2006 Marcus Glocker @@ -65,7 +65,7 @@ struct pgt_pci_softc { bus_size_t sc_mapsize; }; -struct cfattach pgt_pci_ca = { +const struct cfattach pgt_pci_ca = { sizeof(struct pgt_pci_softc), pgt_pci_match, pgt_pci_attach, pgt_pci_detach, pgt_activate }; diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index d930e2327b7..8f049f05121 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_pci.c,v 1.27 2018/10/02 02:05:34 kevlo Exp $ */ +/* $OpenBSD: if_ral_pci.c,v 1.28 2022/03/11 18:00:48 mpi Exp $ */ /*- * Copyright (c) 2005-2010 Damien Bergamini @@ -106,7 +106,7 @@ int ral_pci_detach(struct device *, int); int ral_pci_activate(struct device *, int); void ral_pci_wakeup(struct ral_pci_softc *); -struct cfattach ral_pci_ca = { +const struct cfattach ral_pci_ca = { sizeof (struct ral_pci_softc), ral_pci_match, ral_pci_attach, ral_pci_detach, ral_pci_activate }; diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c index 9e81d97d199..eb989fb8823 100644 --- a/sys/dev/pci/if_re_pci.c +++ b/sys/dev/pci/if_re_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_pci.c,v 1.55 2021/01/24 01:59:20 jsg Exp $ */ +/* $OpenBSD: if_re_pci.c,v 1.56 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2005 Peter Valchev @@ -82,7 +82,7 @@ int re_pci_activate(struct device *, int); /* * PCI autoconfig definitions */ -struct cfattach re_pci_ca = { +const struct cfattach re_pci_ca = { sizeof(struct re_pci_softc), re_pci_probe, re_pci_attach, diff --git a/sys/dev/pci/if_rge.c b/sys/dev/pci/if_rge.c index 4ef95f6b65e..f7386f46995 100644 --- a/sys/dev/pci/if_rge.c +++ b/sys/dev/pci/if_rge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rge.c,v 1.16 2021/11/23 01:44:44 kevlo Exp $ */ +/* $OpenBSD: if_rge.c,v 1.17 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2019, 2020 Kevin Lo @@ -134,7 +134,7 @@ struct cfattach rge_ca = { sizeof(struct rge_softc), rge_match, rge_attach, NULL, rge_activate }; -struct cfdriver rge_cd = { +const struct cfdriver rge_cd = { NULL, "rge", DV_IFNET }; diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index b5737c67d4b..d09daf7c4ed 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.33 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.34 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 1997, 1998 @@ -84,7 +84,7 @@ struct rl_pci_softc { bus_size_t psc_mapsize; }; -struct cfattach rl_pci_ca = { +const struct cfattach rl_pci_ca = { sizeof(struct rl_pci_softc), rl_pci_match, rl_pci_attach, rl_pci_detach, rl_activate }; diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c index 5482e005865..7f8c1f516f1 100644 --- a/sys/dev/pci/if_rtw_pci.c +++ b/sys/dev/pci/if_rtw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_pci.c,v 1.20 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_rtw_pci.c,v 1.21 2022/03/11 18:00:48 mpi Exp $ */ /* $NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $ */ /*- @@ -93,7 +93,7 @@ struct rtw_pci_softc { int rtw_pci_match(struct device *, void *, void *); void rtw_pci_attach(struct device *, struct device *, void *); -struct cfattach rtw_pci_ca = { +const struct cfattach rtw_pci_ca = { sizeof (struct rtw_pci_softc), rtw_pci_match, rtw_pci_attach, rtw_pci_detach, rtw_activate }; diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c index 3fe97a9e84a..cf58df25657 100644 --- a/sys/dev/pci/if_sf_pci.c +++ b/sys/dev/pci/if_sf_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf_pci.c,v 1.14 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_sf_pci.c,v 1.15 2022/03/11 18:00:48 mpi Exp $ */ /* $NetBSD: if_sf_pci.c,v 1.10 2006/06/17 23:34:27 christos Exp $ */ /*- @@ -73,7 +73,7 @@ struct sf_pci_softc { int sf_pci_match(struct device *, void *, void *); void sf_pci_attach(struct device *, struct device *, void *); -struct cfattach sf_pci_ca = { +const struct cfattach sf_pci_ca = { sizeof(struct sf_pci_softc), sf_pci_match, sf_pci_attach }; diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 9b35993a8a2..985eb0f3ec0 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.141 2022/02/22 01:15:01 guenther Exp $ */ +/* $OpenBSD: if_sis.c,v 1.142 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. @@ -97,7 +97,7 @@ int sis_probe(struct device *, void *, void *); void sis_attach(struct device *, struct device *, void *); int sis_activate(struct device *, int); -struct cfattach sis_ca = { +const struct cfattach sis_ca = { sizeof(struct sis_softc), sis_probe, sis_attach, NULL, sis_activate }; diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 5af410c8d93..898576a5a2a 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.193 2022/01/09 05:42:54 jsg Exp $ */ +/* $OpenBSD: if_sk.c,v 1.194 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2528,7 +2528,7 @@ sk_stop(struct sk_if_softc *sc_if, int softonly) } } -struct cfattach skc_ca = { +const struct cfattach skc_ca = { sizeof(struct sk_softc), skc_probe, skc_attach, skc_detach, skc_activate }; @@ -2537,7 +2537,7 @@ struct cfdriver skc_cd = { 0, "skc", DV_DULL }; -struct cfattach sk_ca = { +const struct cfattach sk_ca = { sizeof(struct sk_if_softc), sk_probe, sk_attach, sk_detach, sk_activate }; diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index dfb39598b04..d1407e5e904 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.68 2022/02/22 01:15:01 guenther Exp $ */ +/* $OpenBSD: if_ste.c,v 1.69 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. @@ -139,7 +139,7 @@ const struct pci_matchid ste_devices[] = { { PCI_VENDOR_SUNDANCE, PCI_PRODUCT_SUNDANCE_ST201_2 } }; -struct cfattach ste_ca = { +const struct cfattach ste_ca = { sizeof(struct ste_softc), ste_probe, ste_attach }; diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index a574ac2e354..06d0379d459 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_stge.c,v 1.71 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_stge.c,v 1.72 2022/03/11 18:00:48 mpi Exp $ */ /* $NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $ */ /*- @@ -105,7 +105,7 @@ void stge_attach(struct device *, struct device *, void *); int stge_copy_small = 0; -struct cfattach stge_ca = { +const struct cfattach stge_ca = { sizeof(struct stge_softc), stge_match, stge_attach, }; diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c index 8d042da650a..e157acc9bc3 100644 --- a/sys/dev/pci/if_tht.c +++ b/sys/dev/pci/if_tht.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tht.c,v 1.144 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_tht.c,v 1.145 2022/03/11 18:00:48 mpi Exp $ */ /* * Copyright (c) 2007 David Gwynne @@ -403,7 +403,7 @@ int thtc_match(struct device *, void *, void *); void thtc_attach(struct device *, struct device *, void *); int thtc_print(void *, const char *); -struct cfattach thtc_ca = { +const struct cfattach thtc_ca = { sizeof(struct thtc_softc), thtc_match, thtc_attach }; @@ -501,7 +501,7 @@ void tht_attach(struct device *, struct device *, void *); void tht_mountroot(struct device *); int tht_intr(void *); -struct cfattach tht_ca = { +const struct cfattach tht_ca = { sizeof(struct tht_softc), tht_match, tht_attach }; diff --git a/sys/dev/pci/if_ti_pci.c b/sys/dev/pci/if_ti_pci.c index 41f5cea357d..05f6aa9b7fc 100644 --- a/sys/dev/pci/if_ti_pci.c +++ b/sys/dev/pci/if_ti_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti_pci.c,v 1.6 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_ti_pci.c,v 1.7 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -92,7 +92,7 @@ int ti_pci_match(struct device *, void *, void *); void ti_pci_attach(struct device *, struct device *, void *); -struct cfattach ti_pci_ca = { +const struct cfattach ti_pci_ca = { sizeof(struct ti_softc), ti_pci_match, ti_pci_attach }; diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index a4ac9ff85ee..961189859db 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.75 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_tl.c,v 1.76 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 1997, 1998 @@ -2021,7 +2021,7 @@ tl_wait_up(void *xsc) ifq_clr_oactive(&ifp->if_snd); } -struct cfattach tl_ca = { +const struct cfattach tl_ca = { sizeof(struct tl_softc), tl_probe, tl_attach }; diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 0092a1fab20..6d2199cc26b 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.128 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_txp.c,v 1.129 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2001 @@ -114,7 +114,7 @@ void txp_rxbuf_reclaim(struct txp_softc *); void txp_rx_reclaim(struct txp_softc *, struct txp_rx_ring *, struct txp_dma_alloc *); -struct cfattach txp_ca = { +const struct cfattach txp_ca = { sizeof(struct txp_softc), txp_probe, txp_attach, }; diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c index 5581de29d25..e04c40eea99 100644 --- a/sys/dev/pci/if_vge.c +++ b/sys/dev/pci/if_vge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vge.c,v 1.75 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_vge.c,v 1.76 2022/03/11 18:00:50 mpi Exp $ */ /* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -153,7 +153,7 @@ int vge_cam_set (struct vge_softc *, uint8_t *); void vge_iff (struct vge_softc *); void vge_reset (struct vge_softc *); -struct cfattach vge_ca = { +const struct cfattach vge_ca = { sizeof(struct vge_softc), vge_probe, vge_attach, vge_detach }; diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c index 09dc0eefc0c..8a5f9d31d50 100644 --- a/sys/dev/pci/if_vic.c +++ b/sys/dev/pci/if_vic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vic.c,v 1.103 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_vic.c,v 1.104 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2006 Reyk Floeter @@ -305,7 +305,7 @@ struct cfdriver vic_cd = { int vic_match(struct device *, void *, void *); void vic_attach(struct device *, struct device *, void *); -struct cfattach vic_ca = { +const struct cfattach vic_ca = { sizeof(struct vic_softc), vic_match, vic_attach }; diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c index 337b969e73e..3681e1d9b14 100644 --- a/sys/dev/pci/if_vmx.c +++ b/sys/dev/pci/if_vmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vmx.c,v 1.68 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_vmx.c,v 1.69 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2013 Tsubai Masanari @@ -205,7 +205,7 @@ const struct pci_matchid vmx_devices[] = { { PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_NET_3 } }; -struct cfattach vmx_ca = { +const struct cfattach vmx_ca = { sizeof(struct vmxnet3_softc), vmxnet3_match, vmxnet3_attach }; diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index d23fac1c8d2..babef2d86c5 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.158 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_vr.c,v 1.159 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 1997, 1998 @@ -99,7 +99,7 @@ int vr_quirks(struct pci_attach_args *); void vr_attach(struct device *, struct device *, void *); int vr_activate(struct device *, int); -struct cfattach vr_ca = { +const struct cfattach vr_ca = { sizeof(struct vr_softc), vr_probe, vr_attach, NULL, vr_activate }; diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 3d880222d4f..3a32a246324 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vte.c,v 1.24 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_vte.c,v 1.25 2022/03/11 18:00:50 mpi Exp $ */ /*- * Copyright (c) 2010, Pyun YongHyeon * All rights reserved. @@ -103,7 +103,7 @@ const struct pci_matchid vte_devices[] = { { PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6040_ETHER } }; -struct cfattach vte_ca = { +const struct cfattach vte_ca = { sizeof(struct vte_softc), vte_match, vte_attach }; diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index 0c0a8f823ec..f97a229f322 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.73 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: if_wb.c,v 1.74 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1579,7 +1579,7 @@ wb_stop(struct wb_softc *sc) bzero(&sc->wb_ldata->wb_tx_list, sizeof(sc->wb_ldata->wb_tx_list)); } -struct cfattach wb_ca = { +const struct cfattach wb_ca = { sizeof(struct wb_softc), wb_probe, wb_attach }; diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index 884e2016744..85f9f91a858 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.55 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.56 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2001-2003 Todd C. Miller @@ -86,7 +86,7 @@ struct wi_pci_softc { struct wi_softc sc_wi; /* real softc */ }; -struct cfattach wi_pci_ca = { +const struct cfattach wi_pci_ca = { sizeof (struct wi_pci_softc), wi_pci_match, wi_pci_attach, NULL, wi_pci_activate }; diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 9bb01dea924..16ebb12527e 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.155 2020/12/12 11:48:53 jan Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.156 2022/03/11 18:00:50 mpi Exp $ */ /*- * Copyright (c) 2006-2008 @@ -159,7 +159,7 @@ struct cfdriver wpi_cd = { NULL, "wpi", DV_IFNET }; -struct cfattach wpi_ca = { +const struct cfattach wpi_ca = { sizeof (struct wpi_softc), wpi_match, wpi_attach, wpi_detach, wpi_activate }; diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c index cb18ac48a87..ed8cb9955aa 100644 --- a/sys/dev/pci/if_xge.c +++ b/sys/dev/pci/if_xge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xge.c,v 1.81 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: if_xge.c,v 1.82 2022/03/11 18:00:50 mpi Exp $ */ /* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */ /* @@ -328,7 +328,7 @@ pif_wkey(struct xge_softc *sc, bus_size_t csr, uint64_t val) #endif } -struct cfattach xge_ca = { +const struct cfattach xge_ca = { sizeof(struct xge_softc), xge_match, xge_attach }; diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c index 9e8e610e47c..963e1984c34 100644 --- a/sys/dev/pci/if_xl_pci.c +++ b/sys/dev/pci/if_xl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_pci.c,v 1.47 2022/02/22 01:15:01 guenther Exp $ */ +/* $OpenBSD: if_xl_pci.c,v 1.48 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -95,7 +95,7 @@ struct xl_pci_softc { bus_size_t psc_funsize; }; -struct cfattach xl_pci_ca = { +const struct cfattach xl_pci_ca = { sizeof(struct xl_pci_softc), xl_pci_match, xl_pci_attach, xl_pci_detach, xl_activate }; diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c index 45acc63e876..85d36239f45 100644 --- a/sys/dev/pci/iha_pci.c +++ b/sys/dev/pci/iha_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha_pci.c,v 1.19 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: iha_pci.c,v 1.20 2022/03/11 18:00:50 mpi Exp $ */ /*------------------------------------------------------------------------- * * Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller. @@ -47,7 +47,7 @@ int iha_pci_probe(struct device *, void *, void *); void iha_pci_attach(struct device *, struct device *, void *); -struct cfattach iha_pci_ca = { +const struct cfattach iha_pci_ca = { sizeof(struct iha_softc), iha_pci_probe, iha_pci_attach }; diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index 925a283b26f..d7ac758016c 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.133 2020/10/15 13:22:13 krw Exp $ */ +/* $OpenBSD: ips.c,v 1.134 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko @@ -483,7 +483,7 @@ void ips_ccb_put(void *, void *); int ips_dmamem_alloc(struct dmamem *, bus_dma_tag_t, bus_size_t); void ips_dmamem_free(struct dmamem *); -struct cfattach ips_ca = { +const struct cfattach ips_ca = { sizeof(struct ips_softc), ips_match, ips_attach diff --git a/sys/dev/pci/itherm.c b/sys/dev/pci/itherm.c index 20132981137..1d4b9b308ec 100644 --- a/sys/dev/pci/itherm.c +++ b/sys/dev/pci/itherm.c @@ -106,7 +106,7 @@ struct cfdriver itherm_cd = { NULL, "itherm", DV_DULL }; -struct cfattach itherm_ca = { +const struct cfattach itherm_ca = { sizeof(struct itherm_softc), itherm_probe, itherm_attach, NULL, itherm_activate }; diff --git a/sys/dev/pci/jmb.c b/sys/dev/pci/jmb.c index 6e4d5d7b879..b75f9250c13 100644 --- a/sys/dev/pci/jmb.c +++ b/sys/dev/pci/jmb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jmb.c,v 1.9 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: jmb.c,v 1.10 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2007 David Gwynne @@ -70,7 +70,7 @@ struct jmb_softc { struct device sc_dev; }; -struct cfattach jmb_ca = { +const struct cfattach jmb_ca = { sizeof(struct jmb_softc), jmb_match, jmb_attach, diff --git a/sys/dev/pci/kate.c b/sys/dev/pci/kate.c index 79648ce08d6..2bf8b92a881 100644 --- a/sys/dev/pci/kate.c +++ b/sys/dev/pci/kate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kate.c,v 1.7 2020/01/04 01:34:24 jsg Exp $ */ +/* $OpenBSD: kate.c,v 1.8 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2008 Constantine A. Murenin @@ -80,7 +80,7 @@ int kate_match(struct device *, void *, void *); void kate_attach(struct device *, struct device *, void *); void kate_refresh(void *); -struct cfattach kate_ca = { +const struct cfattach kate_ca = { sizeof(struct kate_softc), kate_match, kate_attach }; diff --git a/sys/dev/pci/km.c b/sys/dev/pci/km.c index e4dc23ce579..47a78fa0e29 100644 --- a/sys/dev/pci/km.c +++ b/sys/dev/pci/km.c @@ -1,4 +1,4 @@ -/* $OpenBSD: km.c,v 1.13 2020/01/05 01:07:58 jsg Exp $ */ +/* $OpenBSD: km.c,v 1.14 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2008 Constantine A. Murenin @@ -58,7 +58,7 @@ int km_match(struct device *, void *, void *); void km_attach(struct device *, struct device *, void *); void km_refresh(void *); -struct cfattach km_ca = { +const struct cfattach km_ca = { sizeof(struct km_softc), km_match, km_attach }; diff --git a/sys/dev/pci/ksmn.c b/sys/dev/pci/ksmn.c index a9a639282be..967f75fccb8 100644 --- a/sys/dev/pci/ksmn.c +++ b/sys/dev/pci/ksmn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ksmn.c,v 1.5 2021/07/20 18:33:59 jcs Exp $ */ +/* $OpenBSD: ksmn.c,v 1.6 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2019 Bryan Steele @@ -84,7 +84,7 @@ int ksmn_match(struct device *, void *, void *); void ksmn_attach(struct device *, struct device *, void *); void ksmn_refresh(void *); -struct cfattach ksmn_ca = { +const struct cfattach ksmn_ca = { sizeof(struct ksmn_softc), ksmn_match, ksmn_attach }; diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index c5e6692bd9b..19bc93c07b3 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.44 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: maestro.c,v 1.45 2022/03/11 18:00:50 mpi Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -522,7 +522,7 @@ struct cfdriver maestro_cd = { NULL, "maestro", DV_DULL }; -struct cfattach maestro_ca = { +const struct cfattach maestro_ca = { sizeof (struct maestro_softc), maestro_match, maestro_attach, NULL, maestro_activate }; diff --git a/sys/dev/pci/mbg.c b/sys/dev/pci/mbg.c index c6717a6e3e2..be7bff2d5d1 100644 --- a/sys/dev/pci/mbg.c +++ b/sys/dev/pci/mbg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mbg.c,v 1.32 2020/12/06 19:23:11 cheloha Exp $ */ +/* $OpenBSD: mbg.c,v 1.33 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2006, 2007 Marc Balmer @@ -147,7 +147,7 @@ int mbg_read_asic(struct mbg_softc *, int cmd, char *buf, size_t len, struct timespec *tstamp); void mbg_timeout(void *); -struct cfattach mbg_ca = { +const struct cfattach mbg_ca = { sizeof(struct mbg_softc), mbg_probe, mbg_attach }; diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index d084db811b1..18ea6f5e77b 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi_pci.c,v 1.30 2019/12/31 00:00:09 deraadt Exp $ */ +/* $OpenBSD: mfi_pci.c,v 1.31 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2006 Marco Peereboom * @@ -44,7 +44,7 @@ int mfi_pci_match(struct device *, void *, void *); void mfi_pci_attach(struct device *, struct device *, void *); -struct cfattach mfi_pci_ca = { +const struct cfattach mfi_pci_ca = { sizeof(struct mfi_softc), mfi_pci_match, mfi_pci_attach }; diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c index bd403813001..ecfba52edc8 100644 --- a/sys/dev/pci/mfii.c +++ b/sys/dev/pci/mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfii.c,v 1.83 2020/12/15 03:05:31 dlg Exp $ */ +/* $OpenBSD: mfii.c,v 1.84 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2012 David Gwynne @@ -363,7 +363,7 @@ void mfii_attach(struct device *, struct device *, void *); int mfii_detach(struct device *, int); int mfii_activate(struct device *, int); -struct cfattach mfii_ca = { +const struct cfattach mfii_ca = { sizeof(struct mfii_softc), mfii_match, mfii_attach, diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c index 0b83c978813..26db845681d 100644 --- a/sys/dev/pci/mmuagp.c +++ b/sys/dev/pci/mmuagp.c @@ -117,7 +117,7 @@ struct mmuagp_softc { int n_mctrl; }; -struct cfattach mmuagp_ca = { +const struct cfattach mmuagp_ca = { sizeof(struct mmuagp_softc), mmuagp_probe, mmuagp_attach }; diff --git a/sys/dev/pci/mpi_pci.c b/sys/dev/pci/mpi_pci.c index ac017549fe9..b44a46e7537 100644 --- a/sys/dev/pci/mpi_pci.c +++ b/sys/dev/pci/mpi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi_pci.c,v 1.25 2014/09/15 12:00:04 dlg Exp $ */ +/* $OpenBSD: mpi_pci.c,v 1.26 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -56,7 +56,7 @@ struct mpi_pci_softc { void *psc_ih; }; -struct cfattach mpi_pci_ca = { +const struct cfattach mpi_pci_ca = { sizeof(struct mpi_pci_softc), mpi_pci_match, mpi_pci_attach, mpi_pci_detach }; diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 84397b84eaf..abf59e1460e 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.141 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: mpii.c,v 1.142 2022/03/11 18:00:50 mpi Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov * Copyright (c) 2009 James Giannoules @@ -248,7 +248,7 @@ int mpii_detach(struct device *, int); int mpii_intr(void *); -struct cfattach mpii_ca = { +const struct cfattach mpii_ca = { sizeof(struct mpii_softc), mpii_match, mpii_attach, diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index b01986863c6..aed3bc2e771 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neo.c,v 1.35 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: neo.c,v 1.36 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 1999 Cameron Grant @@ -207,7 +207,7 @@ struct cfdriver neo_cd = { }; -struct cfattach neo_ca = { +const struct cfattach neo_ca = { sizeof(struct neo_softc), neo_match, neo_attach, NULL, neo_activate }; diff --git a/sys/dev/pci/nviic.c b/sys/dev/pci/nviic.c index 590bc176432..8de553ab52d 100644 --- a/sys/dev/pci/nviic.c +++ b/sys/dev/pci/nviic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nviic.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: nviic.c,v 1.18 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -93,7 +93,7 @@ struct nviic_softc { struct nviic_controller sc_nc[NVIIC_NBUS]; }; -struct cfattach nviic_ca = { +const struct cfattach nviic_ca = { sizeof(struct nviic_softc), nviic_match, nviic_attach }; diff --git a/sys/dev/pci/nvme_pci.c b/sys/dev/pci/nvme_pci.c index 5c22db98a07..3dfdf955a3c 100644 --- a/sys/dev/pci/nvme_pci.c +++ b/sys/dev/pci/nvme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme_pci.c,v 1.9 2021/05/31 04:13:42 dlg Exp $ */ +/* $OpenBSD: nvme_pci.c,v 1.10 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2014 David Gwynne @@ -52,7 +52,7 @@ void nvme_pci_attach(struct device *, struct device *, void *); int nvme_pci_detach(struct device *, int); int nvme_pci_activate(struct device *, int); -struct cfattach nvme_pci_ca = { +const struct cfattach nvme_pci_ca = { sizeof(struct nvme_pci_softc), nvme_pci_match, nvme_pci_attach, diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index 274183392dc..d132b45ae78 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_pci.c,v 1.41 2019/01/07 03:41:06 dlg Exp $ */ +/* $OpenBSD: ohci_pci.c,v 1.42 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: ohci_pci.c,v 1.23 2002/10/02 16:51:47 thorpej Exp $ */ /* @@ -68,7 +68,7 @@ struct ohci_pci_softc { void *sc_ih; /* interrupt vectoring */ }; -struct cfattach ohci_pci_ca = { +const struct cfattach ohci_pci_ca = { sizeof(struct ohci_pci_softc), ohci_pci_match, ohci_pci_attach, ohci_pci_detach, ohci_activate }; diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index fc160ded24d..681e35a51cd 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.102 2022/02/02 03:48:48 jsg Exp $ */ +/* $OpenBSD: pccbb.c,v 1.103 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */ /* @@ -176,7 +176,7 @@ void cb_show_regs(pci_chipset_tag_t, pcitag_t, bus_space_tag_t, bus_space_handle_t memh); #endif -struct cfattach cbb_pci_ca = { +const struct cfattach cbb_pci_ca = { sizeof(struct pccbb_softc), pcicbbmatch, pccbbattach, NULL, pccbbactivate }; diff --git a/sys/dev/pci/pchtemp.c b/sys/dev/pci/pchtemp.c index f3e03865f2f..59c95c4d842 100644 --- a/sys/dev/pci/pchtemp.c +++ b/sys/dev/pci/pchtemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchtemp.c,v 1.6 2020/10/07 11:19:28 jsg Exp $ */ +/* $OpenBSD: pchtemp.c,v 1.7 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2015 Mark Kettenis * @@ -54,7 +54,7 @@ struct cfdriver pchtemp_cd = { NULL, "pchtemp", DV_DULL }; -struct cfattach pchtemp_ca = { +const struct cfattach pchtemp_ca = { sizeof(struct pchtemp_softc), pchtemp_match, pchtemp_attach }; diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 7ca542c29fe..2e5da270960 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.123 2022/01/05 16:46:11 deraadt Exp $ */ +/* $OpenBSD: pci.c,v 1.124 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -85,7 +85,7 @@ struct pci_dev { extern int allowaperture; #endif -struct cfattach pci_ca = { +const struct cfattach pci_ca = { sizeof(struct pci_softc), pcimatch, pciattach, pcidetach, pciactivate }; diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 691fe5d87ef..53af79c8bb7 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.362 2022/01/09 05:42:58 jsg Exp $ */ +/* $OpenBSD: pciide.c,v 1.363 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -1403,12 +1403,12 @@ void pciide_attach(struct device *, struct device *, void *); int pciide_detach(struct device *, int); int pciide_activate(struct device *, int); -struct cfattach pciide_pci_ca = { +const struct cfattach pciide_pci_ca = { sizeof(struct pciide_softc), pciide_match, pciide_attach, pciide_detach, pciide_activate }; -struct cfattach pciide_jmb_ca = { +const struct cfattach pciide_jmb_ca = { sizeof(struct pciide_softc), pciide_match, pciide_attach, pciide_detach, pciide_activate }; diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index dd6f0378ec9..f1e862802ae 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcscp.c,v 1.20 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: pcscp.c,v 1.21 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: pcscp.c,v 1.26 2003/10/19 10:25:42 tsutsui Exp $ */ /*- @@ -95,7 +95,7 @@ struct pcscp_softc { int pcscp_match(struct device *, void *, void *); void pcscp_attach(struct device *, struct device *, void *); -struct cfattach pcscp_ca = { +const struct cfattach pcscp_ca = { sizeof(struct pcscp_softc), pcscp_match, pcscp_attach }; diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c index 3df14cab5f7..fa58f748c41 100644 --- a/sys/dev/pci/piixpm.c +++ b/sys/dev/pci/piixpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: piixpm.c,v 1.42 2020/01/21 06:37:24 claudio Exp $ */ +/* $OpenBSD: piixpm.c,v 1.43 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2005, 2006 Alexander Yurchenko @@ -83,7 +83,7 @@ int piixpm_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t, int piixpm_intr(void *); -struct cfattach piixpm_ca = { +const struct cfattach piixpm_ca = { sizeof(struct piixpm_softc), piixpm_match, piixpm_attach diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index bc008f3f3c5..ffbef378e50 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppb.c,v 1.69 2022/01/05 18:54:20 kettenis Exp $ */ +/* $OpenBSD: ppb.c,v 1.70 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -108,7 +108,7 @@ void ppbattach(struct device *, struct device *, void *); int ppbdetach(struct device *self, int flags); int ppbactivate(struct device *self, int act); -struct cfattach ppb_ca = { +const struct cfattach ppb_ca = { sizeof(struct ppb_softc), ppbmatch, ppbattach, ppbdetach, ppbactivate }; diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index df680dae7af..4c7b415137c 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: puc.c,v 1.30 2020/08/14 18:14:11 jcs Exp $ */ +/* $OpenBSD: puc.c,v 1.31 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $ */ /* @@ -83,7 +83,7 @@ void *puc_pci_intr_establish(struct puc_attach_args *, int, int (*)(void *), void *, char *); int puc_pci_xr17v35x_intr(void *arg); -struct cfattach puc_pci_ca = { +const struct cfattach puc_pci_ca = { sizeof(struct puc_pci_softc), puc_pci_match, puc_pci_attach, puc_pci_detach }; diff --git a/sys/dev/pci/pwdog.c b/sys/dev/pci/pwdog.c index 6c8e990d120..12e30bbf36e 100644 --- a/sys/dev/pci/pwdog.c +++ b/sys/dev/pci/pwdog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwdog.c,v 1.11 2020/11/29 03:17:27 kevlo Exp $ */ +/* $OpenBSD: pwdog.c,v 1.12 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2006 Marc Balmer @@ -42,7 +42,7 @@ void pwdog_attach(struct device *, struct device *, void *); int pwdog_activate(struct device *, int); int pwdog_set_timeout(void *, int); -struct cfattach pwdog_ca = { +const struct cfattach pwdog_ca = { sizeof(struct pwdog_softc), pwdog_probe, pwdog_attach, NULL, pwdog_activate }; diff --git a/sys/dev/pci/qla_pci.c b/sys/dev/pci/qla_pci.c index 0a348a29047..4102f6c97c3 100644 --- a/sys/dev/pci/qla_pci.c +++ b/sys/dev/pci/qla_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla_pci.c,v 1.8 2014/04/03 20:01:47 brad Exp $ */ +/* $OpenBSD: qla_pci.c,v 1.9 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2011 David Gwynne @@ -59,7 +59,7 @@ struct qla_pci_softc { void *psc_ih; }; -struct cfattach qla_pci_ca = { +const struct cfattach qla_pci_ca = { sizeof(struct qla_pci_softc), qla_pci_match, qla_pci_attach diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index 0c83be39e6b..1029a72edcc 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.61 2020/09/22 19:32:53 krw Exp $ */ +/* $OpenBSD: qle.c,v 1.62 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew @@ -235,7 +235,7 @@ int qle_match(struct device *, void *, void *); void qle_attach(struct device *, struct device *, void *); int qle_detach(struct device *, int); -struct cfattach qle_ca = { +const struct cfattach qle_ca = { sizeof(struct qle_softc), qle_match, qle_attach, diff --git a/sys/dev/pci/qlw_pci.c b/sys/dev/pci/qlw_pci.c index e61e28d61d1..e1e4c5564f4 100644 --- a/sys/dev/pci/qlw_pci.c +++ b/sys/dev/pci/qlw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw_pci.c,v 1.11 2021/05/01 16:11:16 visa Exp $ */ +/* $OpenBSD: qlw_pci.c,v 1.12 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2011 David Gwynne @@ -66,7 +66,7 @@ struct qlw_pci_softc { void *psc_ih; }; -struct cfattach qlw_pci_ca = { +const struct cfattach qlw_pci_ca = { sizeof(struct qlw_pci_softc), qlw_pci_match, qlw_pci_attach diff --git a/sys/dev/pci/rtsx_pci.c b/sys/dev/pci/rtsx_pci.c index 7459c5fced6..39058b7c553 100644 --- a/sys/dev/pci/rtsx_pci.c +++ b/sys/dev/pci/rtsx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsx_pci.c,v 1.14 2017/09/06 13:07:38 jcs Exp $ */ +/* $OpenBSD: rtsx_pci.c,v 1.15 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler @@ -38,7 +38,7 @@ struct rtsx_pci_softc { int rtsx_pci_match(struct device *, void *, void *); void rtsx_pci_attach(struct device *, struct device *, void *); -struct cfattach rtsx_pci_ca = { +const struct cfattach rtsx_pci_ca = { sizeof(struct rtsx_pci_softc), rtsx_pci_match, rtsx_pci_attach, NULL, rtsx_activate }; diff --git a/sys/dev/pci/sdhc_pci.c b/sys/dev/pci/sdhc_pci.c index de582ccd79a..544928674e6 100644 --- a/sys/dev/pci/sdhc_pci.c +++ b/sys/dev/pci/sdhc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdhc_pci.c,v 1.23 2022/01/18 11:36:21 patrick Exp $ */ +/* $OpenBSD: sdhc_pci.c,v 1.24 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler @@ -62,7 +62,7 @@ void sdhc_pci_conf_write(pci_chipset_tag_t, pcitag_t, int, uint8_t); void sdhc_takecontroller(struct pci_attach_args *); void sdhc_ricohfix(struct sdhc_pci_softc *); -struct cfattach sdhc_pci_ca = { +const struct cfattach sdhc_pci_ca = { sizeof(struct sdhc_pci_softc), sdhc_pci_match, sdhc_pci_attach, NULL, sdhc_pci_activate }; diff --git a/sys/dev/pci/sili_pci.c b/sys/dev/pci/sili_pci.c index 00e1865de4b..ac4eb61b89f 100644 --- a/sys/dev/pci/sili_pci.c +++ b/sys/dev/pci/sili_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sili_pci.c,v 1.14 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: sili_pci.c,v 1.15 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2007 David Gwynne @@ -48,7 +48,7 @@ struct sili_pci_softc { void *psc_ih; }; -struct cfattach sili_pci_ca = { +const struct cfattach sili_pci_ca = { sizeof(struct sili_pci_softc), sili_pci_match, sili_pci_attach, diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c index 10ea753c64d..e3bae243be2 100644 --- a/sys/dev/pci/siop_pci.c +++ b/sys/dev/pci/siop_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_pci.c,v 1.7 2010/07/23 07:47:13 jsg Exp $ */ +/* $OpenBSD: siop_pci.c,v 1.8 2022/03/11 18:00:51 mpi Exp $ */ /* $NetBSD: siop_pci.c,v 1.18 2005/06/28 00:28:42 thorpej Exp $ */ /* @@ -50,7 +50,7 @@ struct siop_pci_softc { struct siop_pci_common_softc siop_pci; }; -struct cfattach siop_pci_ca = { +const struct cfattach siop_pci_ca = { sizeof(struct siop_pci_softc), siop_pci_match, siop_pci_attach }; diff --git a/sys/dev/pci/sti_pci.c b/sys/dev/pci/sti_pci.c index 5d6f09e9934..8983e48aa8a 100644 --- a/sys/dev/pci/sti_pci.c +++ b/sys/dev/pci/sti_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti_pci.c,v 1.8 2014/08/30 14:42:05 miod Exp $ */ +/* $OpenBSD: sti_pci.c,v 1.9 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 2006, 2007 Miodrag Vallat. @@ -42,7 +42,7 @@ struct sti_pci_softc { bus_space_handle_t sc_romh; }; -struct cfattach sti_pci_ca = { +const struct cfattach sti_pci_ca = { sizeof(struct sti_pci_softc), sti_pci_match, sti_pci_attach }; diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index d402785fc2e..15ddfcbd617 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.38 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: sv.c,v 1.39 2022/03/11 18:00:51 mpi Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -118,7 +118,7 @@ struct sv_softc { }; -struct cfattach sv_ca = { +const struct cfattach sv_ca = { sizeof(struct sv_softc), sv_match, sv_attach }; diff --git a/sys/dev/pci/tcpcib.c b/sys/dev/pci/tcpcib.c index c9f54d8b3f4..829341fe038 100644 --- a/sys/dev/pci/tcpcib.c +++ b/sys/dev/pci/tcpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpcib.c,v 1.8 2014/12/10 12:27:57 mikeb Exp $ */ +/* $OpenBSD: tcpcib.c,v 1.9 2022/03/11 18:00:52 mpi Exp $ */ /* * Copyright (c) 2012 Matt Dainty @@ -106,7 +106,7 @@ void tcpcib_wdt_stop(struct tcpcib_softc *); u_int tcpcib_hpet_get_timecount(struct timecounter *tc); -struct cfattach tcpcib_ca = { +const struct cfattach tcpcib_ca = { sizeof(struct tcpcib_softc), tcpcib_match, tcpcib_attach, NULL, tcpcib_activate }; diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index e3342b87420..8711c16ab87 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.41 2022/01/09 05:42:58 jsg Exp $ */ +/* $OpenBSD: tga.c,v 1.42 2022/03/11 18:00:52 mpi Exp $ */ /* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */ /* @@ -74,7 +74,7 @@ struct cfdriver tga_cd = { NULL, "tga", DV_DULL }; -struct cfattach tga_ca = { +const struct cfattach tga_ca = { sizeof(struct tga_softc), (cfmatch_t)tgamatch, tgaattach, }; diff --git a/sys/dev/pci/twe_pci.c b/sys/dev/pci/twe_pci.c index dd53ac51957..01f3f021944 100644 --- a/sys/dev/pci/twe_pci.c +++ b/sys/dev/pci/twe_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe_pci.c,v 1.14 2021/03/05 12:40:13 jsg Exp $ */ +/* $OpenBSD: twe_pci.c,v 1.15 2022/03/11 18:00:52 mpi Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -49,7 +49,7 @@ int twe_pci_match(struct device *, void *, void *); void twe_pci_attach(struct device *, struct device *, void *); -struct cfattach twe_pci_ca = { +const struct cfattach twe_pci_ca = { sizeof(struct twe_softc), twe_pci_match, twe_pci_attach }; diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index eef57159447..1142f302255 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci_pci.c,v 1.34 2019/09/05 17:59:12 bluhm Exp $ */ +/* $OpenBSD: uhci_pci.c,v 1.35 2022/03/11 18:00:52 mpi Exp $ */ /* $NetBSD: uhci_pci.c,v 1.24 2002/10/02 16:51:58 thorpej Exp $ */ /* @@ -63,7 +63,7 @@ struct uhci_pci_softc { void *sc_ih; /* interrupt vectoring */ }; -struct cfattach uhci_pci_ca = { +const struct cfattach uhci_pci_ca = { sizeof(struct uhci_pci_softc), uhci_pci_match, uhci_pci_attach, uhci_pci_detach, uhci_pci_activate }; diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index fedbf9df765..1e55723a5ab 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pci.c,v 1.89 2022/01/09 05:42:58 jsg Exp $ */ +/* $OpenBSD: vga_pci.c,v 1.90 2022/03/11 18:00:52 mpi Exp $ */ /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */ /* @@ -103,7 +103,7 @@ void vga_save_state(struct vga_pci_softc *); void vga_restore_state(struct vga_pci_softc *); #endif -struct cfattach vga_pci_ca = { +const struct cfattach vga_pci_ca = { sizeof(struct vga_pci_softc), vga_pci_match, vga_pci_attach, NULL, vga_pci_activate }; diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c index 14485edb1de..a1c1c0f4403 100644 --- a/sys/dev/pci/viapm.c +++ b/sys/dev/pci/viapm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viapm.c,v 1.20 2021/02/23 04:44:31 cheloha Exp $ */ +/* $OpenBSD: viapm.c,v 1.21 2022/03/11 18:00:52 mpi Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -226,7 +226,7 @@ long val_to_uV(unsigned int, int); void viapm_refresh_sensor_data(struct viapm_softc *); void viapm_refresh(void *); -struct cfattach viapm_ca = { +const struct cfattach viapm_ca = { sizeof(struct viapm_softc), viapm_match, viapm_attach }; diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c index c3b1f2275b1..6f04c410f52 100644 --- a/sys/dev/pci/virtio_pci.c +++ b/sys/dev/pci/virtio_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio_pci.c,v 1.30 2021/09/03 14:04:35 patrick Exp $ */ +/* $OpenBSD: virtio_pci.c,v 1.31 2022/03/11 18:00:52 mpi Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -136,7 +136,7 @@ struct virtio_pci_softc { enum irq_type sc_irq_type; }; -struct cfattach virtio_pci_ca = { +const struct cfattach virtio_pci_ca = { sizeof(struct virtio_pci_softc), virtio_pci_match, virtio_pci_attach, diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c index d7eafb63898..bfdb63512c9 100644 --- a/sys/dev/pci/vmwpvs.c +++ b/sys/dev/pci/vmwpvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmwpvs.c,v 1.25 2022/02/21 11:20:34 jsg Exp $ */ +/* $OpenBSD: vmwpvs.c,v 1.26 2022/03/11 18:00:52 mpi Exp $ */ /* * Copyright (c) 2013 David Gwynne @@ -339,7 +339,7 @@ int vmwpvs_intr(void *); #define vmwpvs_barrier(_s, _r, _l, _d) \ bus_space_barrier((_s)->sc_iot, (_s)->sc_ioh, (_r), (_l), (_d)) -struct cfattach vmwpvs_ca = { +const struct cfattach vmwpvs_ca = { sizeof(struct vmwpvs_softc), vmwpvs_match, vmwpvs_attach, diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c index 180dc64c003..c785979fcce 100644 --- a/sys/dev/pci/wdt.c +++ b/sys/dev/pci/wdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdt.c,v 1.25 2020/11/29 03:17:27 kevlo Exp $ */ +/* $OpenBSD: wdt.c,v 1.26 2022/03/11 18:00:52 mpi Exp $ */ /*- * Copyright (c) 1998,1999 Alex Nash @@ -63,7 +63,7 @@ void wdt_buzzer_off(struct wdt_softc *); void wdt_timer_disable(struct wdt_softc *); void wdt_buzzer_enable(struct wdt_softc *); -struct cfattach wdt_ca = { +const struct cfattach wdt_ca = { sizeof(struct wdt_softc), wdt_probe, wdt_attach, NULL, wdt_activate }; diff --git a/sys/dev/pci/xhci_pci.c b/sys/dev/pci/xhci_pci.c index fa3271b0d30..88bdf66dbd7 100644 --- a/sys/dev/pci/xhci_pci.c +++ b/sys/dev/pci/xhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xhci_pci.c,v 1.10 2018/11/18 08:46:57 jmatthew Exp $ */ +/* $OpenBSD: xhci_pci.c,v 1.11 2022/03/11 18:00:52 mpi Exp $ */ /* * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ int xhci_pci_detach(struct device *, int); int xhci_pci_activate(struct device *, int); void xhci_pci_takecontroller(struct xhci_pci_softc *, int); -struct cfattach xhci_pci_ca = { +const struct cfattach xhci_pci_ca = { sizeof(struct xhci_pci_softc), xhci_pci_match, xhci_pci_attach, xhci_pci_detach, xhci_pci_activate }; diff --git a/sys/dev/pci/xspd.c b/sys/dev/pci/xspd.c index c7a17c9f803..6d4098df1e6 100644 --- a/sys/dev/pci/xspd.c +++ b/sys/dev/pci/xspd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xspd.c,v 1.6 2017/07/18 11:42:51 mikeb Exp $ */ +/* $OpenBSD: xspd.c,v 1.7 2022/03/11 18:00:52 mpi Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -46,7 +46,7 @@ struct cfdriver xspd_cd = { NULL, "xspd", DV_DULL }; -struct cfattach xspd_ca = { +const struct cfattach xspd_ca = { sizeof(struct xspd_softc), xspd_match, xspd_attach, NULL, NULL }; diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 84fd5d8805b..91eb5a4faff 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.57 2022/02/16 06:21:19 anton Exp $ */ +/* $OpenBSD: yds.c,v 1.58 2022/03/11 18:00:52 mpi Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -141,7 +141,7 @@ void YWRITE4(struct yds_softc *sc,bus_size_t r,u_int32_t x) #define YWRITEREGION4(sc, r, x, c) \ bus_space_write_region_4((sc)->memt, (sc)->memh, (r), (x), (c) / 4) -struct cfattach yds_ca = { +const struct cfattach yds_ca = { sizeof(struct yds_softc), yds_match, yds_attach, NULL, yds_activate }; -- 2.20.1