diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-11-20 07:34:52 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-11-20 07:34:52 +0000 |
| commit | 7305a2374355204e00312e8fc9ad302c266d58fe (patch) | |
| tree | 474a5ea1cc6fc54c009b232560c400a305f2d42d | |
| parent | 93b1293e197234e716c04d7a400ff5dbd5864cd4 (diff) | |
limit luns on usb
| -rw-r--r-- | sys/dev/usb/umass.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 3 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.c | 5 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index d00ef26e983..150d93f35fc 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.6 2000/04/14 22:50:28 aaron Exp $ */ +/* $OpenBSD: umass.c,v 1.7 2000/11/20 07:34:51 deraadt Exp $ */ /* $NetBSD: umass.c,v 1.33 2000/04/06 13:52:04 augustss Exp $ */ /*- * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>, @@ -1084,6 +1084,7 @@ USB_ATTACH(umass) sc->u.sc_link.adapter_buswidth = 2; sc->u.sc_link.adapter_target = UMASS_SCSIID_HOST; + sc->u.sc_link.maxlun = sc->maxlun; #endif sc->u.sc_link.adapter_softc = sc; diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 7fe74298084..9d548eaf766 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.26 2000/11/16 19:00:15 aaron Exp $ +$OpenBSD: usbdevs,v 1.27 2000/11/20 07:34:51 deraadt Exp $ /* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */ /* @@ -510,6 +510,7 @@ product INSYSTEM USBCABLE 0x081a USB cable /* Intel products */ product INTEL TESTBOARD 0x9890 82930 test board +product INTEL EASYPC_CAMERA 0x0110 Easy PC Camera /* I/O DATA products */ product IODATA USBETTX 0x0904 USB ETTX diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 3f002877821..aa8433ead5b 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.52 2000/04/18 05:53:17 csapuntz Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.53 2000/11/20 07:34:51 deraadt Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -292,7 +292,7 @@ scsi_probe_bus(bus, target, lun) } if (lun == -1) { - maxlun = 7; + maxlun = scsi->adapter_link->maxlun; minlun = 0; } else { if (lun < 0 || lun > 7) @@ -810,6 +810,7 @@ scsi_probedev(scsi, target, lun) (sc_link->quirks & SDEV_FORCELUNS) == 0) sc_link->quirks |= SDEV_NOLUNS; sc_link->scsi_version = inqbuf.version; + sc_link->maxlun = 7; if ((sc_link->quirks & SDEV_NOLUNS) == 0) scsi->moreluns |= (1 << target); diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 3b70476a18c..45dceedc60f 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.23 2000/07/06 03:37:10 mjacob Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.24 2000/11/20 07:34:51 deraadt Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -187,6 +187,7 @@ struct scsi_link { void *device_softc; /* needed for call to foo_start */ struct scsi_adapter *adapter; /* adapter entry points etc. */ void *adapter_softc; /* needed for call to foo_scsi_cmd */ + u_char maxlun; }; int scsiprint __P((void *, const char *)); |