 @@ -1,41 +1,41 @@
-/*	$NetBSD: atapiconf.c,v 1.84 2012/04/06 17:12:45 chs Exp $	*/
+/*	$NetBSD: atapiconf.c,v 1.85 2012/04/19 17:45:20 bouyer Exp $	*/
 /*
  * Copyright (c) 1996, 2001 Manuel Bouyer.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.84 2012/04/06 17:12:45 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.85 2012/04/19 17:45:20 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsipiconf.h>
 #include <dev/scsipi/atapiconf.h>
 @@ -107,27 +107,28 @@ atapiprint(void *aux, const char *pnp)
 	if (pnp)
 		aprint_normal("atapibus at %s", pnp);
 	return (UNCONF);
+}
 static int
 atapibusmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct scsipi_channel *chan = aux;
 	if (chan == NULL)
 		return (0);
-	if (chan->chan_bustype->bustype_type != SCSIPI_BUSTYPE_ATAPI)
+	if (SCSIPI_BUSTYPE_TYPE(chan->chan_bustype->bustype_type) !=
 	    SCSIPI_BUSTYPE_ATAPI)
 		return (0);
 	return (1);
+}
 static int
 atapibussubmatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct scsipibus_attach_args *sa = aux;
 	struct scsipi_periph *periph = sa->sa_periph;
 	if (cf->cf_loc[ATAPIBUSCF_DRIVE] != ATAPIBUSCF_DRIVE_DEFAULT &&
 	    cf->cf_loc[ATAPIBUSCF_DRIVE] != periph->periph_target)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd.c,v 1.306 2012/02/25 10:17:14 shattered Exp $	*/
+/*	$NetBSD: cd.c,v 1.307 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
  * Inc.  All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * MMC framework implemented and contributed to the NetBSD Foundation by
  * Reinoud Zandijk.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -40,27 +40,27 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.306 2012/02/25 10:17:14 shattered Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.307 2012/04/19 17:45:20 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -241,28 +241,28 @@ cdmatch(device_t parent, cfdata_t match,
 static void
 cdattach(device_t parent, device_t self, void *aux)
+{
 	struct cd_softc *cd = device_private(self);
 	struct scsipibus_attach_args *sa = aux;
 	struct scsipi_periph *periph = sa->sa_periph;
 	SC_DEBUG(periph, SCSIPI_DB2, ("cdattach: "));
 	cd->sc_dev = self;
 	mutex_init(&cd->sc_lock, MUTEX_DEFAULT, IPL_NONE);
-	if (scsipi_periph_bustype(sa->sa_periph) == SCSIPI_BUSTYPE_SCSI &&
+	if (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(sa->sa_periph)) ==
-	    periph->periph_version == 0)
+	    SCSIPI_BUSTYPE_SCSI && periph->periph_version == 0)
 		cd->flags |= CDF_ANCIENT;
 	bufq_alloc(&cd->buf_queue, "disksort", BUFQ_SORT_RAWBLOCK);
 	callout_init(&cd->sc_callout, 0);
 	/*
 	 * Store information needed to contact our base driver
 	 */
 	cd->sc_periph = periph;
 	periph->periph_dev = cd->sc_dev;
 	periph->periph_switch = &cd_switch;
 @@ -1672,27 +1672,27 @@ static void
 cdgetdefaultlabel(struct cd_softc *cd, struct cd_formatted_toc *toc,
     struct disklabel *lp)
