lkml.org 
[lkml]   [2005]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH] ds1337 2/4
    From

    Use correct macros to convert between bdc and bin. See linux/bcd.h

    --- linux-omap/drivers/i2c/chips/ds1337.c.orig 2005-04-08 00:32:45.234203040 +0200
    +++ linux-omap/drivers/i2c/chips/ds1337.c 2005-04-08 00:34:58.457949952 +0200
    @@ -127,15 +127,15 @@
    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 @@
    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;
    -
    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-04-08 01:26    [W:0.086 / U:90.492 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site