summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-05-08 20:28:01 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-05-08 20:28:01 +0000
commit141ed0620b9e16a93295dfaa03e05282a8e249b8 (patch)
tree179311605e7cbcb0d7e1819c8886ab1faf151467
parent6d9ecc2ba717bbbf79127c48f1130bb22df1eef0 (diff)
Notes
-rw-r--r--sys/dev/pci/pci.c9
-rw-r--r--sys/pci/pci.c9
2 files changed, 16 insertions, 2 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index ffd226d77bfa..aa707ccd56bc 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pci.c,v 1.97 1999/05/06 22:05:38 peter Exp $
+ * $Id: pci.c,v 1.98 1999/05/08 18:09:53 peter Exp $
*
*/
@@ -1034,6 +1034,13 @@ pci_new_probe(device_t dev)
static void
pci_print_child(device_t dev, device_t child)
{
+ struct pci_devinfo *dinfo;
+ pcicfgregs *cfg;
+
+ dinfo = device_get_ivars(child);
+ cfg = &dinfo->cfg;
+ if (cfg->intpin > 0 && cfg->intline != 255)
+ printf(" irq %d", cfg->intline);
printf(" at device %d.%d", pci_get_slot(child), pci_get_function(child));
printf(" on %s%d", device_get_name(dev), device_get_unit(dev));
}
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index ffd226d77bfa..aa707ccd56bc 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pci.c,v 1.97 1999/05/06 22:05:38 peter Exp $
+ * $Id: pci.c,v 1.98 1999/05/08 18:09:53 peter Exp $
*
*/
@@ -1034,6 +1034,13 @@ pci_new_probe(device_t dev)
static void
pci_print_child(device_t dev, device_t child)
{
+ struct pci_devinfo *dinfo;
+ pcicfgregs *cfg;
+
+ dinfo = device_get_ivars(child);
+ cfg = &dinfo->cfg;
+ if (cfg->intpin > 0 && cfg->intline != 255)
+ printf(" irq %d", cfg->intline);
printf(" at device %d.%d", pci_get_slot(child), pci_get_function(child));
printf(" on %s%d", device_get_name(dev), device_get_unit(dev));
}