diff options
Diffstat (limited to 'sys')
46 files changed, 53 insertions, 49 deletions
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c index cceed8a..583d1ab 100644 --- a/sys/arm/at91/at91.c +++ b/sys/arm/at91/at91.c @@ -232,8 +232,7 @@ at91_probe(device_t dev) { device_set_desc(dev, "AT91 device bus"); - arm_post_filter = at91_eoi; - return (0); + return (BUS_PROBE_NOWILDCARD); } static void @@ -262,6 +261,8 @@ at91_attach(device_t dev) const struct arm_devmap_entry *pdevmap; int i; + arm_post_filter = at91_eoi; + at91_softc = sc; sc->sc_st = &at91_bs_tag; sc->sc_sh = AT91_BASE; diff --git a/sys/arm/econa/econa.c b/sys/arm/econa/econa.c index 9f29a7f..f9492b6 100644 --- a/sys/arm/econa/econa.c +++ b/sys/arm/econa/econa.c @@ -172,7 +172,7 @@ econa_probe(device_t dev) { device_set_desc(dev, "ECONA device bus"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/arm/s3c2xx0/s3c24x0.c b/sys/arm/s3c2xx0/s3c24x0.c index f90c15d..14e6f82 100644 --- a/sys/arm/s3c2xx0/s3c24x0.c +++ b/sys/arm/s3c2xx0/s3c24x0.c @@ -429,7 +429,7 @@ s3c24x0_identify(driver_t *driver, device_t parent) int s3c24x0_probe(device_t dev) { - return 0; + return (BUS_PROBE_NOWILDCARD); } int diff --git a/sys/arm/sa11x0/sa11x0.c b/sys/arm/sa11x0/sa11x0.c index cae7873..975c08d 100644 --- a/sys/arm/sa11x0/sa11x0.c +++ b/sys/arm/sa11x0/sa11x0.c @@ -139,7 +139,7 @@ extern vm_offset_t saipic_base; int sa11x0_probe(device_t dev) { - return 0; + return (BUS_PROBE_NOWILDCARD); } void diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c index f43f8e4..72300f1 100644 --- a/sys/arm/xscale/i80321/iq80321.c +++ b/sys/arm/xscale/i80321/iq80321.c @@ -72,7 +72,7 @@ int iq80321_probe(device_t dev) { device_set_desc(dev, "Intel 80321"); - return (0); + return (BUS_PROBE_NOWILDCARD); } void diff --git a/sys/arm/xscale/pxa/pxa_obio.c b/sys/arm/xscale/pxa/pxa_obio.c index 5cbb9c3..8b35910 100644 --- a/sys/arm/xscale/pxa/pxa_obio.c +++ b/sys/arm/xscale/pxa/pxa_obio.c @@ -92,7 +92,7 @@ pxa_probe(device_t dev) { device_set_desc(dev, "XScale PXA On-board IO"); - return (0); + return (BUS_PROBE_NOWILDCARD); } int diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 5bf393d..dee0c46 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -431,7 +431,7 @@ acpi_probe(device_t dev) device_set_desc(dev, acpi_desc); - return_VALUE (0); + return_VALUE (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/altera/atse/if_atse_nexus.c b/sys/dev/altera/atse/if_atse_nexus.c index 392e5b6..3b33e9e 100644 --- a/sys/dev/altera/atse/if_atse_nexus.c +++ b/sys/dev/altera/atse/if_atse_nexus.c @@ -129,7 +129,7 @@ atse_probe_nexus(device_t dev) /* Success. */ device_set_desc(dev, "Altera Triple-Speed Ethernet MegaCore"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c index d0e4f9b..45e263c 100644 --- a/sys/dev/altera/avgen/altera_avgen_nexus.c +++ b/sys/dev/altera/avgen/altera_avgen_nexus.c @@ -58,7 +58,7 @@ altera_avgen_nexus_probe(device_t dev) { device_set_desc(dev, "Generic Altera Avalon device attachment"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c index 2fe772a..ff954fd 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c @@ -62,7 +62,7 @@ altera_jtag_uart_nexus_probe(device_t dev) { device_set_desc(dev, "Altera JTAG UART"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c index 88abe1f..bd5c6b8 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c +++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c @@ -62,7 +62,7 @@ altera_sdcard_nexus_probe(device_t dev) { device_set_desc(dev, "Altera Secure Data Card IP Core"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/cfe/cfe_resource.c b/sys/dev/cfe/cfe_resource.c index 125fe6c..02581fc 100644 --- a/sys/dev/cfe/cfe_resource.c +++ b/sys/dev/cfe/cfe_resource.c @@ -61,7 +61,7 @@ static int cferes_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/gxemul/disk/gxemul_disk.c b/sys/dev/gxemul/disk/gxemul_disk.c index 3b7e649..7671784 100644 --- a/sys/dev/gxemul/disk/gxemul_disk.c +++ b/sys/dev/gxemul/disk/gxemul_disk.c @@ -158,7 +158,7 @@ gxemul_disk_probe(device_t dev) { device_set_desc(dev, "GXemul test disk"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/dev/gxemul/ether/if_gx.c b/sys/dev/gxemul/ether/if_gx.c index 321882f..647f021 100644 --- a/sys/dev/gxemul/ether/if_gx.c +++ b/sys/dev/gxemul/ether/if_gx.c @@ -125,7 +125,7 @@ gx_probe(device_t dev) device_set_desc(dev, "GXemul test Ethernet"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c index 7f1647b..ca28fd5 100644 --- a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c +++ b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c @@ -313,7 +313,7 @@ vmbus_probe(device_t dev) { device_set_desc(dev, "Vmbus Devices"); - return (0); + return (BUS_PROBE_NOWILDCARD); } /** diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c index ce2b7a9..311c5e9 100644 --- a/sys/dev/rt/if_rt.c +++ b/sys/dev/rt/if_rt.c @@ -148,7 +148,7 @@ static int rt_probe(device_t dev) { device_set_desc(dev, "Ralink RT305XF onChip Ethernet MAC"); - return (0); + return (BUS_PROBE_NOWILDCARD); } /* diff --git a/sys/dev/terasic/de4led/terasic_de4led_nexus.c b/sys/dev/terasic/de4led/terasic_de4led_nexus.c index 870d412..a8eb5f1 100644 --- a/sys/dev/terasic/de4led/terasic_de4led_nexus.c +++ b/sys/dev/terasic/de4led/terasic_de4led_nexus.c @@ -58,7 +58,7 @@ terasic_de4led_nexus_probe(device_t dev) { device_set_desc(dev, "Terasic DE4 8-element LED"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/terasic/mtl/terasic_mtl_nexus.c b/sys/dev/terasic/mtl/terasic_mtl_nexus.c index 2dff7db..b1d13db 100644 --- a/sys/dev/terasic/mtl/terasic_mtl_nexus.c +++ b/sys/dev/terasic/mtl/terasic_mtl_nexus.c @@ -55,7 +55,7 @@ terasic_mtl_nexus_probe(device_t dev) { device_set_desc(dev, "Terasic Multi-touch LCD (MTL)"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c index 52f5fe1..dfabd70 100644 --- a/sys/dev/xen/console/console.c +++ b/sys/dev/xen/console/console.c @@ -226,7 +226,7 @@ static int xc_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/dev/xen/pcifront/pcifront.c b/sys/dev/xen/pcifront/pcifront.c index cdc8f9c..1613e0a 100644 --- a/sys/dev/xen/pcifront/pcifront.c +++ b/sys/dev/xen/pcifront/pcifront.c @@ -441,7 +441,7 @@ xpcife_probe(device_t dev) struct pcifront_device *pdev = (struct pcifront_device *)device_get_ivars(dev); DPRINTF("xpcife probe (unit=%d)\n", pdev->unit); #endif - return 0; + return (BUS_PROBE_NOWILDCARD); } /* Newbus xpcife device driver attach */ diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c index 824c75b..354085b 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/timer.c @@ -142,7 +142,7 @@ xentimer_probe(device_t dev) "VCPUOPs interface unavailable\n"); #undef XTREQUIRES device_set_desc(dev, "Xen PV Clock"); - return (0); + return (BUS_PROBE_NOWILDCARD); } /* diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c index b89c957..788e3a8 100644 --- a/sys/mips/adm5120/obio.c +++ b/sys/mips/adm5120/obio.c @@ -157,7 +157,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/alchemy/obio.c b/sys/mips/alchemy/obio.c index 90e41d6..da05bbb 100644 --- a/sys/mips/alchemy/obio.c +++ b/sys/mips/alchemy/obio.c @@ -158,7 +158,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c index 94cb1aa..fd1bc68 100644 --- a/sys/mips/atheros/apb.c +++ b/sys/mips/atheros/apb.c @@ -103,7 +103,7 @@ static int apb_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c index d3bb5f6..cc92d8a 100644 --- a/sys/mips/atheros/ar71xx_ehci.c +++ b/sys/mips/atheros/ar71xx_ehci.c @@ -75,7 +75,7 @@ ar71xx_ehci_probe(device_t self) device_set_desc(self, EHCI_HC_DEVSTR); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c index 9b88f60..476dba2 100644 --- a/sys/mips/atheros/ar71xx_pci.c +++ b/sys/mips/atheros/ar71xx_pci.c @@ -371,7 +371,7 @@ static int ar71xx_pci_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c index 095f930..2391927 100644 --- a/sys/mips/atheros/ar71xx_spi.c +++ b/sys/mips/atheros/ar71xx_spi.c @@ -84,7 +84,7 @@ static int ar71xx_spi_probe(device_t dev) { device_set_desc(dev, "AR71XX SPI"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_wdog.c b/sys/mips/atheros/ar71xx_wdog.c index d582f18..bf1ebc6 100644 --- a/sys/mips/atheros/ar71xx_wdog.c +++ b/sys/mips/atheros/ar71xx_wdog.c @@ -92,7 +92,7 @@ ar71xx_wdog_probe(device_t dev) { device_set_desc(dev, "Atheros AR71XX watchdog timer"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c index e73e9fc..c481b6a 100644 --- a/sys/mips/atheros/ar724x_pci.c +++ b/sys/mips/atheros/ar724x_pci.c @@ -349,7 +349,7 @@ static int ar724x_pci_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c index aabab52..85a22c3 100644 --- a/sys/mips/atheros/if_arge.c +++ b/sys/mips/atheros/if_arge.c @@ -260,7 +260,7 @@ arge_probe(device_t dev) { device_set_desc(dev, "Atheros AR71xx built-in ethernet interface"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c index dab1621..a9b1f98 100644 --- a/sys/mips/cavium/ciu.c +++ b/sys/mips/cavium/ciu.c @@ -109,7 +109,7 @@ ciu_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Central Interrupt Unit"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/cavium/octeon_ebt3000_cf.c b/sys/mips/cavium/octeon_ebt3000_cf.c index 287005b..18db10f 100644 --- a/sys/mips/cavium/octeon_ebt3000_cf.c +++ b/sys/mips/cavium/octeon_ebt3000_cf.c @@ -599,7 +599,7 @@ static int cf_probe (device_t dev) device_set_desc(dev, "Octeon Compact Flash Driver"); - return (0); + return (BUS_PROBE_NOWILDCARD); } /* ------------------------------------------------------------------- * diff --git a/sys/mips/cavium/octeon_pmc.c b/sys/mips/cavium/octeon_pmc.c index 0448018..688b154 100644 --- a/sys/mips/cavium/octeon_pmc.c +++ b/sys/mips/cavium/octeon_pmc.c @@ -71,7 +71,7 @@ octeon_pmc_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Performance Counters"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c index 27a7078..9419314 100644 --- a/sys/mips/cavium/octeon_rnd.c +++ b/sys/mips/cavium/octeon_rnd.c @@ -86,7 +86,7 @@ octeon_rnd_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Random Number Generator"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/cavium/octeon_rtc.c b/sys/mips/cavium/octeon_rtc.c index ca2debd..b08d4db5 100644 --- a/sys/mips/cavium/octeon_rtc.c +++ b/sys/mips/cavium/octeon_rtc.c @@ -81,7 +81,7 @@ octeon_rtc_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Realtime Clock"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c index 034b93a..b7b917d 100644 --- a/sys/mips/idt/obio.c +++ b/sys/mips/idt/obio.c @@ -108,7 +108,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c index ce320c9..b9cff7d 100644 --- a/sys/mips/malta/gt.c +++ b/sys/mips/malta/gt.c @@ -51,7 +51,7 @@ static int gt_probe(device_t dev) { device_set_desc(dev, "GT64120 chip"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c index 1dc3e7a..82620ae 100644 --- a/sys/mips/mips/tick.c +++ b/sys/mips/mips/tick.c @@ -313,7 +313,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c index b5a8c36..47c6b34 100644 --- a/sys/mips/nlm/tick.c +++ b/sys/mips/nlm/tick.c @@ -318,7 +318,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c index 23bd46c..71f1d19 100644 --- a/sys/mips/nlm/xlp_pci.c +++ b/sys/mips/nlm/xlp_pci.c @@ -383,8 +383,7 @@ xlp_pcib_probe(device_t dev) { device_set_desc(dev, "XLP PCI bus"); - xlp_pcib_init_resources(); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int @@ -524,6 +523,8 @@ xlp_pcib_attach(device_t dev) { int node, link; + xlp_pcib_init_resources(); + /* enable hardware swap on all nodes/links */ for (node = 0; node < XLP_MAX_NODES; node++) for (link = 0; link < 4; link++) diff --git a/sys/mips/rmi/iodi.c b/sys/mips/rmi/iodi.c index 8952fcd..a286589 100644 --- a/sys/mips/rmi/iodi.c +++ b/sys/mips/rmi/iodi.c @@ -190,7 +190,7 @@ static void iodi_identify(driver_t *, device_t); int iodi_probe(device_t dev) { - return 0; + return (BUS_PROBE_NOWILDCARD); } void diff --git a/sys/mips/rmi/tick.c b/sys/mips/rmi/tick.c index adc8c89..f6d0458 100644 --- a/sys/mips/rmi/tick.c +++ b/sys/mips/rmi/tick.c @@ -315,7 +315,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/rt305x/obio.c b/sys/mips/rt305x/obio.c index 870afea..fd9132a 100644 --- a/sys/mips/rt305x/obio.c +++ b/sys/mips/rt305x/obio.c @@ -148,7 +148,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/sibyte/sb_zbbus.c b/sys/mips/sibyte/sb_zbbus.c index e166b8f..b96409b 100644 --- a/sys/mips/sibyte/sb_zbbus.c +++ b/sys/mips/sibyte/sb_zbbus.c @@ -207,7 +207,7 @@ zbbus_probe(device_t dev) { device_set_desc(dev, "Broadcom/Sibyte ZBbus"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/modules/Makefile b/sys/modules/Makefile index a644208..ceaf131 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -2,6 +2,8 @@ .include <bsd.own.mk> +SUBDIR_PARALLEL= + # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). diff --git a/sys/powerpc/pseries/plpar_iommu.c b/sys/powerpc/pseries/plpar_iommu.c index ccf00c9..8db374c 100644 --- a/sys/powerpc/pseries/plpar_iommu.c +++ b/sys/powerpc/pseries/plpar_iommu.c @@ -69,7 +69,7 @@ struct dma_window { }; int -phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag) +phyp_iommu_set_dma_tag(device_t bus, device_t dev, bus_dma_tag_t tag) { device_t p; phandle_t node; @@ -77,7 +77,7 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag) struct iommu_map *i; int cell; - for (p = child; p != NULL; p = device_get_parent(p)) { + for (p = dev; device_get_parent(p) != NULL; p = device_get_parent(p)) { if (ofw_bus_has_prop(p, "ibm,my-dma-window")) break; if (ofw_bus_has_prop(p, "ibm,dma-window")) @@ -150,7 +150,7 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag) papr_supports_stuff_tce = !(phyp_hcall(H_STUFF_TCE, window->map->iobn, 0, 0, 0) == H_FUNCTION); - bus_dma_tag_set_iommu(tag, dev, window); + bus_dma_tag_set_iommu(tag, bus, window); return (0); } |
