lkml.org 
[lkml]   [2005]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] I2C: ds1337: Make time format consistent with other RTC drivers
    Date
    From
    [PATCH] I2C: ds1337: Make time format consistent with other RTC drivers

    Make time format consistent with other RTC drivers.

    Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
    Signed-off-by: James Chapman <jchapman@katalix.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    commit 0b46e334d77b2d3b8b3aa665c81c4afbe9f1f458
    tree ecf82d1aa2a4416835a082500970df3784e1194e
    parent d01b79d0613ebb6810bb48baf6e53e9319701fea
    author Ladislav Michl <ladis@linux-mips.org> Wed, 04 May 2005 08:13:13 +0200
    committer Greg Kroah-Hartman <gregkh@suse.de> Tue, 21 Jun 2005 21:51:51 -0700

    drivers/i2c/chips/ds1337.c | 13 ++++++-------
    1 files changed, 6 insertions(+), 7 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
    @@ -130,8 +130,8 @@ static int ds1337_get_datetime(struct i2
    dt->tm_wday = BCD2BIN(buf[3]) - 1;
    dt->tm_mday = BCD2BIN(buf[4]);
    val = buf[5] & 0x7f;
    - dt->tm_mon = BCD2BIN(val);
    - dt->tm_year = 1900 + BCD2BIN(buf[6]);
    + dt->tm_mon = BCD2BIN(val) - 1;
    + dt->tm_year = BCD2BIN(buf[6]);
    if (buf[5] & 0x80)
    dt->tm_year += 100;

    @@ -171,12 +171,11 @@ static int ds1337_set_datetime(struct i2
    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] = BIN2BCD(dt->tm_mon) + 1;
    + val = dt->tm_year;
    + if (val >= 100) {
    + val -= 100;
    buf[6] |= (1 << 7);
    - } else {
    - val = dt->tm_year - 1900;
    }
    buf[7] = BIN2BCD(val);

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-06-22 08:29    [W:0.021 / U:93.748 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site