mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-01-24 02:22:15 +08:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
|
|
--- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000
|
|
+++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000
|
|
@@ -145,14 +145,15 @@
|
|
|
|
/* defined in T10 SCSI Primary Commands-2 (SPC2) */
|
|
struct scsi_varlen_cdb_hdr {
|
|
- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
|
|
- u8 control;
|
|
- u8 misc[5];
|
|
- u8 additional_cdb_length; /* total cdb length - 8 */
|
|
+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
|
|
+ __u8 control;
|
|
+ __u8 misc[5];
|
|
+ __u8 additional_cdb_length; /* total cdb length - 8 */
|
|
__be16 service_action;
|
|
/* service specific data follows */
|
|
};
|
|
|
|
+#ifdef __KERNEL__
|
|
static inline unsigned
|
|
scsi_varlen_cdb_length(const void *hdr)
|
|
{
|
|
@@ -168,6 +169,7 @@
|
|
return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
|
|
scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
|
|
}
|
|
+#endif
|
|
|
|
/*
|
|
* SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
|
|
@@ -284,8 +286,10 @@
|
|
SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
|
|
};
|
|
|
|
+#ifdef __KERNEL__
|
|
/* Returns a human-readable name for the device */
|
|
extern const char * scsi_device_type(unsigned type);
|
|
+#endif
|
|
|
|
/*
|
|
* standard mode-select header prepended to all mode-select commands
|