Catch up with ATA-mkIII

This commit is contained in:
Peter Grehan 2005-03-31 01:57:51 +00:00
parent 58aa36f31e
commit 05a016a3e1
3 changed files with 4 additions and 53 deletions

View file

@ -89,20 +89,7 @@ static driver_t ata_kauai_driver = {
};
DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, 0, 0);
static int
ata_kauai_locknoop(struct ata_channel *ch, int type)
{
/* XXX SMP ? */
return (0);
}
static void
ata_kauai_setmode(struct ata_device *atadev, int mode)
{
atadev->mode = ATA_PIO;
}
MODULE_DEPEND(ata, ata, 1, 1, 1);
/*
* PCI ID search table
@ -191,9 +178,6 @@ ata_kauai_probe(device_t dev)
ch->unit = 0;
ch->flags |= ATA_USE_16BIT|ATA_NO_SLAVE;
ch->locking = ata_kauai_locknoop;
ch->device[MASTER].setmode = ata_kauai_setmode;
ch->device[SLAVE].setmode = ata_kauai_setmode;
ata_generic_hw(ch);
return (ata_probe(dev));

View file

@ -79,22 +79,7 @@ static driver_t ata_macio_driver = {
};
DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, 0, 0);
static int
ata_macio_locknoop(struct ata_channel *ch, int type)
{
return (ch->unit);
}
static void
ata_macio_setmode(struct ata_device *atadev, int mode)
{
#if 0
atadev->mode = ata_limit_mode(atadev, mode, ATA_PIO_MAX);
#endif
atadev->mode = ATA_PIO;
}
MODULE_DEPEND(ata, ata, 1, 1, 1);
static int
ata_macio_probe(device_t dev)
@ -130,9 +115,6 @@ ata_macio_probe(device_t dev)
ch->unit = 0;
ch->flags |= ATA_USE_16BIT;
ch->locking = ata_macio_locknoop;
ch->device[MASTER].setmode = ata_macio_setmode;
ch->device[SLAVE].setmode = ata_macio_setmode;
ata_generic_hw(ch);
return (ata_probe(dev));

View file

@ -91,7 +91,7 @@ static driver_t ata_iobus_driver = {
static devclass_t ata_iobus_devclass;
DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, 0, 0);
MODULE_DEPEND(ata, ata, 1, 1, 1);
static int
ata_iobus_probe(device_t dev)
@ -230,19 +230,6 @@ static driver_t ata_iobus_sub_driver = {
DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, 0, 0);
static int
ata_iobus_locknoop(struct ata_channel *ch, int type)
{
return (ch->unit);
}
static void
ata_iobus_setmode(struct ata_device *atadev, int mode)
{
atadev->mode = ATA_PIO;
}
static int
ata_iobus_sub_probe(device_t dev)
{
@ -251,9 +238,7 @@ ata_iobus_sub_probe(device_t dev)
/* Only a single unit per controller thus far */
ch->unit = 0;
ch->flags = (ATA_USE_16BIT|ATA_NO_SLAVE);
ch->locking = ata_iobus_locknoop;
ch->device[MASTER].setmode = ata_iobus_setmode;
ch->device[SLAVE].setmode = ata_iobus_setmode;
ata_generic_hw(ch);
return ata_probe(dev);
}