diff options
| author | jhb <jhb@FreeBSD.org> | 2006-11-09 18:04:53 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2006-11-09 18:04:53 +0000 |
| commit | 417d61baef271ec4cd096fd6f7aacf130181d9b7 (patch) | |
| tree | 55f17c4179677753062d992d7b25b6f522271803 /sys/dev/pci | |
| parent | fe20b44ccad5e6cc2f29c83957a6feb144ee3202 (diff) | |
| download | FreeBSD-src-417d61baef271ec4cd096fd6f7aacf130181d9b7.zip FreeBSD-src-417d61baef271ec4cd096fd6f7aacf130181d9b7.tar.gz | |
Don't try to print a NULL string during boot. If a device doesn't have a
valid name yet, just omit the name during the bootverbose printfs.
MFC after: 1 week
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/pci_pci.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 50b64f7..0293489 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -330,11 +330,18 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct pcib_softc *sc = device_get_softc(dev); + const char *name, *suffix; int ok; /* * Fail the allocation for this range if it's not supported. */ + name = device_get_nameunit(child); + if (name == NULL) { + name = ""; + suffix = ""; + } else + suffix = " "; switch (type) { case SYS_RES_IOPORT: ok = 0; @@ -375,16 +382,15 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, ok = 0; } if (!ok) { - device_printf(dev, "%s requested unsupported I/O " + device_printf(dev, "%s%srequested unsupported I/O " "range 0x%lx-0x%lx (decoding 0x%x-0x%x)\n", - device_get_nameunit(child), start, end, - sc->iobase, sc->iolimit); + name, suffix, start, end, sc->iobase, sc->iolimit); return (NULL); } if (bootverbose) device_printf(dev, - "%s requested I/O range 0x%lx-0x%lx: in range\n", - device_get_nameunit(child), start, end); + "%s%srequested I/O range 0x%lx-0x%lx: in range\n", + name, suffix, start, end); break; case SYS_RES_MEMORY: @@ -450,17 +456,17 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, } if (!ok && bootverbose) device_printf(dev, - "%s requested unsupported memory range %#lx-%#lx " + "%s%srequested unsupported memory range %#lx-%#lx " "(decoding %#jx-%#jx, %#jx-%#jx)\n", - device_get_nameunit(child), start, end, + name, suffix, start, end, (uintmax_t)sc->membase, (uintmax_t)sc->memlimit, (uintmax_t)sc->pmembase, (uintmax_t)sc->pmemlimit); if (!ok) return (NULL); if (bootverbose) - device_printf(dev,"%s requested memory range " + device_printf(dev,"%s%srequested memory range " "0x%lx-0x%lx: good\n", - device_get_nameunit(child), start, end); + name, suffix, start, end); break; default: |
