Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 456 → Rev 457

/shark/trunk/drivers/newpci/search.c
73,7 → 73,7
struct list_head *n;
struct pci_bus *b = NULL;
 
WARN_ON(in_interrupt());
//WARN_ON(in_interrupt());
spin_lock(&pci_bus_lock);
n = from ? from->node.next : pci_root_buses.next;
if (n != &pci_root_buses)
132,7 → 132,7
struct list_head *n;
struct pci_dev *dev;
 
WARN_ON(in_interrupt());
//WARN_ON(in_interrupt());
spin_lock(&pci_bus_lock);
n = from ? from->global_list.next : pci_devices.next;
 
197,7 → 197,7
struct list_head *n;
struct pci_dev *dev;
 
WARN_ON(in_interrupt());
//WARN_ON(in_interrupt());
spin_lock(&pci_bus_lock);
n = from ? from->global_list.next : pci_devices.next;
 
263,7 → 263,7
struct list_head *n;
struct pci_dev *dev;
 
WARN_ON(in_interrupt());
//WARN_ON(in_interrupt());
spin_lock(&pci_bus_lock);
n = from ? from->global_list.prev : pci_devices.prev;
 
/shark/trunk/drivers/newpci/probe.c
371,7 → 371,7
child->subordinate = max;
pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);
}
 
sprintf26(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
 
return max;
671,6 → 671,8
 
b->subordinate = pci_scan_child_bus(b);
 
cprintf("PCI: Pci Bus Add Devices\n");
 
pci_bus_add_devices(b);
 
return b;
/shark/trunk/drivers/newpci/pci.c
1,5 → 1,5
/*
* $Id: pci.c,v 1.4 2004-01-30 18:30:24 giacomo Exp $
* $Id: pci.c,v 1.5 2004-02-23 14:23:57 giacomo Exp $
*
* PCI Bus Services, see include/linux/pci.h for further explanation.
*
724,7 → 724,7
pci_fixup_device(PCI_FIXUP_FINAL, dev);
}
 
dev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET,NULL);
dev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET << 8,NULL);
 
printk("Find %x\n",(int)(dev));
 
/shark/trunk/drivers/newpci/bus.c
91,9 → 91,12
* Skip already-present devices (which are on the
* global device list.)
*/
if (!list_empty(&dev->global_list))
 
cprintf("Dev Vendor %x Device %x\n",dev->vendor,dev->device);
if (!list_empty(&dev->global_list))
continue;
 
device_add(&dev->dev);
 
spin_lock(&pci_bus_lock);
107,16 → 110,18
list_for_each_entry(dev, &bus->devices, bus_list) {
 
BUG_ON(list_empty(&dev->global_list));
 
/*
* If there is an unattached subordinate bus, attach
* it and then scan for unattached PCI devices.
*/
if (dev->subordinate && list_empty(&dev->subordinate->node)) {
spin_lock(&pci_bus_lock);
 
spin_lock(&pci_bus_lock);
list_add_tail(&dev->subordinate->node, &dev->bus->children);
spin_unlock(&pci_bus_lock);
pci_bus_add_devices(dev->subordinate);
 
}
}
}