Module Name: src
Committed By: jmcneill
Date: Sun Jan 28 14:34:06 UTC 2018
Modified Files:
src/sys/dev/sdmmc: sdmmc_cis.c
Log Message:
Don't print an error when we find a CIS tuple code in the vendor-unique
range (80h-8Fh).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sdmmc/sdmmc_cis.c
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/sdmmc_cis.c
diff -u src/sys/dev/sdmmc/sdmmc_cis.c:1.4 src/sys/dev/sdmmc/sdmmc_cis.c:1.5
--- src/sys/dev/sdmmc/sdmmc_cis.c:1.4 Wed Feb 1 22:34:43 2012
+++ src/sys/dev/sdmmc/sdmmc_cis.c Sun Jan 28 14:34:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_cis.c,v 1.4 2012/02/01 22:34:43 matt Exp $ */
+/* $NetBSD: sdmmc_cis.c,v 1.5 2018/01/28 14:34:06 jmcneill Exp $ */
/* $OpenBSD: sdmmc_cis.c,v 1.1 2006/06/01 21:53:41 uwe Exp $ */
/*
@@ -20,7 +20,7 @@
/* Routines to decode the Card Information Structure of SD I/O cards */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_cis.c,v 1.4 2012/02/01 22:34:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_cis.c,v 1.5 2018/01/28 14:34:06 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -260,9 +260,14 @@ sdmmc_read_cis(struct sdmmc_function *sf
break;
default:
- aprint_error_dev(dev,
- "unknown tuple code %#x, length %d\n",
- tplcode, tpllen);
+ /*
+ * Tuple codes between 80h-8Fh are vendor unique.
+ * Print a warning about all other codes.
+ */
+ if ((tplcode & 0xf0) != 0x80)
+ aprint_error_dev(dev,
+ "unknown tuple code %#x, length %d\n",
+ tplcode, tpllen);
reg += tpllen;
break;
}
