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.
This commit is contained in:
Andrew Gallatin 1999-11-03 22:43:03 +00:00
parent 1dd0feaaab
commit 870c4cf8eb
2 changed files with 8 additions and 8 deletions

View File

@ -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))

View File

@ -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))