aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2005-12-13 11:05:00 -0500
committerJody McIntyre <scjody@modernduck.com>2005-12-13 11:05:00 -0500
commit209171a17a908605e516d11436371337a5d87f06 (patch)
treed17bfc9af8faee2e9bff188050ec42a6b0d07a09
parent25d3f1622fdbc73db3f6860961b5fb3035a39f32 (diff)
ohci1394: log number of implemented isochronous contexts
Print the number of IR and IT contexts which a hardware implements as an informational log message when ohci1394 initializes. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jody McIntyre <scjody@modernduck.com>
-rw-r--r--drivers/ieee1394/ohci1394.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 97b6f48033c4..b6b96fa04d62 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -584,12 +584,13 @@ static void ohci_initialize(struct ti_ohci *ohci)
584 sprintf (irq_buf, "%s", __irq_itoa(ohci->dev->irq)); 584 sprintf (irq_buf, "%s", __irq_itoa(ohci->dev->irq));
585#endif 585#endif
586 PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] " 586 PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] "
587 "MMIO=[%lx-%lx] Max Packet=[%d]", 587 "MMIO=[%lx-%lx] Max Packet=[%d] IR/IT contexts=[%d/%d]",
588 ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10), 588 ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10),
589 ((((buf) >> 4) & 0xf) + ((buf) & 0xf) * 10), irq_buf, 589 ((((buf) >> 4) & 0xf) + ((buf) & 0xf) * 10), irq_buf,
590 pci_resource_start(ohci->dev, 0), 590 pci_resource_start(ohci->dev, 0),
591 pci_resource_start(ohci->dev, 0) + OHCI1394_REGISTER_SIZE - 1, 591 pci_resource_start(ohci->dev, 0) + OHCI1394_REGISTER_SIZE - 1,
592 ohci->max_packet_size); 592 ohci->max_packet_size,
593 ohci->nb_iso_rcv_ctx, ohci->nb_iso_xmit_ctx);
593 594
594 /* Check all of our ports to make sure that if anything is 595 /* Check all of our ports to make sure that if anything is
595 * connected, we enable that port. */ 596 * connected, we enable that port. */
@@ -3351,13 +3352,8 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
3351 /* Determine the number of available IR and IT contexts. */ 3352 /* Determine the number of available IR and IT contexts. */
3352 ohci->nb_iso_rcv_ctx = 3353 ohci->nb_iso_rcv_ctx =
3353 get_nb_iso_ctx(ohci, OHCI1394_IsoRecvIntMaskSet); 3354 get_nb_iso_ctx(ohci, OHCI1394_IsoRecvIntMaskSet);
3354 DBGMSG("%d iso receive contexts available",
3355 ohci->nb_iso_rcv_ctx);
3356
3357 ohci->nb_iso_xmit_ctx = 3355 ohci->nb_iso_xmit_ctx =
3358 get_nb_iso_ctx(ohci, OHCI1394_IsoXmitIntMaskSet); 3356 get_nb_iso_ctx(ohci, OHCI1394_IsoXmitIntMaskSet);
3359 DBGMSG("%d iso transmit contexts available",
3360 ohci->nb_iso_xmit_ctx);
3361 3357
3362 /* Set the usage bits for non-existent contexts so they can't 3358 /* Set the usage bits for non-existent contexts so they can't
3363 * be allocated */ 3359 * be allocated */