diff options
Diffstat (limited to 'sys/dev/ata/ata-all.h')
| -rw-r--r-- | sys/dev/ata/ata-all.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h index cdd4429..01b3eac 100644 --- a/sys/dev/ata/ata-all.h +++ b/sys/dev/ata/ata-all.h @@ -423,9 +423,7 @@ struct ata_request { struct ata_composite *composite; /* for composite atomic ops */ void *driver; /* driver specific */ TAILQ_ENTRY(ata_request) chain; /* list management */ -#ifdef ATA_CAM union ccb *ccb; -#endif }; /* define this for debugging request processing */ @@ -532,7 +530,6 @@ struct ata_resource { int offset; }; -#ifdef ATA_CAM struct ata_cam_device { u_int revision; int mode; @@ -540,7 +537,6 @@ struct ata_cam_device { u_int atapi; u_int caps; }; -#endif /* structure describing an ATA channel */ struct ata_channel { @@ -580,20 +576,13 @@ 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 struct cam_sim *sim; struct cam_path *path; struct ata_cam_device user[16]; /* User-specified settings */ struct ata_cam_device curr[16]; /* Current settings */ int requestsense; /* CCB waiting for SENSE. */ -#endif struct callout poll_callout; /* Periodic status poll. */ }; @@ -632,17 +621,7 @@ 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); -int ata_check_80pin(device_t dev, int mode); -#else void ata_cam_end_transaction(device_t dev, struct ata_request *request); -#endif /* ata-queue.c: */ int ata_controlcmd(device_t dev, u_int8_t command, u_int16_t feature, u_int64_t lba, u_int16_t count); @@ -685,11 +664,6 @@ extern uma_zone_t ata_request_zone; uma_zfree(ata_request_zone, request); \ } -/* macros for alloc/free of struct ata_composite */ -extern uma_zone_t ata_composite_zone; -#define ata_alloc_composite() uma_zalloc(ata_composite_zone, M_NOWAIT | M_ZERO) -#define ata_free_composite(composite) uma_zfree(ata_composite_zone, composite) - MALLOC_DECLARE(M_ATA); /* misc newbus defines */ |
