wok annotate linux/stuff/scsi.patch @ rev 6389
Fixed some depends problems when building gtk-vnc. Like added libtasn1 to libtasn1-dev. Some builds need the .so files and the headers.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Thu Sep 23 18:31:29 2010 +0000 (2010-09-23) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@6293 | 1 diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h |
| slaxemulator@6293 | 2 --- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000 |
| slaxemulator@6293 | 3 +++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000 |
| slaxemulator@6293 | 4 @@ -145,14 +145,15 @@ |
| slaxemulator@6293 | 5 |
| slaxemulator@6293 | 6 /* defined in T10 SCSI Primary Commands-2 (SPC2) */ |
| slaxemulator@6293 | 7 struct scsi_varlen_cdb_hdr { |
| slaxemulator@6293 | 8 - u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ |
| slaxemulator@6293 | 9 - u8 control; |
| slaxemulator@6293 | 10 - u8 misc[5]; |
| slaxemulator@6293 | 11 - u8 additional_cdb_length; /* total cdb length - 8 */ |
| slaxemulator@6293 | 12 + __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ |
| slaxemulator@6293 | 13 + __u8 control; |
| slaxemulator@6293 | 14 + __u8 misc[5]; |
| slaxemulator@6293 | 15 + __u8 additional_cdb_length; /* total cdb length - 8 */ |
| slaxemulator@6293 | 16 __be16 service_action; |
| slaxemulator@6293 | 17 /* service specific data follows */ |
| slaxemulator@6293 | 18 }; |
| slaxemulator@6293 | 19 |
| slaxemulator@6293 | 20 +#ifdef __KERNEL__ |
| slaxemulator@6293 | 21 static inline unsigned |
| slaxemulator@6293 | 22 scsi_varlen_cdb_length(const void *hdr) |
| slaxemulator@6293 | 23 { |
| slaxemulator@6293 | 24 @@ -168,6 +169,7 @@ |
| slaxemulator@6293 | 25 return (cmnd[0] == VARIABLE_LENGTH_CMD) ? |
| slaxemulator@6293 | 26 scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]); |
| slaxemulator@6293 | 27 } |
| slaxemulator@6293 | 28 +#endif |
| slaxemulator@6293 | 29 |
| slaxemulator@6293 | 30 /* |
| slaxemulator@6293 | 31 * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft |
| slaxemulator@6293 | 32 @@ -284,8 +286,10 @@ |
| slaxemulator@6293 | 33 SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */ |
| slaxemulator@6293 | 34 }; |
| slaxemulator@6293 | 35 |
| slaxemulator@6293 | 36 +#ifdef __KERNEL__ |
| slaxemulator@6293 | 37 /* Returns a human-readable name for the device */ |
| slaxemulator@6293 | 38 extern const char * scsi_device_type(unsigned type); |
| slaxemulator@6293 | 39 +#endif |
| slaxemulator@6293 | 40 |
| slaxemulator@6293 | 41 /* |
| slaxemulator@6293 | 42 * standard mode-select header prepended to all mode-select commands |