+{
 	int lastsession;
 	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize = cd->params.blksize;
 	lp->d_ntracks = 1;
 	lp->d_nsectors = 100;
 	lp->d_ncylinders = (cd->params.disksize / 100) + 1;
 	lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
-	switch (scsipi_periph_bustype(cd->sc_periph)) {
+	switch (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(cd->sc_periph))) {
 	case SCSIPI_BUSTYPE_SCSI:
 		lp->d_type = DTYPE_SCSI;
 		break;
 	case SCSIPI_BUSTYPE_ATAPI:
 		lp->d_type = DTYPE_ATAPI;
 		break;
+	}
 	/*
 	 * XXX
 	 * We could probe the mode pages to figure out what kind of disc it is.
 	 * Is this worthwhile?
 	 */
 	strncpy(lp->d_typename, "optical media", 16);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsiconf.c,v 1.265 2012/04/06 22:50:39 christos Exp $	*/
+/*	$NetBSD: scsiconf.c,v 1.266 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -38,27 +38,27 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.265 2012/04/06 22:50:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.266 2012/04/19 17:45:20 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/once.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/scsiio.h>
 @@ -104,27 +104,51 @@ extern struct cfdriver scsibus_cd;
 static dev_type_open(scsibusopen);
 static dev_type_close(scsibusclose);
 static dev_type_ioctl(scsibusioctl);
 const struct cdevsw scsibus_cdevsw = {
 	scsibusopen, scsibusclose, noread, nowrite, scsibusioctl,
 	nostop, notty, nopoll, nommap, nokqfilter, D_OTHER,
 };
 static int	scsibusprint(void *, const char *);
 static void	scsibus_config(struct scsipi_channel *, void *);
 const struct scsipi_bustype scsi_bustype = {
-	SCSIPI_BUSTYPE_SCSI,
+	SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_PSCSI),
 	scsi_scsipi_cmd,
 	scsipi_interpret_sense,
 	scsi_print_addr,
 	scsi_kill_pending,
 };
 const struct scsipi_bustype scsi_fc_bustype = {
 	SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_FC),
 	scsi_scsipi_cmd,
 	scsipi_interpret_sense,
 	scsi_print_addr,
 	scsi_kill_pending,
 };
 const struct scsipi_bustype scsi_sas_bustype = {
 	SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_SAS),
 	scsi_scsipi_cmd,
 	scsipi_interpret_sense,
 	scsi_print_addr,
 	scsi_kill_pending,
 };
 const struct scsipi_bustype scsi_usb_bustype = {
 	SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_USB),
 	scsi_scsipi_cmd,
 	scsipi_interpret_sense,
 	scsi_print_addr,
 	scsi_kill_pending,
 };
 static int
 scsibus_init(void)
+{
 	TAILQ_INIT(&scsi_initq_head);
 	mutex_init(&scsibus_qlock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&scsibus_qcv, "scsinitq");
 @@ -143,27 +167,28 @@ scsiprint(void *aux, const char *pnp)
 	/* don't print channel if the controller says there can be only one. */
 	if (adapt->adapt_nchannels != 1)
 		aprint_normal(" channel %d", chan->chan_channel);
 	return (UNCONF);
+}
 static int
 scsibusmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct scsipi_channel *chan = aux;
-	if (chan->chan_bustype->bustype_type != SCSIPI_BUSTYPE_SCSI)
+	if (SCSIPI_BUSTYPE_TYPE(chan->chan_bustype->bustype_type) !=
 	    SCSIPI_BUSTYPE_SCSI)
 		return 0;
 	if (cf->cf_loc[SCSICF_CHANNEL] != chan->chan_channel &&
 	    cf->cf_loc[SCSICF_CHANNEL] != SCSICF_CHANNEL_DEFAULT)
 		return (0);
 	return (1);
+}
 static void
 scsibusattach(device_t parent, device_t self, void *aux)
+{
 	struct scsibus_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsiconf.h,v 1.56 2008/07/16 18:50:58 drochner Exp $	*/
+/*	$NetBSD: scsiconf.h,v 1.57 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -54,21 +54,24 @@
 int	scsiprint(void *, const char *);
 struct scsibus_softc {
 	device_t sc_dev;
 	struct scsipi_channel *sc_channel;	/* our scsipi_channel */
 	int	sc_flags;
 };
 /* sc_flags */
 #define	SCSIBUSF_OPEN	0x00000001	/* bus is open */
 extern const struct scsipi_bustype scsi_bustype;
 extern const struct scsipi_bustype scsi_fc_bustype;
 extern const struct scsipi_bustype scsi_sas_bustype;
 extern const struct scsipi_bustype scsi_usb_bustype;
 int	scsi_change_def(struct scsipi_periph *, int);
 void	scsi_kill_pending(struct scsipi_periph *);
 void	scsi_print_addr(struct scsipi_periph *);
 int	scsi_probe_bus(struct scsibus_softc *, int, int);
 void	scsi_scsipi_cmd(struct scsipi_xfer *);
 #endif /* _DEV_SCSIPI_SCSICONF_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsipi_base.c,v 1.157 2012/04/18 20:37:49 bouyer Exp $	*/
