Clear up trailing NULs in cam_strvis.

cam_xpt.c:
	Nuke an experimental quirk entry for the Toshiba 3401.  The real
	problem with this device turned out to be a bug in the aic7xxx
	driver that was fixed months ago.

	Add a quirk entry to inhibit multiple lun scanning and serial number
	probing of DPT RAID volumes.  My DPT controller hangs up solid when
	I do either of these things to a RAID 1 volume.
This commit is contained in:
Justin T. Gibbs 1998-09-22 04:53:23 +00:00
parent b19042b569
commit 53b062d3cc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=39552
2 changed files with 13 additions and 12 deletions

View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: cam.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
*/
#include <sys/param.h>
@ -35,10 +35,11 @@ void
cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen)
{
/* Trim leading/trailing spaces. */
/* Trim leading/trailing spaces, nulls. */
while (srclen > 0 && src[0] == ' ')
src++, srclen--;
while (srclen > 0 && src[srclen-1] == ' ')
while (srclen > 0
&& (src[srclen-1] == ' ' || src[srclen-1] == '\0'))
srclen--;
while (srclen > 0 && dstlen > 1) {

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cam_xpt.c,v 1.8 1998/09/20 05:03:34 gibbs Exp $
* $Id: cam_xpt.c,v 1.9 1998/09/20 07:14:36 gibbs Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@ -273,14 +273,6 @@ static struct xpt_quirk_entry xpt_quirk_table[] =
{ T_DIRECT, SIP_MEDIA_FIXED, "SAMSUNG", "WN321010S*", "*" },
/*quirks*/0, /*mintags*/0, /*maxtags*/32
},
{
/* Doesn't understand EVP Serial Requests */
{
T_CDROM, SIP_MEDIA_REMOVABLE,
"TOSHIBA", "CD-ROM XM-3401TA", "1094"
},
CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0
},
{
/*
* Hack until multiple-luns are supported by
@ -292,6 +284,14 @@ static struct xpt_quirk_entry xpt_quirk_table[] =
},
CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
},
{
/* I can't believe I need a quirk for DPT volumes. */
{
T_ANY, SIP_MEDIA_FIXED|SIP_MEDIA_REMOVABLE,
"DPT", "*", "*"
},
CAM_QUIRK_NOSERIAL|CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/64
},
{
/* Really only one LUN */
{