diff options
| author | marius <marius@FreeBSD.org> | 2012-03-21 08:57:15 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2012-03-21 08:57:15 +0000 |
| commit | 7bb0bdde2aed9f58ebdd5abcb420f0ee56889988 (patch) | |
| tree | 66c819f0be7ba838256f4040de6ff1668299d3a5 /sys/dev/ata/ata-pci.h | |
| parent | 2212d818f3c973321979ab28ae07330eb759d324 (diff) | |
| download | FreeBSD-src-7bb0bdde2aed9f58ebdd5abcb420f0ee56889988.zip FreeBSD-src-7bb0bdde2aed9f58ebdd5abcb420f0ee56889988.tar.gz | |
Remove remnants of ATA_LOCKING uses in the ATA_CAM case and wrap it
along with functions, SYSCTLs and tunables that are not used with
ATA_CAM in #ifndef ATA_CAM, similar to the existing #ifdef'ed ATA_CAM
code for the other way around. This makes it easier to understand
which parts of ata(4) actually are used in the new world order and
to later on remove the !ATA_CAM bits. It also makes it obvious that
there is something fishy with the C-bus front-end as well as in the
ATP850 support, as these used ATA_LOCKING which is defunct in the
ATA_CAM case. When fixing the former, ATA_LOCKING probably needs to
be brought back in some form or other.
Reviewed by: mav
MFC after: 1 week
Diffstat (limited to 'sys/dev/ata/ata-pci.h')
| -rw-r--r-- | sys/dev/ata/ata-pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h index 43a4950..81aee6a 100644 --- a/sys/dev/ata/ata-pci.h +++ b/sys/dev/ata/ata-pci.h @@ -62,7 +62,9 @@ struct ata_pci_controller { int (*ch_detach)(device_t); int (*ch_suspend)(device_t); int (*ch_resume)(device_t); +#ifndef ATA_CAM int (*locking)(device_t, int); +#endif void (*reset)(device_t); int (*setmode)(device_t, int, int); int (*getrev)(device_t, int); |
