mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-20 06:06:23 +00:00
Merge branch 'svn-trunk'
This commit is contained in:
@@ -14,6 +14,11 @@ the previous version of the SCST QLogic target driver are:
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2061) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2081) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2281) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2089) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2289) },
|
||||
- Works in combination with Linux kernel v2.6.32 and later.
|
||||
|
||||
Known Bugs
|
||||
|
||||
+3
-1
@@ -996,9 +996,11 @@ static void exec_inquiry(struct vdisk_cmd *vcmd)
|
||||
resp_len = buf[3] + 6;
|
||||
} else if (0x80 == cmd->cdb[2]) { /* unit serial number */
|
||||
int usn_len = strlen(dev->usn);
|
||||
|
||||
buf[1] = 0x80;
|
||||
buf[3] = usn_len;
|
||||
strncpy((char *)&buf[4], dev->usn, usn_len);
|
||||
assert(4 + usn_len <= sizeof(buf));
|
||||
memcpy(&buf[4], dev->usn, usn_len);
|
||||
resp_len = buf[3] + 4;
|
||||
} else if (0x83 == cmd->cdb[2]) { /* device identification */
|
||||
int num = 4;
|
||||
|
||||
@@ -46,12 +46,12 @@ char *app_name;
|
||||
# endif
|
||||
#endif /* DEBUG */
|
||||
|
||||
bool log_daemon = true;
|
||||
unsigned long trace_flag = DEFAULT_LOG_FLAGS;
|
||||
#endif /* defined(DEBUG) || defined(TRACING) */
|
||||
|
||||
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
||||
|
||||
bool log_daemon = true;
|
||||
int transition_timeout = DEFAULT_TRANSITION_TIME;
|
||||
|
||||
static struct option const long_options[] = {
|
||||
@@ -519,8 +519,10 @@ int main(int argc, char **argv)
|
||||
PRINT_INFO("trace_flag %lx", trace_flag);
|
||||
#endif
|
||||
if (log_daemon) {
|
||||
#if defined(DEBUG) || defined(TRACING)
|
||||
trace_flag &= ~TRACE_TIME;
|
||||
trace_flag &= ~TRACE_PID;
|
||||
#endif
|
||||
|
||||
pid = fork();
|
||||
if (pid < 0) {
|
||||
|
||||
Reference in New Issue
Block a user