diff options
| author | mav <mav@FreeBSD.org> | 2013-04-03 14:10:37 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2013-04-03 14:10:37 +0000 |
| commit | 063bf308cb2ec26b1f4b759a118f66e69a148ccf (patch) | |
| tree | 38156049ae2337fa11f95c1476df4dd4feb7e018 /sys/dev/ata/ata-all.h | |
| parent | 57bb8435b3216ec811e89fbf9e461582bde10c46 (diff) | |
| download | FreeBSD-src-063bf308cb2ec26b1f4b759a118f66e69a148ccf.zip FreeBSD-src-063bf308cb2ec26b1f4b759a118f66e69a148ccf.tar.gz | |
Add some more ATA_CAM ifdefs.
Submitted by: marius (partially)
MFC after: 1 week
Diffstat (limited to 'sys/dev/ata/ata-all.h')
| -rw-r--r-- | sys/dev/ata/ata-all.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h index be166df..cdd4429 100644 --- a/sys/dev/ata/ata-all.h +++ b/sys/dev/ata/ata-all.h @@ -580,9 +580,11 @@ struct ata_channel { #define ATA_ACTIVE 0x0001 #define ATA_STALL_QUEUE 0x0002 +#ifndef ATA_CAM struct mtx queue_mtx; /* queue lock */ TAILQ_HEAD(, ata_request) ata_queue; /* head of ATA queue */ struct ata_request *freezepoint; /* composite freezepoint */ +#endif struct ata_request *running; /* currently running request */ struct task conntask; /* PHY events handling task */ #ifdef ATA_CAM @@ -621,24 +623,24 @@ int ata_resume(device_t dev); void ata_interrupt(void *data); int ata_device_ioctl(device_t dev, u_long cmd, caddr_t data); int ata_getparam(struct ata_device *atadev, int init); -int ata_identify(device_t dev); void ata_default_registers(device_t dev); -void ata_modify_if_48bit(struct ata_request *request); void ata_udelay(int interval); const char *ata_unit2str(struct ata_device *atadev); const char *ata_mode2str(int mode); +void ata_setmode(device_t dev); +void ata_print_cable(device_t dev, u_int8_t *who); int ata_str2mode(const char *str); const char *ata_satarev2str(int rev); int ata_atapi(device_t dev, int target); +#ifndef ATA_CAM +int ata_identify(device_t dev); +void ata_modify_if_48bit(struct ata_request *request); int ata_pmode(struct ata_params *ap); int ata_wmode(struct ata_params *ap); int ata_umode(struct ata_params *ap); int ata_limit_mode(device_t dev, int mode, int maxmode); -void ata_setmode(device_t dev); -void ata_print_cable(device_t dev, u_int8_t *who); int ata_check_80pin(device_t dev, int mode); -#ifdef ATA_CAM -void ata_cam_begin_transaction(device_t dev, union ccb *ccb); +#else void ata_cam_end_transaction(device_t dev, struct ata_request *request); #endif |
