system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-17 05:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a separate variable for resource id, because 'i' may increment at a

Browse source 
rate greater than 1 on each iteration.
This commit is contained in:
Ian Lepore 2014-08-10 00:23:57 +00:00
parent a17de72b25
commit 1fb6bc18cb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=269769
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/ofw/ofwbus.c
View file

@ -438,7 +438,7 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
uint32_t *reg, *intr, icells;
uint64_t phys, size;
phandle_t iparent;
int i, j;
int i, j, rid;
int nintr;
int nreg;
@ -467,7 +467,7 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
nreg = 0;
}
for (i = 0; i < nreg; i += sc->acells + sc->scells) {
for (i = 0, rid = 0; i < nreg; i += sc->acells + sc->scells, rid++) {
phys = size = 0;
for (j = 0; j < sc->acells; j++) {
phys <<= 32;
@ -479,7 +479,7 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
}
/* Skip the dummy reg property of glue devices like ssm(4). */
if (size != 0)
resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, i,
resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, rid,
phys, phys + size - 1, size);
}
free(reg, M_OFWPROP);
@ -492,10 +492,10 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
sizeof(iparent));
OF_searchencprop(OF_xref_phandle(iparent), "#interrupt-cells",
&icells, sizeof(icells));
for (i = 0; i < nintr; i+= icells) {
for (i = 0, rid = 0; i < nintr; i += icells, rid++) {
intr[i] = ofw_bus_map_intr(dev, iparent, icells,
&intr[i]);
resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i],
resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, rid, intr[i],
intr[i], 1);
}
free(intr, M_OFWPROP);