From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, sensors@Stimpy.netroedge.com
Cc: ladis@linux-mips.org
Subject: [PATCH] I2C: ds1337 2/4
Date: Tue, 21 Jun 2005 22:17:42 -0700 [thread overview]
Message-ID: <1119417462982@kroah.com> (raw)
In-Reply-To: <11194174623385@kroah.com>
[PATCH] I2C: ds1337 2/4
Use correct macros to convert between bdc and bin. See linux/bcd.h
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
commit 6069ffde15472da9d041a58df490d388bb175d51
tree 0e1b536969aafe6bb3a9a567be46a61b8be91886
parent 3e9d0ba1305cd7c6efd2ab3a003e58a27da1796b
author Ladislav Michl <ladis@linux-mips.org> Fri, 08 Apr 2005 15:02:16 +0200
committer Greg Kroah-Hartman <gregkh@suse.de> Tue, 21 Jun 2005 21:51:51 -0700
drivers/i2c/chips/ds1337.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -127,15 +127,15 @@ static int ds1337_get_datetime(struct i2
buf[4], buf[5], buf[6]);
if (result >= 0) {
- dt->tm_sec = BCD_TO_BIN(buf[0]);
- dt->tm_min = BCD_TO_BIN(buf[1]);
+ dt->tm_sec = BCD2BIN(buf[0]);
+ dt->tm_min = BCD2BIN(buf[1]);
val = buf[2] & 0x3f;
- dt->tm_hour = BCD_TO_BIN(val);
- dt->tm_wday = BCD_TO_BIN(buf[3]) - 1;
- dt->tm_mday = BCD_TO_BIN(buf[4]);
+ dt->tm_hour = BCD2BIN(val);
+ dt->tm_wday = BCD2BIN(buf[3]) - 1;
+ dt->tm_mday = BCD2BIN(buf[4]);
val = buf[5] & 0x7f;
- dt->tm_mon = BCD_TO_BIN(val);
- dt->tm_year = 1900 + BCD_TO_BIN(buf[6]);
+ dt->tm_mon = BCD2BIN(val);
+ dt->tm_year = 1900 + BCD2BIN(buf[6]);
if (buf[5] & 0x80)
dt->tm_year += 100;
@@ -174,19 +174,19 @@ static int ds1337_set_datetime(struct i2
dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday);
buf[0] = 0; /* reg offset */
- buf[1] = BIN_TO_BCD(dt->tm_sec);
- buf[2] = BIN_TO_BCD(dt->tm_min);
- buf[3] = BIN_TO_BCD(dt->tm_hour) | (1 << 6);
- buf[4] = BIN_TO_BCD(dt->tm_wday) + 1;
- buf[5] = BIN_TO_BCD(dt->tm_mday);
- buf[6] = BIN_TO_BCD(dt->tm_mon);
+ buf[1] = BIN2BCD(dt->tm_sec);
+ buf[2] = BIN2BCD(dt->tm_min);
+ buf[3] = BIN2BCD(dt->tm_hour) | (1 << 6);
+ buf[4] = BIN2BCD(dt->tm_wday) + 1;
+ buf[5] = BIN2BCD(dt->tm_mday);
+ buf[6] = BIN2BCD(dt->tm_mon);
if (dt->tm_year >= 2000) {
val = dt->tm_year - 2000;
buf[6] |= (1 << 7);
} else {
val = dt->tm_year - 1900;
}
- buf[7] = BIN_TO_BCD(val);
+ buf[7] = BIN2BCD(val);
msg[0].addr = client->addr;
msg[0].flags = 0;
next prev parent reply other threads:[~2005-06-22 7:09 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-22 5:16 [GIT PATCH] I2C patches for 2.6.12 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Kill address ranges in non-sensors i2c chip drivers Greg KH
2005-06-22 5:17 ` [PATCH] I2C: i2c-vid.h: Support for VID to reg conversion Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Merge unused address lists in some video drivers Greg KH
2005-06-22 5:17 ` [PATCH] I2C: rtc8564.c remove duplicate include Greg KH
2005-06-22 5:17 ` [PATCH] I2C: ds1337 1/4 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: mark all functions static in atxp1 driver Greg KH
2005-06-22 5:17 ` [PATCH] I2C: add new " Greg KH
2005-06-22 5:17 ` [PATCH] I2C: ds1337: i2c_transfer() checking Greg KH
2005-06-22 5:17 ` [PATCH] I2C: ds1337: Make time format consistent with other RTC drivers Greg KH
2005-06-22 5:17 ` Greg KH [this message]
2005-06-22 5:17 ` [PATCH] I2C: ds1337 3/4 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: ds1337: search by bus number Greg KH
2005-06-22 5:17 ` [PATCH] ds1337 driver works also with ds1339 chip Greg KH
2005-06-22 5:17 ` [PATCH] ds1337: export ds1337_do_command Greg KH
2005-06-22 5:17 ` [PATCH] I2C: add new hardware monitor driver: adm9240 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: #include <linux/config.h> cleanup Greg KH
2005-06-22 5:17 ` [PATCH] I2C: drivers/i2c/*: " Greg KH
2005-06-22 5:17 ` [PATCH] I2C: New hardware monitoring driver: w83627ehf Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Fix bugs in the new w83627ehf driver Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Add support for the LPC47M15x and LPC47M192 chips to smsc47m1 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Allow for sharing of the interrupt line for i2c-mpc.c Greg KH
2005-06-22 5:17 ` [PATCH] Spelling fixes for drivers/i2c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Remove redundancy from i2c-core.c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: sysfs names: rename to cpu0_vid, take 3 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Setting w83627hf fan divisor 128 fails Greg KH
2005-06-22 5:17 ` [PATCH] I2C: remove <linux/delay.h> from via686a Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Kill common macro abuse in chip drivers Greg KH
2005-06-22 5:17 ` [PATCH] I2C: adm9240 driver cleanup Greg KH
2005-06-22 5:17 ` [PATCH] I2C: include of jiffies.h for some i2c drivers Greg KH
2005-06-22 5:17 ` [PATCH] I2C: chips/Kconfig corrections Greg KH
2005-06-22 5:17 ` [PATCH] I2C: driver adm1021: remove die_code Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Coding style cleanups to via686a Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Spelling fixes for drivers/i2c/algos/i2c-algo-pca.c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Kill another macro abuse in via686a Greg KH
2005-06-22 5:17 ` [PATCH] I2C: fix up some sysfs device attribute file parameters Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Spelling fixes for drivers/i2c/busses/i2c-parport.c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Spelling fixes for drivers/i2c/i2c-core.c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Spelling fixes for drivers/i2c/i2c-dev.c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: add i2c driver for TPS6501x Greg KH
2005-06-22 5:17 ` [PATCH] i2c: Race fix for i2c-mpc.c Greg KH
2005-06-22 5:17 ` [PATCH] I2C: Sensors mailing list has moved Greg KH
2005-06-22 5:17 ` [PATCH] I2C: documentation update 1/3 Greg KH
2005-06-22 5:17 ` [PATCH] I2C: KConfig update - some EXPERIMENTAL removal Greg KH
2005-06-23 21:12 ` [PATCH] I2C: add i2c driver for TPS6501x Jean Delvare
2005-06-22 7:37 ` [PATCH] I2C: Remove redundancy from i2c-core.c Thomas Schneller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1119417462982@kroah.com \
--to=gregkh@suse.de \
--cc=greg@kroah.com \
--cc=ladis@linux-mips.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sensors@Stimpy.netroedge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox