Browse Source

change _pci_nbus=0 by default.

master
root 17 years ago
parent
commit
b7934b6d16
  1. 2
      Targets/Bonito2edev/conf/Bonito
  2. 5
      Targets/fcr_soc/pci/pci_machdep.c
  3. 5
      sys/dev/pci/pciconf.c

2
Targets/Bonito2edev/conf/Bonito

@ -135,7 +135,7 @@ pci* at pcibr?
#gt2 at localbus? base 6 #gt2 at localbus? base 6
# fxp normally only used for debugging (enable/disable both) # fxp normally only used for debugging (enable/disable both)
fxp* at pci? dev ? function ? # Intel 82559 Device fxp* at pci? dev ? function ? # Intel 82559 Device
#inphy* at mii? phy ? # Intel 82555 PHYs inphy* at mii? phy ? # Intel 82555 PHYs
rtl* at pci? dev ? function ? rtl* at pci? dev ? function ?
#uhci* at pci? dev ? function ? #uhci* at pci? dev ? function ?
#ohci0 at pci? dev ? function ? #ohci0 at pci? dev ? function ?

5
Targets/fcr_soc/pci/pci_machdep.c

@ -331,7 +331,8 @@ _pci_conf_writen(pcitag_t tag, int reg, pcireg_t data,int width)
*(volatile unsigned int *)PHYS_TO_UNCACHED(FCR_SOC_PCI_REGS_BASE + 0x1e0)=addr; *(volatile unsigned int *)PHYS_TO_UNCACHED(FCR_SOC_PCI_REGS_BASE + 0x1e0)=addr;
{ if(width!=4)
{
pcireg_t ori = *(volatile unsigned int *)PHYS_TO_UNCACHED(FCR_SOC_PCI_REGS_BASE + 0x1e4); pcireg_t ori = *(volatile unsigned int *)PHYS_TO_UNCACHED(FCR_SOC_PCI_REGS_BASE + 0x1e4);
pcireg_t mask = 0x0; pcireg_t mask = 0x0;
@ -352,8 +353,8 @@ _pci_conf_writen(pcitag_t tag, int reg, pcireg_t data,int width)
data = data << ((reg & 3) << 3); data = data << ((reg & 3) << 3);
data = (ori & mask) | data; data = (ori & mask) | data;
}
*(volatile unsigned int *)PHYS_TO_UNCACHED(FCR_SOC_PCI_REGS_BASE + 0x1e4)=data; *(volatile unsigned int *)PHYS_TO_UNCACHED(FCR_SOC_PCI_REGS_BASE + 0x1e4)=data;
}
} }

5
sys/dev/pci/pciconf.c

@ -104,11 +104,8 @@ pcitag_t have_vga = 0; /* Have tag if VGA board found */
int monarch_mode = 1; /* Default as master on the bus! */ int monarch_mode = 1; /* Default as master on the bus! */
int pci_roots; /* How many pci roots to init */ int pci_roots; /* How many pci roots to init */
int _pciverbose = _PCIVERBOSE; int _pciverbose = _PCIVERBOSE;
#ifdef BONITOEL
static int _pci_nbus = 0; /* Allow for eight roots */ static int _pci_nbus = 0; /* Allow for eight roots */
#else
static int _pci_nbus = 8; /* Allow for eight roots */
#endif
struct tgt_bus_space def_bus_iot; /* Default bus tags */ struct tgt_bus_space def_bus_iot; /* Default bus tags */
struct tgt_bus_space def_bus_memt; /* Default bus tags */ struct tgt_bus_space def_bus_memt; /* Default bus tags */
struct pci_device *_pci_head; struct pci_device *_pci_head;

Loading…
Cancel
Save