diff options
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/cam_debug.h | 6 | ||||
| -rw-r--r-- | sys/cam/cam_xpt.c | 6 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_low.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h index ecfeb3a..6465b2b 100644 --- a/sys/cam/cam_debug.h +++ b/sys/cam/cam_debug.h @@ -61,13 +61,13 @@ typedef enum { #endif #ifndef CAM_DEBUG_BUS -#define CAM_DEBUG_BUS (-1) +#define CAM_DEBUG_BUS CAM_BUS_WILDCARD #endif #ifndef CAM_DEBUG_TARGET -#define CAM_DEBUG_TARGET (-1) +#define CAM_DEBUG_TARGET CAM_TARGET_WILDCARD #endif #ifndef CAM_DEBUG_LUN -#define CAM_DEBUG_LUN (-1) +#define CAM_DEBUG_LUN CAM_LUN_WILDCARD #endif #ifndef CAM_DEBUG_DELAY diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 86e2f5e..87e8257 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1992,13 +1992,15 @@ xptplistperiphfunc(struct cam_periph *periph, void *arg) cdm->matches[j].result.periph_result.target_id = periph->path->target->target_id; else - cdm->matches[j].result.periph_result.target_id = -1; + cdm->matches[j].result.periph_result.target_id = + CAM_TARGET_WILDCARD; if (periph->path->device) cdm->matches[j].result.periph_result.target_lun = periph->path->device->lun_id; else - cdm->matches[j].result.periph_result.target_lun = -1; + cdm->matches[j].result.periph_result.target_lun = + CAM_LUN_WILDCARD; cdm->matches[j].result.periph_result.unit_number = periph->unit_number; diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c index 23dca05..6e6a2e9 100644 --- a/sys/cam/scsi/scsi_low.c +++ b/sys/cam/scsi/scsi_low.c @@ -4232,7 +4232,7 @@ scsi_low_print(slp, ti) if (ti != NULL) { u_int flags = 0, maxnqio = 0, nqio = 0; - int lun = -1; + int lun = CAM_LUN_WILDCARD; if (li != NULL) { |
