diff options
| author | gallatin <gallatin@FreeBSD.org> | 1999-11-03 22:43:03 +0000 |
|---|---|---|
| committer | gallatin <gallatin@FreeBSD.org> | 1999-11-03 22:43:03 +0000 |
| commit | bcba2990f6a91d0d17dec4f2a80284c96614b615 (patch) | |
| tree | 964b3306a4e84626b0e09947425aadab1d71f5c1 /sys/pci/pci.c | |
| parent | fcbe1d0da9ff9c517d80e36af909b350125ddfac (diff) | |
| download | FreeBSD-src-bcba2990f6a91d0d17dec4f2a80284c96614b615.zip FreeBSD-src-bcba2990f6a91d0d17dec4f2a80284c96614b615.tar.gz | |
now that a map's base addr is 64-bits, the alpha multi-hose hack needs
to be cast to 64-bits in pci_add_map. This should allow XP1000s and
DS20s to boot -current again.
Diffstat (limited to 'sys/pci/pci.c')
| -rw-r--r-- | sys/pci/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 2e6d548..8cb5943 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -1034,15 +1034,15 @@ pci_add_map(device_t dev, pcicfgregs* cfg, int reg) if(cfg->hose){ if (base & 0x80000000) { - printf("base addr = 0x%x\n", base); - printf("hacked addr = 0x%x\n", - base | (cfg->hose << 31)); + printf("base addr = 0x%lx\n", base); + printf("hacked addr = 0x%lx\n", + base | ((u_int64_t)cfg->hose << 31)); panic("hose encoding hack would clobber base addr"); } if (cfg->hose > 1) panic("only one hose supported!"); - base |= (cfg->hose << 31); + base |= ((u_int64_t)cfg->hose << 31); } #endif if (type == SYS_RES_IOPORT && !pci_porten(cfg)) |
