mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 19:50:31 -04:00
39 lines
1.3 KiB
C++
39 lines
1.3 KiB
C++
--- os_freebsd.cpp.orig 2008-03-04 23:09:47.000000000 +0100
|
|
+++ os_freebsd.cpp 2008-03-14 13:52:37.000000000 +0100
|
|
@@ -272,7 +272,6 @@
|
|
}
|
|
|
|
int highpoint_command_interface(__unused int fd, __unused smart_command_set command, __unused int select, __unused char *data) {
|
|
-{
|
|
return -1;
|
|
}
|
|
|
|
@@ -525,7 +524,7 @@
|
|
return -1;
|
|
}
|
|
|
|
- if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
|
|
+ if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
|
|
#if __FreeBSD_version > 500000
|
|
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
|
#endif
|
|
@@ -924,6 +923,7 @@
|
|
static const char * fbsd_dev_prefix = "/dev/";
|
|
static const char * fbsd_dev_ata_disk_prefix = "ad";
|
|
static const char * fbsd_dev_scsi_disk_plus = "da";
|
|
+static const char * fbsd_dev_scsi_pass = "pass";
|
|
static const char * fbsd_dev_scsi_tape1 = "sa";
|
|
static const char * fbsd_dev_scsi_tape2 = "nsa";
|
|
static const char * fbsd_dev_scsi_tape3 = "esa";
|
|
@@ -960,6 +960,11 @@
|
|
return CONTROLLER_ATA;
|
|
}
|
|
|
|
+ // form /dev/pass* or pass*
|
|
+ if (!strncmp(fbsd_dev_scsi_pass, dev_name,
|
|
+ strlen(fbsd_dev_scsi_pass)))
|
|
+ goto handlescsi;
|
|
+
|
|
// form /dev/da* or da*
|
|
if (!strncmp(fbsd_dev_scsi_disk_plus, dev_name,
|
|
strlen(fbsd_dev_scsi_disk_plus)))
|