+/*	$NetBSD: scsipi_base.c,v 1.158 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.157 2012/04/18 20:37:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.158 2012/04/19 17:45:20 bouyer Exp $");
 #include "opt_scsi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 @@ -2171,62 +2171,83 @@ scsipi_async_event(struct scsipi_channel
 /*
  * scsipi_print_xfer_mode:
+ *
  *	Print a periph's capabilities.
  */
 void
 scsipi_print_xfer_mode(struct scsipi_periph *periph)
+{
 	int period, freq, speed, mbs;
 	if ((periph->periph_flags & PERIPH_MODE_VALID) == 0)
 		return;
-	aprint_normal_dev(periph->periph_dev, "");
+	switch(scsipi_periph_bustype(periph)) {
-	if (periph->periph_mode & (PERIPH_CAP_SYNC | PERIPH_CAP_DT)) {
+	case SCSIPI_BUSTYPE_BUSTYPE(
-		period = scsipi_sync_factor_to_period(periph->periph_period);
+	    SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_PSCSI):
-		aprint_normal("sync (%d.%02dns offset %d)",
+		aprint_normal_dev(periph->periph_dev, "");
-		    period / 100, period % 100, periph->periph_offset);
+		if (periph->periph_mode & (PERIPH_CAP_SYNC | PERIPH_CAP_DT)) {
-	} else
+			period =
-		aprint_normal("async");
+			    scsipi_sync_factor_to_period(periph->periph_period);
 			aprint_normal("sync (%d.%02dns offset %d)",
-	if (periph->periph_mode & PERIPH_CAP_WIDE32)
+			    period / 100, period % 100, periph->periph_offset);
-		aprint_normal(", 32-bit");
+		} else
-	else if (periph->periph_mode & (PERIPH_CAP_WIDE16 | PERIPH_CAP_DT))
+			aprint_normal("async");
 		aprint_normal(", 16-bit");
 	else
 		aprint_normal(", 8-bit");
 	if (periph->periph_mode & (PERIPH_CAP_SYNC | PERIPH_CAP_DT)) {
 		freq = scsipi_sync_factor_to_freq(periph->periph_period);
 		speed = freq;
 		if (periph->periph_mode & PERIPH_CAP_WIDE32)
-			speed *= 4;
+			aprint_normal(", 32-bit");
-		else if (periph->periph_mode &
+		else if (
-		    (PERIPH_CAP_WIDE16 | PERIPH_CAP_DT))
+		    periph->periph_mode & (PERIPH_CAP_WIDE16 | PERIPH_CAP_DT))
-			speed *= 2;
+			aprint_normal(", 16-bit");
 		mbs = speed / 1000;
 		if (mbs > 0)
 			aprint_normal(" (%d.%03dMB/s)", mbs, speed % 1000);
 		else
-			aprint_normal(" (%dKB/s)", speed % 1000);
+			aprint_normal(", 8-bit");
 		if (periph->periph_mode & (PERIPH_CAP_SYNC | PERIPH_CAP_DT)) {
 			freq =
 			    scsipi_sync_factor_to_freq(periph->periph_period);
 			speed = freq;
 			if (periph->periph_mode & PERIPH_CAP_WIDE32)
 				speed *= 4;
 			else if (periph->periph_mode &
 			    (PERIPH_CAP_WIDE16 | PERIPH_CAP_DT))
 				speed *= 2;
 			mbs = speed / 1000;
 			if (mbs > 0) {
 				aprint_normal(" (%d.%03dMB/s)", mbs,
 				    speed % 1000);
 			} else
 				aprint_normal(" (%dKB/s)", speed % 1000);
+		}
-	aprint_normal(" transfers");
+		aprint_normal(" transfers");
-	if (periph->periph_mode & PERIPH_CAP_TQING)
+		if (periph->periph_mode & PERIPH_CAP_TQING)
-		aprint_normal(", tagged queueing");
+			aprint_normal(", tagged queueing");
-	aprint_normal("\n");
+		aprint_normal("\n");
 		break;
 	case SCSIPI_BUSTYPE_BUSTYPE(
 	    SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_FC):
 	case SCSIPI_BUSTYPE_BUSTYPE(
 	    SCSIPI_BUSTYPE_SCSI, SCSIPI_BUSTYPE_SCSI_SAS):
 		if (periph->periph_mode & PERIPH_CAP_TQING) {
 			aprint_normal_dev(periph->periph_dev,
 			    "tagged queueing\n");
+		}
 		break;
 	default:
 		/* nothing */
 		break;
+	}
+}
 /*
  * scsipi_async_event_max_openings:
+ *
  *	Update the maximum number of outstanding commands a
  *	device may have.
  */
 static void
 scsipi_async_event_max_openings(struct scsipi_channel *chan,
     struct scsipi_max_openings *mo)
+{
 	struct scsipi_periph *periph;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsipi_ioctl.c,v 1.66 2008/07/14 12:36:44 drochner Exp $	*/
+/*	$NetBSD: scsipi_ioctl.c,v 1.67 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Contributed by HD Associates (hd@world.std.com).
  * Copyright (c) 1992, 1993 HD Associates
+ *
  * Berkeley style copyright.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.66 2008/07/14 12:36:44 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.67 2012/04/19 17:45:20 bouyer Exp $");
 #include "opt_compat_freebsd.h"
 #include "opt_compat_netbsd.h"
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 @@ -369,49 +369,49 @@ scsipi_do_ioctl(struct scsipi_periph *pe
 			periph->periph_dbflags |= SCSIPI_DB2;
 		if (level & 4)
 			periph->periph_dbflags |= SCSIPI_DB3;
 		if (level & 8)
 			periph->periph_dbflags |= SCSIPI_DB4;
 		return (0);
+	}
 	case SCIOCRECONFIG:
 	case SCIOCDECONFIG:
 		return (EINVAL);
 	case SCIOCIDENTIFY: {
 		struct scsi_addr *sca = (struct scsi_addr *)addr;
-		switch (scsipi_periph_bustype(periph)) {
+		switch (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(periph))) {
 		case SCSIPI_BUSTYPE_SCSI:
 			sca->type = TYPE_SCSI;
 			sca->addr.scsi.scbus =
 			    device_unit(device_parent(periph->periph_dev));
 			sca->addr.scsi.target = periph->periph_target;
 			sca->addr.scsi.lun = periph->periph_lun;
 			return (0);
 		case SCSIPI_BUSTYPE_ATAPI:
 			sca->type = TYPE_ATAPI;
 			sca->addr.atapi.atbus =
 			    device_unit(device_parent(periph->periph_dev));
 			sca->addr.atapi.drive = periph->periph_target;
 			return (0);
+		}
 		return (ENXIO);
+	}
 #if defined(COMPAT_12) || defined(COMPAT_FREEBSD)
 	/* SCIOCIDENTIFY before ATAPI staff merge */
 	case OSCIOCIDENTIFY: {
 		struct oscsi_addr *sca = (struct oscsi_addr *)addr;
-		switch (scsipi_periph_bustype(periph)) {
+		switch (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(periph))) {
 		case SCSIPI_BUSTYPE_SCSI:
 			sca->scbus =
 			    device_unit(device_parent(periph->periph_dev));
 			sca->target = periph->periph_target;
 			sca->lun = periph->periph_lun;
 			return (0);
+		}
 		return (ENODEV);
+	}
 #endif
 	default:
 		return (ENOTTY);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsipiconf.h,v 1.119 2012/04/06 22:50:39 christos Exp $	*/
+/*	$NetBSD: scsipiconf.h,v 1.120 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -229,30 +229,45 @@ struct scsipi_adapter {
  *	The bustype_type member is shared with struct ata_bustype
  *	(because we can ata, atapi or scsi busses to the same controller)
  */
 struct scsipi_bustype {
 	int	bustype_type;		/* symbolic name of type */
 	void	(*bustype_cmd)(struct scsipi_xfer *);
 	int	(*bustype_interpret_sense)(struct scsipi_xfer *);
 	void	(*bustype_printaddr)(struct scsipi_periph *);
 	void	(*bustype_kill_pending)(struct scsipi_periph *);
 };
 /* bustype_type */
-#define	SCSIPI_BUSTYPE_SCSI	0
+/* type is stored in the first byte */
 #define SCSIPI_BUSTYPE_TYPE_SHIFT 0
 #define SCSIPI_BUSTYPE_TYPE(x) (((x) >> SCSIPI_BUSTYPE_TYPE_SHIFT) & 0xff)
 #define	SCSIPI_BUSTYPE_SCSI	0 /* parallel SCSI */
 #define	SCSIPI_BUSTYPE_ATAPI	1
 /* #define SCSIPI_BUSTYPE_ATA	2 */
 /* subtype is stored in the second byte */
 #define SCSIPI_BUSTYPE_SUBTYPE_SHIFT 8
 #define SCSIPI_BUSTYPE_SUBTYPE(x) (((x) >> SCSIPI_BUSTYPE_SUBTYPE_SHIFT) & 0xff)
 #define SCSIPI_BUSTYPE_BUSTYPE(t, s) \
     ((t) << SCSIPI_BUSTYPE_TYPE_SHIFT | (s) << SCSIPI_BUSTYPE_SUBTYPE_SHIFT)
 /* subtypes are defined in each bus type headers */
 /* XXX this should be in scsiconf.h but is used in scsipi_base.c */
 /* SCSI subtypes */
 #define SCSIPI_BUSTYPE_SCSI_PSCSI       0 /* parallel SCSI */
 #define SCSIPI_BUSTYPE_SCSI_FC          1 /* Fiber channel */
 #define SCSIPI_BUSTYPE_SCSI_SAS         2 /* SAS */
 #define SCSIPI_BUSTYPE_SCSI_USB         3 /* USB */
 /*
  * scsipi_channel:
+ *
  *	This structure describes a single channel of a SCSIPI adapter.
  *	An adapter may have one or more channels.  See the comment above
  *	regarding the resource counter.
  *	Note: chan_bustype has to be first member, as its bustype_type member
  * 	is shared with the aa_bustype member of struct ata_atapi_attach.
  */
 #define	SCSIPI_CHAN_PERIPH_BUCKETS	16
 #define	SCSIPI_CHAN_PERIPH_HASHMASK	(SCSIPI_CHAN_PERIPH_BUCKETS - 1)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sd.c,v 1.297 2012/04/06 22:50:39 christos Exp $	*/
+/*	$NetBSD: sd.c,v 1.298 2012/04/19 17:45:20 bouyer Exp $	*/
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -37,27 +37,27 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.297 2012/04/06 22:50:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.298 2012/04/19 17:45:20 bouyer Exp $");
 #include "opt_scsi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/scsiio.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/uio.h>
 @@ -217,28 +217,28 @@ sdattach(device_t parent, device_t self,
 	struct scsipi_periph *periph = sa->sa_periph;
 	int error, result, rndval = cprng_strong32();
 	struct disk_parms *dp = &sd->params;
 	char pbuf[9];
 	SC_DEBUG(periph, SCSIPI_DB2, ("sdattach: "));
 	sd->sc_dev = self;
 	sd->type = (sa->sa_inqbuf.type & SID_TYPE);
 	strncpy(sd->name, sa->sa_inqbuf.product, sizeof(sd->name));
 	if (sd->type == T_SIMPLE_DIRECT)
 		periph->periph_quirks |= PQUIRK_ONLYBIG | PQUIRK_NOBIGMODESENSE;
-	if (scsipi_periph_bustype(sa->sa_periph) == SCSIPI_BUSTYPE_SCSI &&
+	if (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(sa->sa_periph)) ==
-	    periph->periph_version == 0)
+	    SCSIPI_BUSTYPE_SCSI && periph->periph_version == 0)
 		sd->flags |= SDF_ANCIENT;
 	bufq_alloc(&sd->buf_queue, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);
 	callout_init(&sd->sc_callout, 0);
 	/*
 	 * Store information needed to contact our base driver
 	 */
 	sd->sc_periph = periph;
 	periph->periph_dev = sd->sc_dev;
 	periph->periph_switch = &sd_switch;
 @@ -1294,27 +1294,27 @@ sdioctl(dev_t dev, u_long cmd, void *add
 static void
 sdgetdefaultlabel(struct sd_softc *sd, struct disklabel *lp)
+{
 	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize = sd->params.blksize;
 	lp->d_ntracks = sd->params.heads;
 	lp->d_nsectors = sd->params.sectors;
 	lp->d_ncylinders = sd->params.cyls;
 	lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
-	switch (scsipi_periph_bustype(sd->sc_periph)) {
+	switch (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(sd->sc_periph))) {
 	case SCSIPI_BUSTYPE_SCSI:
 		lp->d_type = DTYPE_SCSI;
 		break;
 	case SCSIPI_BUSTYPE_ATAPI:
 		lp->d_type = DTYPE_ATAPI;
 		break;
+	}
 	/*
 	 * XXX
 	 * We could probe the mode pages to figure out what kind of disc it is.
 	 * Is this worthwhile?
 	 */
 	strncpy(lp->d_typename, sd->name, 16);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: st.c,v 1.220 2012/02/28 10:58:10 mbalmer Exp $ */
+/*	$NetBSD: st.c,v 1.221 2012/04/19 17:45:20 bouyer Exp $ */
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -40,27 +40,27 @@
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  * major changes by Julian Elischer (julian@jules.dialix.oz.au) May 1993
+ *
  * A lot of rewhacking done by mjacob (mjacob@nas.nasa.gov).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.220 2012/02/28 10:58:10 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.221 2012/04/19 17:45:20 bouyer Exp $");
 #include "opt_scsi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/proc.h>
 #include <sys/mtio.h>
 @@ -1725,27 +1725,28 @@ st_write_filemarks(struct st_softc *st,
 	case 1:
 		if (st->flags & ST_FM_WRITTEN)	/* already have one down */
 			st->flags &= ~ST_WRITTEN;
 		else
 			st->flags |= ST_FM_WRITTEN;
 		st->flags &= ~ST_PER_ACTION;
 		break;
 	default:
 		st->flags &= ~(ST_PER_ACTION | ST_WRITTEN);
+	}
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.opcode = WRITE_FILEMARKS;
-	if (scsipi_periph_bustype(st->sc_periph) == SCSIPI_BUSTYPE_ATAPI)
+	if (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(st->sc_periph)) ==
 	    SCSIPI_BUSTYPE_ATAPI)
 		cmd.byte2 = SR_IMMED;
 	/*
 	 * The ATAPI Onstream DI-30 doesn't support writing filemarks, but
 	 * WRITE_FILEMARKS is still used to flush the buffer
 	 */
 	if ((st->quirks & ST_Q_NOFILEMARKS) == 0)
 		_lto3b(number, cmd.number);
 	/* XXX WE NEED TO BE ABLE TO GET A RESIDIUAL XXX */
 	error = scsipi_command(st->sc_periph, (void *)&cmd, sizeof(cmd), 0, 0,
 , ST_IO_TIME * 4, NULL, flags);
 	if (error == 0 && st->fileno != -1)
 		st->fileno += number;
 @@ -1801,27 +1802,28 @@ st_load(struct st_softc *st, u_int type,
+		}
+	}
 	if (st->quirks & ST_Q_IGNORE_LOADS) {
 		if (type == LD_LOAD)
 			/*
 			 * If we ignore loads, at least we should try a rewind.
 			 */
 			return st_rewind(st, 0, flags);
 		/* otherwise, we should do what's asked of us */
+	}
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.opcode = LOAD;
-	if (scsipi_periph_bustype(st->sc_periph) == SCSIPI_BUSTYPE_ATAPI)
+	if (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(st->sc_periph)) ==
 	    SCSIPI_BUSTYPE_ATAPI)
 		cmd.byte2 = SR_IMMED;
 	cmd.how = type;
 	error = scsipi_command(st->sc_periph, (void *)&cmd, sizeof(cmd), 0, 0,
 	    ST_RETRIES, ST_SPC_TIME, NULL, flags);
 	if (error) {
 		aprint_error_dev(st->sc_dev, "error %d in st_load (op %d)\n",
 		    error, type);
+	}
 	return error;
+}
 /* Rewind the device */

 @@ -1,41 +1,41 @@
