diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-12 15:47:50 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-12 15:47:50 +0000 |
| commit | b561b39a00f588fc9eea6cba438e92ae90170e7c (patch) | |
| tree | 510222a1a040be3c8d600e3fb6fd1534b35036fe /xen/drivers/pci | |
| parent | b0b22e49bcb71d4d52625489574ba9ac60e95f07 (diff) | |
| download | xen-b561b39a00f588fc9eea6cba438e92ae90170e7c.tar.gz xen-b561b39a00f588fc9eea6cba438e92ae90170e7c.tar.bz2 xen-b561b39a00f588fc9eea6cba438e92ae90170e7c.zip | |
bitkeeper revision 1.789 (4051dba62id7XBLQIfBX2kqtjQJzfQ)
physirq.c, pci-pc.c, pci-irq.c, pci-i386.h, pci-i386.c, pci-dma.c, physdev.h:
new file
Many files:
Second half of Rolf's IO patch.
Diffstat (limited to 'xen/drivers/pci')
| -rw-r--r-- | xen/drivers/pci/pci.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index a478610564..41834c2b8c 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -13,21 +13,14 @@ #include <xeno/sched.h> #include <xeno/module.h> #include <xeno/types.h> -/*#include <xeno/kernel.h>*/ #include <xeno/pci.h> -/*#include <xeno/string.h>*/ #include <xeno/init.h> #include <xeno/slab.h> #include <xeno/ioport.h> #include <xeno/spinlock.h> -/*#include <xeno/pm.h>*/ -/*#include <xeno/kmod.h>*/ /* for hotplug_path */ -/*#include <xeno/bitops.h>*/ #include <xeno/delay.h> #include <xeno/cache.h> - #include <asm/page.h> -/*#include <asm/dma.h>*/ /* isa_dma_bridge_buggy */ #undef DEBUG @@ -1258,6 +1251,10 @@ struct pci_bus * __devinit pci_add_new_bus(struct pci_bus *parent, struct pci_de child->resource[i]->name = child->name; } + DBG("pci_add_new_bus(nr=%x,devfn=%02x(%02x:%x),parent=%x)\n", + busnr, dev->devfn, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), + parent->number); + return child; } @@ -2111,6 +2108,19 @@ void __devinit pci_init(void) pci_for_each_dev(dev) { pci_fixup_device(PCI_FIXUP_FINAL, dev); +#ifdef DEBUG + printk("PCI: %p %02x:%02x:%02x\n", dev, + dev->bus ? dev->bus->number : 0xffffffff, + PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); + if (dev->bus) { + printk(" s=%p ", dev->bus->self); + if ( dev->bus->self ) + printk(" %02x:%02x)", + PCI_SLOT(dev->bus->self->devfn), + PCI_FUNC(dev->bus->self->devfn)); + printk("\n"); + } +#endif /* DEBUG */ } #ifdef CONFIG_PM |