[src/trunk]: src/sys/dev/sdmmc let SDHC_FLAG_HOSTCAPS override SDHC_CAPABILIT...

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

details:   https://anonhg.NetBSD.org/src/rev/a7ee87c1149d
branches:  trunk
changeset: 809817:a7ee87c1149d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 02 22:01:28 2015 +0000

description:
let SDHC_FLAG_HOSTCAPS override SDHC_CAPABILITIES2 as well

diffstat:

 sys/dev/sdmmc/sdhc.c    |  15 ++++++++-------
 sys/dev/sdmmc/sdhcvar.h |   3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r e02517df19ea -r a7ee87c1149d sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Sun Aug 02 21:45:52 2015 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Sun Aug 02 22:01:28 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc.c,v 1.71 2015/08/02 21:45:12 jmcneill Exp $       */
+/*     $NetBSD: sdhc.c,v 1.72 2015/08/02 22:01:28 jmcneill Exp $       */
 /*     $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $        */
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.71 2015/08/02 21:45:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.72 2015/08/02 22:01:28 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -315,13 +315,14 @@
        /* Determine host capabilities. */
        if (ISSET(sc->sc_flags, SDHC_FLAG_HOSTCAPS)) {
                caps = sc->sc_caps;
+               caps2 = sc->sc_caps2;
        } else {
                caps = HREAD4(hp, SDHC_CAPABILITIES);
-       }
-       if (hp->specver >= SDHC_SPEC_VERS_300) {
-               caps2 = HREAD4(hp, SDHC_CAPABILITIES2);
-       } else {
-               caps2 = 0;
+               if (hp->specver >= SDHC_SPEC_VERS_300) {
+                       caps2 = HREAD4(hp, SDHC_CAPABILITIES2);
+               } else {
+                       caps2 = 0;
+               }
        }
 
        /*
diff -r e02517df19ea -r a7ee87c1149d sys/dev/sdmmc/sdhcvar.h
--- a/sys/dev/sdmmc/sdhcvar.h   Sun Aug 02 21:45:52 2015 +0000
+++ b/sys/dev/sdmmc/sdhcvar.h   Sun Aug 02 22:01:28 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhcvar.h,v 1.21 2015/07/31 15:00:08 jmcneill Exp $    */
+/*     $NetBSD: sdhcvar.h,v 1.22 2015/08/02 22:01:28 jmcneill Exp $    */
 /*     $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
 
 /*
@@ -60,6 +60,7 @@
        uint32_t                sc_clkbase;
        int                     sc_clkmsk;      /* Mask for SDCLK */
        uint32_t                sc_caps;/* attachment provided capabilities */
+       uint32_t                sc_caps2;
 
        int (*sc_vendor_rod)(struct sdhc_softc *, int);
        int (*sc_vendor_write_protect)(struct sdhc_softc *);