-/*	$NetBSD: st_atapi.c,v 1.28 2012/02/28 10:58:11 mbalmer Exp $ */
+/*	$NetBSD: st_atapi.c,v 1.29 2012/04/19 17:45:21 bouyer Exp $ */
 /*
  * Copyright (c) 2001 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.28 2012/02/28 10:58:11 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.29 2012/04/19 17:45:21 bouyer Exp $");
 #include "opt_scsi.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/scsipi/stvar.h>
 #include <dev/scsipi/atapi_tape.h>
 @@ -55,27 +55,28 @@ CFATTACH_DECL_NEW(
 );
 static const struct scsipi_inquiry_pattern st_atapibus_patterns[] = {
 	{T_SEQUENTIAL, T_REMOV,
 	 "",	 "",		 ""},
 };
 static int
 st_atapibus_match(device_t parent, cfdata_t match,  void *aux)
+{
 	struct scsipibus_attach_args *sa = aux;
 	int priority;
-	if (scsipi_periph_bustype(sa->sa_periph) != SCSIPI_BUSTYPE_ATAPI)
+	if (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(sa->sa_periph)) !=
 	    SCSIPI_BUSTYPE_ATAPI)
 		return 0;
 	(void)scsipi_inqmatch(&sa->sa_inqbuf,
 	    st_atapibus_patterns,
 	    sizeof(st_atapibus_patterns)/sizeof(st_atapibus_patterns[0]),
 	    sizeof(st_atapibus_patterns[0]), &priority);
 	return priority;
+}
 static void
 st_atapibus_attach(device_t parent, device_t self, void *aux)
+{
 	struct st_softc *st = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: st_scsi.c,v 1.34 2012/02/28 10:58:11 mbalmer Exp $ */
