PERFORCE change 231119 for review
John Baldwin
jhb at FreeBSD.org
Fri Jul 12 22:18:45 UTC 2013
http://p4web.freebsd.org/@@231119?ac=10
Change 231119 by jhb at jhb_jhbbsd on 2013/07/12 22:18:04
Trim debugging.
Affected files ...
.. //depot/projects/pci/sys/dev/pci/pci_pci.c#40 edit
Differences ...
==== //depot/projects/pci/sys/dev/pci/pci_pci.c#40 (text+ko) ====
@@ -193,9 +193,8 @@
}
/*
- * This is used to reject allocations that conflict with an ISA alias
- * before trying to grow the window. Note that this check overrides
- * subtractive decode.
+ * This is used to reject I/O port allocations that conflict with an
+ * ISA alias range.
*/
static int
pcib_is_isa_range(struct pcib_softc *sc, u_long start, u_long end, u_long count)
@@ -230,8 +229,10 @@
return (0);
alias:
- device_printf(sc->dev,
- "I/O range %#lx-%#lx overlaps with an ISA alias\n", start, end);
+ if (bootverbose)
+ device_printf(sc->dev,
+ "I/O range %#lx-%#lx overlaps with an ISA alias\n", start,
+ end);
return (1);
}
@@ -320,10 +321,9 @@
w = &as->sc->io;
rid = w->reg;
- /* XXX */
- if (bootverbose || 1)
+ if (bootverbose)
device_printf(as->sc->dev,
- "Allocating non-ISA range %#lx-%#lx\n", start, end);
+ "allocating non-ISA range %#lx-%#lx\n", start, end);
as->res[as->count] = bus_alloc_resource(as->sc->dev, SYS_RES_IOPORT,
&rid, start, end, end - start + 1, 0);
if (as->res[as->count] == NULL)
@@ -338,10 +338,6 @@
struct alloc_state as;
int i, new_count;
- /* XXX */
- device_printf(sc->dev, "Allocating non-ISA ranges of %#lx-%#lx\n",
- start, end);
-
/* First, see how many ranges we need. */
new_count = 0;
pcib_walk_nonisa_ranges(start, end, count_ranges, &new_count);
More information about the p4-projects
mailing list