Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/dev/sdmmc Pull up following revision(s) (requested by...
details: https://anonhg.NetBSD.org/src/rev/87d1502aed8f
branches: netbsd-8
changeset: 936823:87d1502aed8f
user: martin <martin%NetBSD.org@localhost>
date: Wed Aug 05 16:14:25 2020 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #1592):
sys/dev/sdmmc/sdhc.c: revision 1.107
sys/dev/sdmmc/sdhcreg.h: revision 1.21
Identify SDHC 4.1 and 4.2. From {DragonFly,Free}BSD.
diffstat:
sys/dev/sdmmc/sdhc.c | 10 ++++++++--
sys/dev/sdmmc/sdhcreg.h | 4 +++-
2 files changed, 11 insertions(+), 3 deletions(-)
diffs (49 lines):
diff -r 08965557ab1a -r 87d1502aed8f sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c Wed Aug 05 16:11:56 2020 +0000
+++ b/sys/dev/sdmmc/sdhc.c Wed Aug 05 16:14:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.100.4.1 2018/01/07 09:24:59 snj Exp $ */
+/* $NetBSD: sdhc.c,v 1.100.4.2 2020/08/05 16:14:25 martin 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.100.4.1 2018/01/07 09:24:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.100.4.2 2020/08/05 16:14:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -316,6 +316,12 @@
case SDHC_SPEC_VERS_400:
aprint_normal("4.0");
break;
+ case SDHC_SPEC_VERS_410:
+ aprint_normal("4.1");
+ break;
+ case SDHC_SPEC_VERS_420:
+ aprint_normal("4.2");
+ break;
case SDHC_SPEC_NOVERS:
hp->specver = -1;
aprint_normal("NO-VERS");
diff -r 08965557ab1a -r 87d1502aed8f sys/dev/sdmmc/sdhcreg.h
--- a/sys/dev/sdmmc/sdhcreg.h Wed Aug 05 16:11:56 2020 +0000
+++ b/sys/dev/sdmmc/sdhcreg.h Wed Aug 05 16:14:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcreg.h,v 1.18.10.1 2018/01/07 09:24:59 snj Exp $ */
+/* $NetBSD: sdhcreg.h,v 1.18.10.2 2020/08/05 16:14:25 martin Exp $ */
/* $OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $ */
/*
@@ -246,6 +246,8 @@
#define SDHC_SPEC_VERS_200 0x01
#define SDHC_SPEC_VERS_300 0x02
#define SDHC_SPEC_VERS_400 0x03
+#define SDHC_SPEC_VERS_410 0x04
+#define SDHC_SPEC_VERS_420 0x05
#define SDHC_SPEC_NOVERS 0xff /* dummy */
/* SDHC_CAPABILITIES decoding */
Home |
Main Index |
Thread Index |
Old Index