+/*	$NetBSD: st_scsi.c,v 1.35 2012/04/19 17:45:21 bouyer Exp $ */
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -40,27 +40,27 @@
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  * major changes by Julian Elischer (julian@jules.dialix.oz.au) May 1993
+ *
  * A lot of rewhacking done by mjacob (mjacob@nas.nasa.gov).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.34 2012/02/28 10:58:11 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.35 2012/04/19 17:45:21 bouyer Exp $");
 #include "opt_scsi.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsi_tape.h>
 @@ -83,27 +83,28 @@ CFATTACH_DECL_NEW(
 );
 static const struct scsipi_inquiry_pattern st_scsibus_patterns[] = {
 	{T_SEQUENTIAL, T_REMOV,
 	 "",         "",                 ""},
 };
 static int
 st_scsibus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct scsipibus_attach_args *sa = aux;
 	int priority;
-	if (scsipi_periph_bustype(sa->sa_periph) != SCSIPI_BUSTYPE_SCSI)
+	if (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(sa->sa_periph)) !=
 	    SCSIPI_BUSTYPE_SCSI)
 		return 0;
 	(void)scsipi_inqmatch(&sa->sa_inqbuf,
 	    st_scsibus_patterns,
 	    sizeof(st_scsibus_patterns)/sizeof(st_scsibus_patterns[0]),
 	    sizeof(st_scsibus_patterns[0]), &priority);
 	return priority;
