d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up as in isa/* - resource_query_string() loop cosmetic tweaks.

Browse Source
This commit is contained in:
peter 2000-10-15 09:32:58 +00:00
parent f8f70f4f5c
commit 72f413de0c
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/pc98/cbus/fdc.c
View File

@ -1042,6 +1042,7 @@ fdc_attach(device_t dev)
{ {
struct fdc_data *fdc; struct fdc_data *fdc;
int i, error; int i, error;
const char *name;
fdc = device_get_softc(dev); fdc = device_get_softc(dev);
error = fdc_alloc_resources(fdc); error = fdc_alloc_resources(fdc);
@ -1079,9 +1080,9 @@ fdc_attach(device_t dev)
* Probe and attach any children. We should probably detect * Probe and attach any children. We should probably detect
* devices from the BIOS unless overridden. * devices from the BIOS unless overridden.
*/ */
for (i = resource_query_string(-1, "at", device_get_nameunit(dev)); name = device_get_nameunit(dev);
i != -1; i = -1;
i = resource_query_string(i, "at", device_get_nameunit(dev))) while ((i = resource_query_string(i, "at", name)) != -1)
fdc_add_child(dev, resource_query_name(i), fdc_add_child(dev, resource_query_name(i),
resource_query_unit(i)); resource_query_unit(i));

7
sys/pc98/pc98/fd.c
View File

@ -1042,6 +1042,7 @@ fdc_attach(device_t dev)
{ {
struct fdc_data *fdc; struct fdc_data *fdc;
int i, error; int i, error;
const char *name;
fdc = device_get_softc(dev); fdc = device_get_softc(dev);
error = fdc_alloc_resources(fdc); error = fdc_alloc_resources(fdc);
@ -1079,9 +1080,9 @@ fdc_attach(device_t dev)
* Probe and attach any children. We should probably detect * Probe and attach any children. We should probably detect
* devices from the BIOS unless overridden. * devices from the BIOS unless overridden.
*/ */
for (i = resource_query_string(-1, "at", device_get_nameunit(dev)); name = device_get_nameunit(dev);
i != -1; i = -1;
i = resource_query_string(i, "at", device_get_nameunit(dev))) while ((i = resource_query_string(i, "at", name)) != -1)
fdc_add_child(dev, resource_query_name(i), fdc_add_child(dev, resource_query_name(i),
resource_query_unit(i)); resource_query_unit(i));

5
sys/pc98/pc98/wd.c
View File

@ -490,9 +490,8 @@ wdattach(struct isa_device *dvp)
bioq_init(&wdtab[dvp->id_unit].controller_queue); bioq_init(&wdtab[dvp->id_unit].controller_queue);
sprintf(buf, "wdc%d", dvp->id_unit); sprintf(buf, "wdc%d", dvp->id_unit);
for (i = resource_query_string(-1, "at", buf); i = -1;
i != -1; while ((i = resource_query_string(i, "at", buf)) != -1) {
i = resource_query_string(i, "at", buf)) {
if (strcmp(resource_query_name(i), "wd")) if (strcmp(resource_query_name(i), "wd"))
/* Avoid a bit of foot shooting. */ /* Avoid a bit of foot shooting. */
continue; continue;