wok-6.x view linux/stuff/scsi.patch @ rev 6459

firefox-dev: wipe old versions
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Sep 29 15:38:02 2010 +0200 (2010-09-29)
parents
children
line source
1 diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
2 --- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000
3 +++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000
4 @@ -145,14 +145,15 @@
5
6 /* defined in T10 SCSI Primary Commands-2 (SPC2) */
7 struct scsi_varlen_cdb_hdr {
8 - u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
9 - u8 control;
10 - u8 misc[5];
11 - u8 additional_cdb_length; /* total cdb length - 8 */
12 + __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
13 + __u8 control;
14 + __u8 misc[5];
15 + __u8 additional_cdb_length; /* total cdb length - 8 */
16 __be16 service_action;
17 /* service specific data follows */
18 };
19
20 +#ifdef __KERNEL__
21 static inline unsigned
22 scsi_varlen_cdb_length(const void *hdr)
23 {
24 @@ -168,6 +169,7 @@
25 return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
26 scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
27 }
28 +#endif
29
30 /*
31 * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
32 @@ -284,8 +286,10 @@
33 SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
34 };
35
36 +#ifdef __KERNEL__
37 /* Returns a human-readable name for the device */
38 extern const char * scsi_device_type(unsigned type);
39 +#endif
40
41 /*
42 * standard mode-select header prepended to all mode-select commands