[src/trunk]: src/sys/dev MFI_IOP_SKINNY is an enum not a single bit value, so...

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

details:   https://anonhg.NetBSD.org/src/rev/f7b677af7f12
branches:  trunk
changeset: 780766:f7b677af7f12
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Aug 05 15:50:49 2012 +0000

description:
MFI_IOP_SKINNY is an enum not a single bit value, so it can't be used as
a bit flag. As sc_flags is really used to hold an enum mfi_iop value,
change it to enum mfi_iop and rename to sc_ioptype. While there init it
in mfi_attach() instead of mfi_pci_attach().

diffstat:

 sys/dev/ic/mfi.c      |  8 ++++----
 sys/dev/ic/mfivar.h   |  4 ++--
 sys/dev/pci/mfi_pci.c |  6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diffs (83 lines):

diff -r da476d6ae15e -r f7b677af7f12 sys/dev/ic/mfi.c
--- a/sys/dev/ic/mfi.c  Sun Aug 05 15:37:39 2012 +0000
+++ b/sys/dev/ic/mfi.c  Sun Aug 05 15:50:49 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.39 2012/08/05 14:54:01 bouyer Exp $ */
+/* $NetBSD: mfi.c,v 1.40 2012/08/05 15:50:49 bouyer Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco%peereboom.us@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.39 2012/08/05 14:54:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.40 2012/08/05 15:50:49 bouyer Exp $");
 
 #include "bio.h"
 
@@ -416,14 +416,14 @@
                        printf("%s: firmware fault\n", DEVNAME(sc));
                        return 1;
                case MFI_STATE_WAIT_HANDSHAKE:
-                       if (sc->sc_flags & MFI_IOP_SKINNY)
+                       if (sc->sc_ioptype == MFI_IOP_SKINNY)
                                mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_CLEAR_HANDSHAKE);
                        else
                                mfi_write(sc, MFI_IDB, MFI_INIT_CLEAR_HANDSHAKE);
                        max_wait = 2;
                        break;
                case MFI_STATE_OPERATIONAL:
-                       if (sc->sc_flags & MFI_IOP_SKINNY)
+                       if (sc->sc_ioptype == MFI_IOP_SKINNY)
                                mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_READY);
                        else
                                mfi_write(sc, MFI_IDB, MFI_INIT_READY);
diff -r da476d6ae15e -r f7b677af7f12 sys/dev/ic/mfivar.h
--- a/sys/dev/ic/mfivar.h       Sun Aug 05 15:37:39 2012 +0000
+++ b/sys/dev/ic/mfivar.h       Sun Aug 05 15:50:49 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfivar.h,v 1.16 2012/08/05 14:54:02 bouyer Exp $ */
+/* $NetBSD: mfivar.h,v 1.17 2012/08/05 15:50:49 bouyer Exp $ */
 /* $OpenBSD: mfivar.h,v 1.28 2006/08/31 18:18:46 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco%peereboom.us@localhost>
@@ -117,10 +117,10 @@
        struct scsipi_adapter   sc_adapt;
 
        const struct mfi_iop_ops *sc_iop;
+       enum mfi_iop            sc_ioptype;
 
        void                    *sc_ih;
 
-       uint32_t                sc_flags;
        bool                    sc_64bit_dma;
 
        bus_space_tag_t         sc_iot;
diff -r da476d6ae15e -r f7b677af7f12 sys/dev/pci/mfi_pci.c
--- a/sys/dev/pci/mfi_pci.c     Sun Aug 05 15:37:39 2012 +0000
+++ b/sys/dev/pci/mfi_pci.c     Sun Aug 05 15:50:49 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.14 2012/03/22 15:05:36 sborrill Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.15 2012/08/05 15:50:49 bouyer Exp $ */
 /* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco%peereboom.us@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.14 2012/03/22 15:05:36 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.15 2012/08/05 15:50:49 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -184,8 +184,6 @@
                return;
        }
 
-       sc->sc_flags = mpd->mpd_iop;
-
        if (mpd->mpd_iop == MFI_IOP_GEN2 || mpd->mpd_iop == MFI_IOP_SKINNY)
                regbar = MFI_BAR_GEN2;
        else