Remove some horrible #if 0'd code that has no hope of working now. It
used to edit the old-style isa_devtab config tables to insert a mapping for a pci device into the isa tables so that the wdc driver could probe it later. This has been #if 0'd since April.
This commit is contained in:
parent
bfc8775abb
commit
acf5b0bacb
@ -1572,77 +1572,6 @@ ide_pci_attach(pcici_t tag, int unit)
|
||||
wddma[unit].wdd_iobase = ide_pci_iobase;
|
||||
wddma[unit].wdd_altiobase = ide_pci_altiobase;
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* This code below is mighty bogus. The config entries for the
|
||||
* isa_devtab_bio are plugged in before the standard ISA bios scan.
|
||||
* This is our "hack" way to simulate a dynamic assignment of I/O
|
||||
* addresses, from a PCI device to an ISA probe. Sorry :-).
|
||||
*/
|
||||
if (iobase_wd_1 != IO_WD1) {
|
||||
struct isa_device *dvp, *dvp1, *dvup;
|
||||
for( dvp = isa_devtab_bio;
|
||||
dvp->id_id != 0;
|
||||
dvp++) {
|
||||
if ((dvp->id_driver == &wdcdriver) && (dvp->id_iobase == 0)) {
|
||||
int biotabunit;
|
||||
biotabunit = dvp->id_unit * 2;
|
||||
dvp->id_iobase = iobase_wd_1;
|
||||
dvp1 = dvp + 1;
|
||||
dvp1->id_iobase = iobase_wd_2;
|
||||
printf("ide_pci%d: adding drives to controller %d:",
|
||||
unit, biotabunit);
|
||||
for(dvup = isa_biotab_wdc;
|
||||
dvup->id_id != 0;
|
||||
dvup++) {
|
||||
if (dvup->id_driver != &wdcdriver)
|
||||
continue;
|
||||
if (dvup->id_unit != biotabunit)
|
||||
continue;
|
||||
|
||||
dvup->id_iobase = dvp->id_iobase;
|
||||
printf(" %d", dvup->id_unit);
|
||||
dvup++;
|
||||
|
||||
pci_map_int(tag, wdintr, (void *) dvp->id_unit, &bio_imask);
|
||||
if (dvup->id_id == 0)
|
||||
break;
|
||||
|
||||
if (dvup->id_unit == biotabunit + 1) {
|
||||
dvup->id_iobase = dvp->id_iobase;
|
||||
printf(" %d", dvup->id_unit);
|
||||
dvup++;
|
||||
if (dvup->id_id == 0) {
|
||||
iobase_wd_2 = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (dvup->id_unit == biotabunit + 2) {
|
||||
pci_map_int(tag, wdintr, (void *) ((int) dvp->id_unit + 1), &bio_imask);
|
||||
dvup->id_iobase = dvp1->id_iobase;
|
||||
printf(" %d", dvup->id_unit);
|
||||
dvup++;
|
||||
if (dvup->id_id == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (dvup->id_unit == biotabunit + 3) {
|
||||
pci_map_int(tag, wdintr, (void *) ((int) dvp->id_unit + 1), &bio_imask);
|
||||
dvup->id_iobase = dvp1->id_iobase;
|
||||
printf(" %d", dvup->id_unit);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
printf("\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
bmista_1 = inb(iobase_bm_1 + BMISTA_PORT);
|
||||
bmista_2 = inb(iobase_bm_2 + BMISTA_PORT);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user