Module Name: src
Committed By: phx
Date: Sun Apr 17 14:58:27 UTC 2011
Modified Files:
src/sys/dev/i2c: m41st84.c
Log Message:
Do not print "M41ST84 Real-time Clock/NVRAM", but "M41T8x Real-time Clock"
when STRTC_NO_USERRAM is defined. This driver should work for all M41T8x
compatible chips (tested on my DSM-G600 with M41T80).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/i2c/m41st84.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/i2c/m41st84.c
diff -u src/sys/dev/i2c/m41st84.c:1.16 src/sys/dev/i2c/m41st84.c:1.17
--- src/sys/dev/i2c/m41st84.c:1.16 Sun Oct 10 05:17:44 2010
+++ src/sys/dev/i2c/m41st84.c Sun Apr 17 14:58:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: m41st84.c,v 1.16 2010/10/10 05:17:44 kiyohara Exp $ */
+/* $NetBSD: m41st84.c,v 1.17 2011/04/17 14:58:26 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.16 2010/10/10 05:17:44 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.17 2011/04/17 14:58:26 phx Exp $");
#include "opt_strtc.h"
@@ -105,9 +105,13 @@
struct strtc_softc *sc = device_private(self);
struct i2c_attach_args *ia = arg;
+#ifndef STRTC_NO_USERRAM
aprint_naive(": Real-time Clock/NVRAM\n");
aprint_normal(": M41ST84 Real-time Clock/NVRAM\n");
-
+#else
+ aprint_naive(": Real-time Clock\n");
+ aprint_normal(": M41T8x Real-time Clock\n");
+#endif
sc->sc_tag = ia->ia_tag;
sc->sc_address = ia->ia_addr;
sc->sc_dev = self;
