Fix the resource_list_print_type() calls to use uintmax_t.
Missed a bunch from r297000.
This commit is contained in:
parent
0d66701783
commit
f8fd3fb518
@ -281,9 +281,9 @@ at91_print_child(device_t dev, device_t child)
|
||||
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
if (device_get_flags(dev))
|
||||
retval += printf(" flags %#x", device_get_flags(dev));
|
||||
|
||||
|
@ -330,8 +330,8 @@ pinctrl_print_res(struct pinctrl_devinfo *di)
|
||||
int rv;
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&di->rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
rv += resource_list_print_type(&di->rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
rv += resource_list_print_type(&di->rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
rv += resource_list_print_type(&di->rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
||||
|
@ -526,9 +526,9 @@ econa_print_child(device_t dev, device_t child)
|
||||
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
if (device_get_flags(dev))
|
||||
retval += printf(" flags %#x", device_get_flags(dev));
|
||||
|
||||
|
@ -323,8 +323,8 @@ localbus_print_child(device_t dev, device_t child)
|
||||
|
||||
rv = 0;
|
||||
rv += bus_print_child_header(dev, child);
|
||||
rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
rv += bus_print_child_footer(dev, child);
|
||||
|
||||
return (rv);
|
||||
|
@ -159,9 +159,9 @@ pxa_print_child(device_t dev, device_t child)
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(&od->od_resources, "at mem",
|
||||
SYS_RES_MEMORY, "0x%08lx");
|
||||
SYS_RES_MEMORY, "0x%08jx");
|
||||
retval += resource_list_print_type(&od->od_resources, "irq",
|
||||
SYS_RES_IRQ, "%ld");
|
||||
SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
|
@ -144,9 +144,9 @@ pxa_smi_print_child(device_t dev, device_t child)
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(&smid->smid_resources, "at mem",
|
||||
SYS_RES_MEMORY, "%#lx");
|
||||
SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(&smid->smid_resources, "irq",
|
||||
SYS_RES_IRQ, "%ld");
|
||||
SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
|
@ -451,7 +451,7 @@ bhnd_generic_print_child(device_t dev, device_t child)
|
||||
rl = BUS_GET_RESOURCE_LIST(dev, child);
|
||||
if (rl != NULL) {
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
"%#jx");
|
||||
}
|
||||
|
||||
retval += printf(" at core %u", bhnd_get_core_index(child));
|
||||
@ -499,7 +499,7 @@ bhnd_generic_probe_nomatch(device_t dev, device_t child)
|
||||
|
||||
rl = BUS_GET_RESOURCE_LIST(dev, child);
|
||||
if (rl != NULL)
|
||||
resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
|
||||
printf(" at core %u (no driver attached)\n",
|
||||
bhnd_get_core_index(child));
|
||||
|
@ -143,9 +143,9 @@ bhndb_print_child(device_t dev, device_t child)
|
||||
rl = BUS_GET_RESOURCE_LIST(dev, child);
|
||||
if (rl != NULL) {
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
"%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ,
|
||||
"%ld");
|
||||
"%jd");
|
||||
}
|
||||
|
||||
retval += bus_print_child_domain(dev, child);
|
||||
|
@ -390,7 +390,7 @@ gpiobus_probe_nomatch(device_t dev, device_t child)
|
||||
device_printf(dev, "<unknown device> at pins %s", pins);
|
||||
else
|
||||
device_printf(dev, "<unknown device> at pin %s", pins);
|
||||
resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
@ -412,7 +412,7 @@ gpiobus_print_child(device_t dev, device_t child)
|
||||
gpiobus_print_pins(devi, pins, sizeof(pins));
|
||||
retval += printf("%s", pins);
|
||||
}
|
||||
resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
return (retval);
|
||||
|
@ -149,7 +149,7 @@ iicbus_print_child(device_t dev, device_t child)
|
||||
retval += bus_print_child_header(dev, child);
|
||||
if (devi->addr != 0)
|
||||
retval += printf(" at addr %#x", devi->addr);
|
||||
resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
return (retval);
|
||||
|
@ -297,7 +297,7 @@ lebuffer_print_res(struct lebuffer_devinfo *ldi)
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&ldi->ldi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
rv += resource_list_print_type(&ldi->ldi_rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
"%#jx");
|
||||
rv += resource_list_print_type(&ldi->ldi_rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
@ -597,8 +597,8 @@ siba_print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
return (retval);
|
||||
}
|
||||
|
@ -629,10 +629,10 @@ isa_print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl) || device_get_flags(dev))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
|
||||
retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
|
||||
retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%jd");
|
||||
if (device_get_flags(dev))
|
||||
retval += printf(" flags %#x", device_get_flags(dev));
|
||||
#ifdef ISAPNP
|
||||
|
@ -491,8 +491,8 @@ apb_print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
return (retval);
|
||||
}
|
||||
|
@ -239,8 +239,8 @@ simplebus_print_child(device_t dev, device_t child)
|
||||
|
||||
rv = 0;
|
||||
rv += bus_print_child_header(dev, child);
|
||||
rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
if ((ip = simplebus_get_interrupt_parent(child)) != NULL)
|
||||
rv += printf(" (%s)", device_get_nameunit(ip));
|
||||
rv += bus_print_child_footer(dev, child);
|
||||
|
@ -231,8 +231,8 @@ nexus_print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
return (retval);
|
||||
}
|
||||
|
@ -587,8 +587,8 @@ obio_print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
return (retval);
|
||||
}
|
||||
|
@ -433,9 +433,9 @@ print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
|
||||
retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
|
||||
retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
@ -236,7 +236,7 @@ macgpio_print_child(device_t dev, device_t child)
|
||||
printf(" addr 0x%02x", dinfo->gpio_num); /* should not happen */
|
||||
|
||||
resource_list_print_type(&dinfo->mdi_resources, "irq", SYS_RES_IRQ,
|
||||
"%ld");
|
||||
"%jd");
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
return (retval);
|
||||
@ -258,7 +258,7 @@ macgpio_probe_nomatch(device_t dev, device_t child)
|
||||
if (dinfo->gpio_num >= 0)
|
||||
printf(" gpio %d",dinfo->gpio_num);
|
||||
resource_list_print_type(&dinfo->mdi_resources, "irq",
|
||||
SYS_RES_IRQ, "%ld");
|
||||
SYS_RES_IRQ, "%jd");
|
||||
printf(" (no driver attached)\n");
|
||||
}
|
||||
}
|
||||
|
@ -447,8 +447,8 @@ macio_print_child(device_t dev, device_t child)
|
||||
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
@ -470,8 +470,8 @@ macio_probe_nomatch(device_t dev, device_t child)
|
||||
if ((type = ofw_bus_get_type(child)) == NULL)
|
||||
type = "(unknown)";
|
||||
device_printf(dev, "<%s, %s>", type, ofw_bus_get_name(child));
|
||||
resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
printf(" (no driver attached)\n");
|
||||
}
|
||||
}
|
||||
|
@ -425,8 +425,8 @@ unin_chip_print_child(device_t dev, device_t child)
|
||||
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
@ -447,8 +447,8 @@ unin_chip_probe_nomatch(device_t dev, device_t child)
|
||||
if ((type = ofw_bus_get_type(child)) == NULL)
|
||||
type = "(unknown)";
|
||||
device_printf(dev, "<%s, %s>", type, ofw_bus_get_name(child));
|
||||
resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
|
||||
resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
|
||||
resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
printf(" (no driver attached)\n");
|
||||
}
|
||||
}
|
||||
|
@ -480,9 +480,9 @@ ps3bus_print_child(device_t dev, device_t child)
|
||||
|
||||
retval += bus_print_child_header(dev, child);
|
||||
retval += resource_list_print_type(&dinfo->resources, "mem",
|
||||
SYS_RES_MEMORY, "%#lx");
|
||||
SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(&dinfo->resources, "irq",
|
||||
SYS_RES_IRQ, "%ld");
|
||||
SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
|
@ -180,7 +180,7 @@ vdevice_print_child(device_t dev, device_t child)
|
||||
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
|
@ -253,7 +253,7 @@ iobus_print_child(device_t dev, device_t child)
|
||||
retval += bus_print_child_header(dev, child);
|
||||
|
||||
retval += printf(" offset 0x%x", dinfo->id_reg[1]);
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
retval += bus_print_child_footer(dev, child);
|
||||
|
||||
|
@ -295,5 +295,5 @@ central_print_res(struct central_devinfo *cdi)
|
||||
{
|
||||
|
||||
return (resource_list_print_type(&cdi->cdi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx"));
|
||||
"%#jx"));
|
||||
}
|
||||
|
@ -721,8 +721,8 @@ ebus_print_res(struct ebus_devinfo *edi)
|
||||
|
||||
retval = 0;
|
||||
retval += resource_list_print_type(&edi->edi_rl, "addr", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
"%#jx");
|
||||
retval += resource_list_print_type(&edi->edi_rl, "irq", SYS_RES_IRQ,
|
||||
"%ld");
|
||||
"%jd");
|
||||
return (retval);
|
||||
}
|
||||
|
@ -529,7 +529,7 @@ fhc_print_res(struct fhc_devinfo *fdi)
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&fdi->fdi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
rv += resource_list_print_type(&fdi->fdi_rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
"%#jx");
|
||||
rv += resource_list_print_type(&fdi->fdi_rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
@ -409,7 +409,7 @@ dma_print_res(struct dma_devinfo *ddi)
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&ddi->ddi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
rv += resource_list_print_type(&ddi->ddi_rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
"%#jx");
|
||||
rv += resource_list_print_type(&ddi->ddi_rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
@ -929,8 +929,8 @@ sbus_print_res(struct sbus_devinfo *sdi)
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&sdi->sdi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
"%#jx");
|
||||
rv += resource_list_print_type(&sdi->sdi_rl, "irq", SYS_RES_IRQ,
|
||||
"%ld");
|
||||
"%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
@ -605,8 +605,8 @@ nexus_print_res(struct nexus_devinfo *ndi)
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&ndi->ndi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
"%#jx");
|
||||
rv += resource_list_print_type(&ndi->ndi_rl, "irq", SYS_RES_IRQ,
|
||||
"%ld");
|
||||
"%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
@ -588,8 +588,8 @@ upa_print_res(struct upa_devinfo *udi)
|
||||
|
||||
rv = 0;
|
||||
rv += resource_list_print_type(&udi->udi_rl, "mem", SYS_RES_MEMORY,
|
||||
"%#lx");
|
||||
"%#jx");
|
||||
rv += resource_list_print_type(&udi->udi_rl, "irq", SYS_RES_IRQ,
|
||||
"%ld");
|
||||
"%jd");
|
||||
return (rv);
|
||||
}
|
||||
|
@ -301,9 +301,9 @@ nexus_print_all_resources(device_t dev)
|
||||
if (STAILQ_FIRST(rl))
|
||||
retval += printf(" at");
|
||||
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
|
||||
retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
|
||||
retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
|
||||
retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx");
|
||||
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user