+}
 static void
 st_scsibus_attach(device_t parent, device_t self, void *aux)
+{
 	struct st_softc *st = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umass_scsipi.c,v 1.43 2012/03/11 01:06:07 mrg Exp $	*/
+/*	$NetBSD: umass_scsipi.c,v 1.44 2012/04/19 17:45:21 bouyer Exp $	*/
 /*
  * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology, Charles M. Hamnnum and Matthew R. Green.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.43 2012/03/11 01:06:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.44 2012/04/19 17:45:21 bouyer Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_umass.h"
 #endif
 #include "atapibus.h"
 #include "scsibus.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 @@ -235,27 +235,28 @@ umass_scsipi_request(struct scsipi_chann
 #if defined(USB_DEBUG) && defined(SCSIPI_DEBUG)
 		if (umassdebug & UDMASS_SCSI)
 			show_scsipi_xs(xs);
 		else if (umassdebug & ~UDMASS_CMD)
 			show_scsipi_cmd(xs);
 #endif
 		if (sc->sc_dying) {
 			xs->error = XS_DRIVER_STUFFUP;
 			goto done;
+		}
 #ifdef UMASS_DEBUG
-		if (chan->chan_bustype->bustype_type == SCSIPI_BUSTYPE_ATAPI ?
+		if (SCSIPI_BUSTYPE_TYPE(chan->chan_bustype->bustype_type) ==
 		    SCSIPI_BUSTYPE_ATAPI ?
 		    periph->periph_target != UMASS_ATAPI_DRIVE :
 		    periph->periph_target == chan->chan_id) {
 			DPRINTF(UDMASS_SCSI, ("%s: wrong SCSI ID %d\n",
 			    device_xname(sc->sc_dev),
 			    periph->periph_target));
 			xs->error = XS_DRIVER_STUFFUP;
 			goto done;
+		}
 #endif
 		cmd = xs->cmd;
 		cmdlen = xs->cmdlen;