git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
scsi
/
osst.h
diff --git
a/drivers/scsi/osst.h
b/drivers/scsi/osst.h
index
b72e1c7
..
1e426f5
100644
(file)
--- a/
drivers/scsi/osst.h
+++ b/
drivers/scsi/osst.h
@@
-3,7
+3,6
@@
*/
#include <asm/byteorder.h>
*/
#include <asm/byteorder.h>
-#include <linux/config.h>
#include <linux/completion.h>
/* FIXME - rename and use the following two types or delete them!
#include <linux/completion.h>
/* FIXME - rename and use the following two types or delete them!
@@
-518,7
+517,8
@@
struct osst_buffer {
int writing;
int midlevel_result;
int syscall_result;
int writing;
int midlevel_result;
int syscall_result;
- struct scsi_request *last_SRpnt;
+ struct osst_request *last_SRpnt;
+ struct st_cmdstatus cmdstat;
unsigned char *b_data;
os_aux_t *aux; /* onstream AUX structure at end of each block */
unsigned short use_sg; /* zero or number of s/g segments for this adapter */
unsigned char *b_data;
os_aux_t *aux; /* onstream AUX structure at end of each block */
unsigned short use_sg; /* zero or number of s/g segments for this adapter */
@@
-626,6
+626,15
@@
struct osst_tape {
struct gendisk *drive;
} ;
struct gendisk *drive;
} ;
+/* scsi tape command */
+struct osst_request {
+ unsigned char cmd[MAX_COMMAND_SIZE];
+ unsigned char sense[SCSI_SENSE_BUFFERSIZE];
+ int result;
+ struct osst_tape *stp;
+ struct completion *waiting;
+};
+
/* Values of write_type */
#define OS_WRITE_DATA 0
#define OS_WRITE_EOD 1
/* Values of write_type */
#define OS_WRITE_DATA 0
#define OS_WRITE_EOD 1