[src/netbsd-6]: src/sys/dev/ic Pull up following revision(s) (requested by ch...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42c16fa974c7
branches:  netbsd-6
changeset: 775487:42c16fa974c7
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Nov 22 17:19:56 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #686):
        sys/dev/ic/mpt_netbsd.c: revision 1.19
set chan_bustype correctly.

diffstat:

 sys/dev/ic/mpt_netbsd.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 871bbaaa3406 -r 42c16fa974c7 sys/dev/ic/mpt_netbsd.c
--- a/sys/dev/ic/mpt_netbsd.c   Thu Nov 22 00:44:31 2012 +0000
+++ b/sys/dev/ic/mpt_netbsd.c   Thu Nov 22 17:19:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpt_netbsd.c,v 1.17 2012/01/30 17:45:14 mhitch Exp $   */
+/*     $NetBSD: mpt_netbsd.c,v 1.17.2.1 2012/11/22 17:19:56 riz Exp $  */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.17 2012/01/30 17:45:14 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.17.2.1 2012/11/22 17:19:56 riz Exp $");
 
 #include <dev/ic/mpt.h>                        /* pulls in all headers */
 
@@ -118,7 +118,13 @@
        /* Fill in the scsipi_channel. */
        memset(chan, 0, sizeof(*chan));
        chan->chan_adapter = adapt;
-       chan->chan_bustype = &scsi_bustype;
+       if (mpt->is_sas) {
+               chan->chan_bustype = &scsi_sas_bustype;
+       } else if (mpt->is_fc) {
+               chan->chan_bustype = &scsi_fc_bustype;
+       } else {
+               chan->chan_bustype = &scsi_bustype;
+       }
        chan->chan_channel = 0;
        chan->chan_flags = 0;
        chan->chan_nluns = 8;