Module Name: src
Committed By: jakllsch
Date: Fri Dec 14 23:53:57 UTC 2012
Modified Files:
src/sys/dev/sdmmc: ld_sdmmc.c
Log Message:
Display the whole CID register upon attach as "<MID:OID:PNM:PRV:PSN:MDT>"
instead of just "<PNM>". Probably should figure out a way to stuff this
into the device properties database too, but not everything has
pseudo-device drvctl enabled.
Also, drop trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/sdmmc/ld_sdmmc.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/ld_sdmmc.c
diff -u src/sys/dev/sdmmc/ld_sdmmc.c:1.10 src/sys/dev/sdmmc/ld_sdmmc.c:1.11
--- src/sys/dev/sdmmc/ld_sdmmc.c:1.10 Thu Feb 2 19:43:06 2012
+++ src/sys/dev/sdmmc/ld_sdmmc.c Fri Dec 14 23:53:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_sdmmc.c,v 1.10 2012/02/02 19:43:06 tls Exp $ */
+/* $NetBSD: ld_sdmmc.c,v 1.11 2012/12/14 23:53:56 jakllsch Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.10 2012/02/02 19:43:06 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.11 2012/12/14 23:53:56 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -113,7 +113,9 @@ ld_sdmmc_attach(device_t parent, device_
ld->sc_dv = self;
- aprint_normal(": <%s>\n", sa->sf->cid.pnm);
+ aprint_normal(": <0x%02x:0x%04x:%s:0x%02x:0x%08x:0x%03x>\n",
+ sa->sf->cid.mid, sa->sf->cid.oid, sa->sf->cid.pnm,
+ sa->sf->cid.rev, sa->sf->cid.psn, sa->sf->cid.mdt);
aprint_naive("\n");
callout_init(&sc->sc_task.task_callout, CALLOUT_MPSAFE);
@@ -130,7 +132,7 @@ ld_sdmmc_attach(device_t parent, device_
ld->sc_start = ld_sdmmc_start;
/*
- * It is avoided that the error occurs when the card attaches it,
+ * It is avoided that the error occurs when the card attaches it,
* when wedge is supported.
*/
config_pending_incr();
