patch-2.4.22 linux-2.4.22/arch/mips/hp-lj/pci.c
Next file: linux-2.4.22/arch/mips/hp-lj/setup.c
Previous file: linux-2.4.22/arch/mips/hp-lj/pci-dma.c
Back to the patch index
Back to the overall index
- Lines: 63
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/hp-lj/pci.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.21/arch/mips/hp-lj/pci.c linux-2.4.22/arch/mips/hp-lj/pci.c
@@ -77,7 +77,7 @@
if (where & 1)
return PCIBIOS_BAD_REGISTER_NUMBER;
*pci_config_address_reg = cfgaddr(dev, where);
- *(volatile u16 *)(((int)pci_config_data_reg) + (where & 2)) =
+ *(volatile u16 *)(((int)pci_config_data_reg) + (where & 2)) =
le16_to_cpu(val);
//printk("pci_write_word 0x%x = 0x%x\n", where, val);
return PCIBIOS_SUCCESSFUL;
@@ -158,9 +158,9 @@
case AndrosAsic: pci_regs_base_offset = 0xbff80000; break;
case HarmonyAsic: pci_regs_base_offset = 0xbff70000; break;
default:
- printk("ERROR: PCI does not support %s Asic\n", GetAsicName());
+ printk("ERROR: PCI does not support %s Asic\n", GetAsicName());
while(1);
- break;
+ break;
}
// set bus stat/command reg
@@ -176,7 +176,7 @@
// KLUDGE (mips_io_port_base is screwed up, we've got to work around it here)
// by letting both low (illegal) and high (legal) addresses appear in pci io space
- ioport_resource.start = 0x0;
+ ioport_resource.start = 0x0;
set_io_port_base(IO_PORT_LOGICAL_START + IO_PORT_VIRTUAL_OFFSET);
@@ -185,7 +185,7 @@
// except that the range is outside user space
// parameters: lo0, lo1, hi, pagemask
// lo indicates physical page, hi indicates virtual address
- add_wired_entry((IO_MEM_LOGICAL_START >> 6) | 0x17,
+ add_wired_entry((IO_MEM_LOGICAL_START >> 6) | 0x17,
((IO_MEM_LOGICAL_START + (16 * ONE_MEG)) >> 6) | 0x17,
0xee000000, PM_16M);
@@ -203,7 +203,7 @@
int bases;
printk("adjusting pci device: %s\n", dev->name);
-
+
switch (dev->hdr_type) {
case PCI_HEADER_TYPE_NORMAL: bases = 6; break;
case PCI_HEADER_TYPE_BRIDGE: bases = 2; break;
@@ -212,12 +212,12 @@
}
for (pos=0; pos < bases; pos++) {
struct resource* res = &dev->resource[pos];
- if (res->start >= IO_MEM_LOGICAL_START &&
+ if (res->start >= IO_MEM_LOGICAL_START &&
res->end <= IO_MEM_LOGICAL_END) {
res->start += IO_MEM_VIRTUAL_OFFSET;
res->end += IO_MEM_VIRTUAL_OFFSET;
}
- if (res->start >= IO_PORT_LOGICAL_START &&
+ if (res->start >= IO_PORT_LOGICAL_START &&
res->end <= IO_PORT_LOGICAL_END) {
res->start += IO_PORT_VIRTUAL_OFFSET;
res->end += IO_PORT_VIRTUAL_OFFSET;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)