Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a XS_CTL_SILENT_NODEV flag: if the sense info is "not ready, medium

Browse Source 
not present" don't print any message but still return ENODEV.
Use this in cd driver to allow open of character raw partition even if
the drive is empty (older drives fails at LOAD_UNLOAD time, newer
ones fail at TEST_UNIT_READY time).
This commit is contained in:
bouyer 2001-06-26 15:32:02 +00:00
parent d54eb3a39d
commit 90d0e67408
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/scsipi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.150 2001/05/20 21:07:58 christos Exp $ */
/* $NetBSD: cd.c,v 1.151 2001/06/26 15:32:03 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -366,11 +366,15 @@ cdopen(dev, flag, fmt, p)
/* Check that it is still responding and ok. */
error = scsipi_test_unit_ready(periph,
XS_CTL_IGNORE_ILLEGAL_REQUEST | XS_CTL_IGNORE_MEDIA_CHANGE |
XS_CTL_IGNORE_NOT_READY);
XS_CTL_SILENT_NODEV);
SC_DEBUG(periph, SCSIPI_DB1,
("cdopen: scsipi_test_unit_ready, error=%d\n", error));
if (error)
if (error) {
if (part != RAW_PART || fmt != S_IFCHR)
goto bad3;
else
goto out;
}
/*
* Start the pack spinning if necessary. Always allow the

8
sys/dev/scsipi/scsipi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipi_base.c,v 1.45 2001/06/13 18:17:42 bjh21 Exp $ */
/* $NetBSD: scsipi_base.c,v 1.46 2001/06/26 15:32:02 bouyer Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@ -798,9 +798,11 @@ scsipi_interpret_sense(xs)
if ((xs->xs_control & XS_CTL_IGNORE_NOT_READY) != 0)
return (0);
if (sense->add_sense_code == 0x3A &&
sense->add_sense_code_qual == 0x00)
sense->add_sense_code_qual == 0x00) {
error = ENODEV; /* Medium not present */
else
if (xs->xs_control & XS_CTL_SILENT_NODEV)
return (error);
} else
error = EIO;
if ((xs->xs_control & XS_CTL_SILENT) != 0)
return (error);

32
sys/dev/scsipi/scsipiconf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipiconf.h,v 1.53 2001/06/13 18:17:42 bjh21 Exp $ */
/* $NetBSD: scsipiconf.h,v 1.54 2001/06/26 15:32:02 bouyer Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@ -538,21 +538,23 @@ struct scsipi_xfer {
0x00000080 /* ignore media change */
#define XS_CTL_IGNORE_ILLEGAL_REQUEST \
0x00000100 /* ignore ILLEGAL REQUEST */
#define XS_CTL_RESET 0x00000200 /* reset the device */
#define XS_CTL_DATA_UIO 0x00000400 /* xs_data points to uio */
#define XS_CTL_DATA_IN 0x00000800 /* data coming into memory */
#define XS_CTL_DATA_OUT 0x00001000 /* data going out of memory */
#define XS_CTL_TARGET 0x00002000 /* target mode operation */
#define XS_CTL_ESCAPE 0x00004000 /* escape operation */
#define XS_CTL_URGENT 0x00008000 /* urgent (recovery)
#define XS_CTL_SILENT_NODEV 0x00000200 /* don't print sense info
if sense info is nodev */
#define XS_CTL_RESET 0x00000400 /* reset the device */
#define XS_CTL_DATA_UIO 0x00000800 /* xs_data points to uio */
#define XS_CTL_DATA_IN 0x00001000 /* data coming into memory */
#define XS_CTL_DATA_OUT 0x00002000 /* data going out of memory */
#define XS_CTL_TARGET 0x00004000 /* target mode operation */
#define XS_CTL_ESCAPE 0x00008000 /* escape operation */
#define XS_CTL_URGENT 0x00010000 /* urgent (recovery)
operation */
#define XS_CTL_SIMPLE_TAG 0x00010000 /* use a Simple Tag */
#define XS_CTL_ORDERED_TAG 0x00020000 /* use an Ordered Tag */
#define XS_CTL_HEAD_TAG 0x00040000 /* use a Head of Queue Tag */
#define XS_CTL_THAW_PERIPH 0x00080000 /* thaw periph once enqueued */
#define XS_CTL_FREEZE_PERIPH 0x00100000 /* freeze periph when done */
#define XS_CTL_DATA_ONSTACK 0x00200000 /* data is alloc'ed on stack */
#define XS_CTL_REQSENSE 0x00400000 /* xfer is a request sense */
#define XS_CTL_SIMPLE_TAG 0x00020000 /* use a Simple Tag */
#define XS_CTL_ORDERED_TAG 0x00040000 /* use an Ordered Tag */
#define XS_CTL_HEAD_TAG 0x00080000 /* use a Head of Queue Tag */
#define XS_CTL_THAW_PERIPH 0x00100000 /* thaw periph once enqueued */
#define XS_CTL_FREEZE_PERIPH 0x00200000 /* freeze periph when done */
#define XS_CTL_DATA_ONSTACK 0x00400000 /* data is alloc'ed on stack */
#define XS_CTL_REQSENSE 0x00800000 /* xfer is a request sense */
#define XS_CTL_TAGMASK (XS_CTL_SIMPLE_TAG|XS_CTL_ORDERED_TAG|XS_CTL_HEAD_TAG)