Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/i2c Do not print "M41ST84 Real-time Clock/NVRAM", bu...



details:   https://anonhg.NetBSD.org/src/rev/619f41e05339
branches:  trunk
changeset: 764356:619f41e05339
user:      phx <phx%NetBSD.org@localhost>
date:      Sun Apr 17 14:58:26 2011 +0000

description:
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).

diffstat:

 sys/dev/i2c/m41st84.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 2bf6301403fb -r 619f41e05339 sys/dev/i2c/m41st84.c
--- a/sys/dev/i2c/m41st84.c     Sun Apr 17 14:05:59 2011 +0000
+++ b/sys/dev/i2c/m41st84.c     Sun Apr 17 14:58:26 2011 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index