Module Name: src
Committed By: jmcneill
Date: Sun Aug 2 22:01:28 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
let SDHC_FLAG_HOSTCAPS override SDHC_CAPABILITIES2 as well
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/sdmmc/sdhcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.71 src/sys/dev/sdmmc/sdhc.c:1.72
--- src/sys/dev/sdmmc/sdhc.c:1.71 Sun Aug 2 21:45:12 2015
+++ src/sys/dev/sdmmc/sdhc.c Sun Aug 2 22:01:28 2015
@@ -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 @@ sdhc_host_found(struct sdhc_softc *sc, b
/* 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;
+ }
}
/*
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.21 src/sys/dev/sdmmc/sdhcvar.h:1.22
--- src/sys/dev/sdmmc/sdhcvar.h:1.21 Fri Jul 31 15:00:08 2015
+++ src/sys/dev/sdmmc/sdhcvar.h Sun Aug 2 22:01:28 2015
@@ -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 @@ struct sdhc_softc {
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 *);
