aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-08-28 12:27:01 -0400
committerJames Bottomley <jejb@titanic.(none)>2005-08-28 12:27:01 -0400
commit1cf72699c1530c3e4ac3d58344f6a6a40a2f46d3 (patch)
tree501f88d32efe275560c2df1f6c7c6bacf72af4cf /include/scsi
parent7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c (diff)
[SCSI] convert the remaining mid-layer pieces to scsi_execute_req
After this, we just have some drivers, all the ULDs and the SPI transport class using scsi_wait_req(). Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_device.h13
-rw-r--r--include/scsi/scsi_request.h15
2 files changed, 11 insertions, 17 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 835af8ecbb7..9181068883c 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -8,9 +8,17 @@
8 8
9struct request_queue; 9struct request_queue;
10struct scsi_cmnd; 10struct scsi_cmnd;
11struct scsi_mode_data;
12struct scsi_lun; 11struct scsi_lun;
13 12
13struct scsi_mode_data {
14 __u32 length;
15 __u16 block_descriptor_length;
16 __u8 medium_type;
17 __u8 device_specific;
18 __u8 header_length;
19 __u8 longlba:1;
20};
21
14/* 22/*
15 * sdev state: If you alter this, you also need to alter scsi_sysfs.c 23 * sdev state: If you alter this, you also need to alter scsi_sysfs.c
16 * (for the ascii descriptions) and the state model enforcer: 24 * (for the ascii descriptions) and the state model enforcer:
@@ -228,7 +236,8 @@ extern int scsi_set_medium_removal(struct scsi_device *, char);
228 236
229extern int scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage, 237extern int scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
230 unsigned char *buffer, int len, int timeout, 238 unsigned char *buffer, int len, int timeout,
231 int retries, struct scsi_mode_data *data); 239 int retries, struct scsi_mode_data *data,
240 char *sense);
232extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, 241extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout,
233 int retries); 242 int retries);
234extern int scsi_device_set_state(struct scsi_device *sdev, 243extern int scsi_device_set_state(struct scsi_device *sdev,
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index d64903a617c..f5dfdfec9fe 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -58,19 +58,4 @@ extern int scsi_execute_req(struct scsi_device *sdev, unsigned char *cmd,
58 int data_direction, void *buffer, unsigned bufflen, 58 int data_direction, void *buffer, unsigned bufflen,
59 unsigned char *sense, int timeout, int retries); 59 unsigned char *sense, int timeout, int retries);
60 60
61struct scsi_mode_data {
62 __u32 length;
63 __u16 block_descriptor_length;
64 __u8 medium_type;
65 __u8 device_specific;
66 __u8 header_length;
67 __u8 longlba:1;
68};
69
70extern int __scsi_mode_sense(struct scsi_request *SRpnt, int dbd,
71 int modepage, unsigned char *buffer, int len,
72 int timeout, int retries,
73 struct scsi_mode_data *data);
74
75
76#endif /* _SCSI_SCSI_REQUEST_H */ 61#endif /* _SCSI_SCSI_REQUEST_H */