Die struct scsi_device! Die! Instead, save a pointer to the routine

to interpret sense errors. This is initialized to the basic
interpretation routine, and specific scsi drivers (sd/st/cd) can
replace this with their own. While here kill EJUSTRETURN dance and
make more specialized interpretation routines directly call the
basic routine if desired.

Fixes by matthew@ to my first diff. Most original work by dlg@.

ok matthew@ marco@ dlg@

1 files changed, 5 insertions, 22 deletions

diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 0a26745ce76..08c8ef0fb40 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.129 2010/07/01 03:20:39 matthew Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.130 2010/07/01 05:11:18 krw Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $	*/
 
 /*
@@ -266,8 +266,6 @@ void		devid_free(struct devid *);
  *
  * each adapter type has a scsi_adapter struct. This describes the adapter and
  *    identifies routines that can be called to use the adapter.
- * each device type has a scsi_device struct. This describes the device and
- *    identifies routines that can be called to use the device.
  * each existing device position (scsibus + target + lun)
  *    can be described by a scsi_link struct.
  *    Only scsi positions that actually have devices, have a scsi_link
@@ -311,24 +309,6 @@ struct scsi_adapter {
 	int		(*ioctl)(struct scsi_link *, u_long, caddr_t, int);
 };
 
-/*
- * These entry points are called by the low-end drivers to get services from
- * whatever high-end drivers they are attached to.  Each device type has one
- * of these statically allocated.
- */
-struct scsi_device {
-	int	(*err_handler)(struct scsi_xfer *);
-			/* returns -1 to say err processing done */
-	void	(*start)(void *);
-
-	int	(*async)(void);
-	void	(*done)(struct scsi_xfer *);
-};
-
-/*
- *
- */
-
 struct scsi_runq_entry {
 	TAILQ_ENTRY(scsi_runq_entry) e;
 	u_int state;
@@ -417,7 +397,7 @@ struct scsi_link {
 #define	ADEV_NOCAPACITY		0x0800	/* no READ CD CAPACITY */
 #define	ADEV_NODOORLOCK		0x2000	/* can't lock door */
 #define SDEV_ONLYBIG		0x4000  /* always use READ_BIG and WRITE_BIG */
-	struct	scsi_device *device;	/* device entry points etc. */
+	int	(*interpret_sense)(struct scsi_xfer *);
 	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 */
@@ -625,6 +605,9 @@ struct scsi_xfer *	scsi_xs_get(struct scsi_link *, int);
 void			scsi_xs_exec(struct scsi_xfer *);
 int			scsi_xs_sync(struct scsi_xfer *);
 void			scsi_xs_put(struct scsi_xfer *);
+#ifdef SCSIDEBUG
+void			scsi_sense_print_debug(struct scsi_xfer *);
+#endif
 
 /*
  * iopool stuff