diff --git a/sys/dev/proto/proto_bus_isa.c b/sys/dev/proto/proto_bus_isa.c index 0e4f2a29b429..39ad126bf7b7 100644 --- a/sys/dev/proto/proto_bus_isa.c +++ b/sys/dev/proto/proto_bus_isa.c @@ -1,121 +1,115 @@ /*- * Copyright (c) 2015 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include #include #include #include #include #include -#include #include #include #include static int proto_isa_probe(device_t dev); static int proto_isa_attach(device_t dev); static device_method_t proto_isa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, proto_isa_probe), DEVMETHOD(device_attach, proto_isa_attach), DEVMETHOD(device_detach, proto_detach), DEVMETHOD_END }; static driver_t proto_isa_driver = { proto_driver_name, proto_isa_methods, sizeof(struct proto_softc), }; static char proto_isa_prefix[] = "isa"; static char **proto_isa_devnames; static int proto_isa_probe(device_t dev) { - struct sbuf *sb; struct resource *res; int rid, type; rid = 0; type = SYS_RES_IOPORT; res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE); if (res == NULL) { type = SYS_RES_MEMORY; res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE); } if (res == NULL) return (ENODEV); - sb = sbuf_new_auto(); - sbuf_printf(sb, "%s:%#jx", proto_isa_prefix, rman_get_start(res)); - sbuf_finish(sb); - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "%s:%#jx", proto_isa_prefix, rman_get_start(res)); bus_release_resource(dev, type, rid, res); return (proto_probe(dev, proto_isa_prefix, &proto_isa_devnames)); } static int proto_isa_alloc(device_t dev, int type, int nrids) { struct resource *res; struct proto_softc *sc; int count, rid; sc = device_get_softc(dev); count = 0; for (rid = 0; rid < nrids; rid++) { res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE); if (res == NULL) break; proto_add_resource(sc, type, rid, res); count++; } if (type == SYS_RES_DRQ && count > 0) proto_add_resource(sc, PROTO_RES_BUSDMA, 0, NULL); return (count); } static int proto_isa_attach(device_t dev) { proto_isa_alloc(dev, SYS_RES_IRQ, ISA_NIRQ); proto_isa_alloc(dev, SYS_RES_DRQ, ISA_NDRQ); proto_isa_alloc(dev, SYS_RES_IOPORT, ISA_NPORT); proto_isa_alloc(dev, SYS_RES_MEMORY, ISA_NMEM); return (proto_attach(dev)); } DRIVER_MODULE(proto, acpi, proto_isa_driver, NULL, NULL); DRIVER_MODULE(proto, isa, proto_isa_driver, NULL, NULL); diff --git a/sys/dev/proto/proto_bus_pci.c b/sys/dev/proto/proto_bus_pci.c index 9a98443845f5..ebcfd6d4711c 100644 --- a/sys/dev/proto/proto_bus_pci.c +++ b/sys/dev/proto/proto_bus_pci.c @@ -1,115 +1,109 @@ /*- * Copyright (c) 2014, 2015 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include #include #include #include #include #include -#include #include #include #include static int proto_pci_probe(device_t dev); static int proto_pci_attach(device_t dev); static device_method_t proto_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, proto_pci_probe), DEVMETHOD(device_attach, proto_pci_attach), DEVMETHOD(device_detach, proto_detach), DEVMETHOD_END }; static driver_t proto_pci_driver = { proto_driver_name, proto_pci_methods, sizeof(struct proto_softc), }; static char proto_pci_prefix[] = "pci"; static char **proto_pci_devnames; static int proto_pci_probe(device_t dev) { - struct sbuf *sb; - if ((pci_read_config(dev, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE) != 0) return (ENXIO); - sb = sbuf_new_auto(); - sbuf_printf(sb, "%s%d:%d:%d:%d", proto_pci_prefix, pci_get_domain(dev), - pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); - sbuf_finish(sb); - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "%s%d:%d:%d:%d", proto_pci_prefix, + pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), + pci_get_function(dev)); return (proto_probe(dev, proto_pci_prefix, &proto_pci_devnames)); } static int proto_pci_attach(device_t dev) { struct proto_softc *sc; struct resource *res; uint32_t val; int bar, rid, type; sc = device_get_softc(dev); proto_add_resource(sc, PROTO_RES_PCICFG, 0, NULL); proto_add_resource(sc, PROTO_RES_BUSDMA, 0, NULL); for (bar = 0; bar < PCIR_MAX_BAR_0; bar++) { rid = PCIR_BAR(bar); val = pci_read_config(dev, rid, 4); type = (PCI_BAR_IO(val)) ? SYS_RES_IOPORT : SYS_RES_MEMORY; res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE); if (res == NULL) continue; proto_add_resource(sc, type, rid, res); if (type == SYS_RES_IOPORT) continue; /* Skip over adjacent BAR for 64-bit memory BARs. */ if ((val & PCIM_BAR_MEM_TYPE) == PCIM_BAR_MEM_64) bar++; } rid = 0; type = SYS_RES_IRQ; res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE | RF_SHAREABLE); if (res != NULL) proto_add_resource(sc, type, rid, res); return (proto_attach(dev)); } DRIVER_MODULE(proto, pci, proto_pci_driver, NULL, NULL);