From 36ce07cc3b5025ca228653bc12c5b5d9b886d4f1 Mon Sep 17 00:00:00 2001 From: bouyer Date: Wed, 15 May 2002 11:19:38 +0000 Subject: [PATCH] scsipi_print_xfer_mode(): PERIPH_CAP_DT is an equivalent of (PERIPH_CAP_SYNC | PERIPH_CAP_WIDE16) here. --- sys/dev/scsipi/scsipi_base.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c index 96c832cd99e3..dcde19385d1f 100644 --- a/sys/dev/scsipi/scsipi_base.c +++ b/sys/dev/scsipi/scsipi_base.c @@ -1,4 +1,4 @@ -/* $NetBSD: scsipi_base.c,v 1.72 2002/05/05 15:16:32 bouyer Exp $ */ +/* $NetBSD: scsipi_base.c,v 1.73 2002/05/15 11:19:38 bouyer Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.72 2002/05/05 15:16:32 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.73 2002/05/15 11:19:38 bouyer Exp $"); #include "opt_scsi.h" @@ -2225,7 +2225,7 @@ scsipi_print_xfer_mode(periph) return; printf("%s: ", periph->periph_dev->dv_xname); - if (periph->periph_mode & PERIPH_CAP_SYNC) { + if (periph->periph_mode & (PERIPH_CAP_SYNC | PERIPH_CAP_DT)) { period = scsipi_sync_factor_to_period(periph->periph_period); printf("sync (%d.%dns offset %d)", period / 10, period % 10, periph->periph_offset); @@ -2234,17 +2234,18 @@ scsipi_print_xfer_mode(periph) if (periph->periph_mode & PERIPH_CAP_WIDE32) printf(", 32-bit"); - else if (periph->periph_mode & PERIPH_CAP_WIDE16) + else if (periph->periph_mode & (PERIPH_CAP_WIDE16 | PERIPH_CAP_DT)) printf(", 16-bit"); else printf(", 8-bit"); - if (periph->periph_mode & PERIPH_CAP_SYNC) { + 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) + else if (periph->periph_mode & + (PERIPH_CAP_WIDE16 | PERIPH_CAP_DT)) speed *= 2; mbs = speed / 1000; if (mbs > 0)