diff options
| author | mjacob <mjacob@cvs.openbsd.org> | 1999-11-22 12:55:17 +0000 |
|---|---|---|
| committer | mjacob <mjacob@cvs.openbsd.org> | 1999-11-22 12:55:17 +0000 |
| commit | d63ab4280f47eaf13561f0422620793d9c5d80e1 (patch) | |
| tree | 26851fd94b538442ae48f2ff289e3d726dac5433 /sys/scsi | |
| parent | 57327e6168a5d748c7403a8477e8c6e2c28706fe (diff) | |
In order to support Fibre Channel fabric fatten scsi target id's to 16 bits.
Also, to support at least first level SCSI-3 hierarchical luns, fatten luns
to 16 bits too.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/scsiconf.c | 4 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index f69daef006d..36d1f3bb304 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.45 1999/07/24 23:56:43 deraadt Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.46 1999/11/22 12:55:16 mjacob Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -224,7 +224,7 @@ scsi_probe_bus(bus, target, lun) { struct scsibus_softc *scsi; int maxtarget, mintarget, maxlun, minlun; - u_int8_t scsi_addr; + u_int16_t scsi_addr; if (bus < 0 || bus >= scsibus_cd.cd_ndevs) return ENXIO; diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 7c7333e50a1..1b3b94b218b 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.19 1999/07/25 07:09:19 csapuntz Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.20 1999/11/22 12:55:16 mjacob Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -146,12 +146,12 @@ struct scsi_device { struct scsi_link { u_int8_t scsi_version; /* SCSI-I, SCSI-II, etc. */ u_int8_t scsibus; /* the Nth scsibus */ - u_int8_t target; /* targ of this dev */ - u_int8_t lun; /* lun of this dev */ - u_int8_t adapter_target; /* what are we on the scsi bus */ - u_int8_t adapter_buswidth; /* 8 (regular) or 16 (wide). (0 becomes 8) */ - u_int8_t openings; /* available operations */ - u_int8_t active; /* operations in progress */ + u_int16_t target; /* targ of this dev */ + u_int16_t lun; /* lun of this dev */ + u_int16_t adapter_target; /* what are we on the scsi bus */ + u_int16_t adapter_buswidth; /* 8 (regular) or 16 (wide). (0 becomes 8) */ + u_int16_t openings; /* available operations */ + u_int16_t active; /* operations in progress */ u_int16_t flags; /* flags that all devices have */ #define SDEV_REMOVABLE 0x0001 /* media is removable */ #define SDEV_MEDIA_LOADED 0x0002 /* device figures are still valid */ @@ -208,7 +208,7 @@ struct scsibus_softc { struct scsi_link *adapter_link; /* prototype supplied by adapter */ struct scsi_link ***sc_link; u_int16_t moreluns; - u_int8_t sc_buswidth; + u_int16_t sc_buswidth; }; /* |