diff options
author | jhb <jhb@FreeBSD.org> | 2004-07-01 07:46:29 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2004-07-01 07:46:29 +0000 |
commit | 900e7c295df4b2ceeb962eed75c09dcd513e8474 (patch) | |
tree | 21d778c675dd108d89c9cdf1b6991ddb90939ee8 /sys/dev | |
parent | 3c5c35a72b44c745361adcdc5002abdd00233ca6 (diff) | |
download | FreeBSD-src-900e7c295df4b2ceeb962eed75c09dcd513e8474.zip FreeBSD-src-900e7c295df4b2ceeb962eed75c09dcd513e8474.tar.gz |
Trim a few things from the dmesg output and stick them under bootverbose to
cut down on the clutter including PCI interrupt routing, MTRR, pcibios,
etc.
Discussed with: USENIX Cabal
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/acpica/acpi_pcib.c | 21 | ||||
-rw-r--r-- | sys/dev/firewire/fwohci_pci.c | 5 | ||||
-rw-r--r-- | sys/dev/pci/pci_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/random/randomdev.c | 4 |
4 files changed, 19 insertions, 13 deletions
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 8eeda8e..9392689 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -275,8 +275,9 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, * XXX check ASL examples to see if this is an acceptable set of tests */ if (NumberOfInterrupts == 1 && Interrupts[0] != 0) { - device_printf(pcib, "slot %d INT%c is routed to irq %d\n", - pci_get_slot(dev), 'A' + pin, Interrupts[0]); + if (bootverbose) + device_printf(pcib, "slot %d INT%c is routed to irq %d\n", + pci_get_slot(dev), 'A' + pin, Interrupts[0]); interrupt = Interrupts[0]; goto out; } @@ -338,10 +339,12 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, * Build a resource buffer and pass it to AcpiSetCurrentResources to * route the new interrupt. */ - device_printf(pcib, "possible interrupts:"); - for (i = 0; i < NumberOfInterrupts; i++) - printf(" %d", Interrupts[i]); - printf("\n"); + if (bootverbose) { + device_printf(pcib, "possible interrupts:"); + for (i = 0; i < NumberOfInterrupts; i++) + printf(" %d", Interrupts[i]); + printf("\n"); + } /* This should never happen. */ if (crsbuf.Pointer != NULL) @@ -383,9 +386,9 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, crsres = &resbuf; /* Return the interrupt we just routed. */ - device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", - pci_get_slot(dev), 'A' + pin, Interrupts[0], - acpi_name(lnkdev)); + if (bootverbose) + device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", + pci_get_slot(dev), 'A' + pin, Interrupts[0], acpi_name(lnkdev)); interrupt = Interrupts[0]; out: diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index b1ee33d..5331629 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -187,8 +187,9 @@ fwohci_pci_probe( device_t dev ) if (pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_FW && pci_get_progif(dev) == PCI_INTERFACE_OHCI) { - device_printf(dev, "vendor=%x, dev=%x\n", pci_get_vendor(dev), - pci_get_device(dev)); + if (bootverbose) + device_printf(dev, "vendor=%x, dev=%x\n", + pci_get_vendor(dev), pci_get_device(dev)); device_set_desc(dev, "1394 Open Host Controller Interface"); return 0; } diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 40e1934..43114d7 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -475,7 +475,7 @@ pcib_route_interrupt(device_t pcib, device_t dev, int pin) */ bus = device_get_parent(pcib); intnum = PCIB_ROUTE_INTERRUPT(device_get_parent(bus), pcib, parent_intpin + 1); - if (PCI_INTERRUPT_VALID(intnum)) { + if (PCI_INTERRUPT_VALID(intnum) && bootverbose) { device_printf(pcib, "slot %d INT%c is routed to irq %d\n", pci_get_slot(dev), 'A' + pin - 1, intnum); } diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index a88e4a9..7c5434e 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -200,7 +200,9 @@ random_modevent(module_t mod __unused, int type, void *data __unused) random_ident_hardware(&random_systat); (*random_systat.init)(); - printf("random: <entropy source, %s>\n", random_systat.ident); + if (bootverbose) + printf("random: <entropy source, %s>\n", + random_systat.ident); random_dev = make_dev(&random_cdevsw, RANDOM_MINOR, UID_ROOT, GID_WHEEL, 0666, "random"); |