Module Name: src
Committed By: phx
Date: Sat Jan 7 15:03:11 UTC 2012
Modified Files:
src/sys/dev/i2c: ds1307.c ds1307reg.h
Log Message:
Fixed 12/24h mode. Bit 6 from the hours register indicates 12h mode.
Do not overwrite the control register (0x07) with random contents.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/i2c/ds1307.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/ds1307reg.h
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/ds1307.c
diff -u src/sys/dev/i2c/ds1307.c:1.13 src/sys/dev/i2c/ds1307.c:1.14
--- src/sys/dev/i2c/ds1307.c:1.13 Sat May 28 13:59:31 2011
+++ src/sys/dev/i2c/ds1307.c Sat Jan 7 15:03:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307.c,v 1.13 2011/05/28 13:59:31 phx Exp $ */
+/* $NetBSD: ds1307.c,v 1.14 2012/01/07 15:03:11 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.13 2011/05/28 13:59:31 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.14 2012/01/07 15:03:11 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,15 +129,15 @@ dsrtc_open(dev_t dev, int flag, int fmt,
struct dsrtc_softc *sc;
if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
- return (ENXIO);
+ return ENXIO;
/* XXX: Locking */
if (sc->sc_open)
- return (EBUSY);
+ return EBUSY;
sc->sc_open = 1;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -147,10 +147,10 @@ dsrtc_close(dev_t dev, int flag, int fmt
struct dsrtc_softc *sc;
if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
- return (ENXIO);
+ return ENXIO;
sc->sc_open = 0;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -162,13 +162,13 @@ dsrtc_read(dev_t dev, struct uio *uio, i
int a, error;
if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
- return (ENXIO);
+ return ENXIO;
if (uio->uio_offset >= DS1307_NVRAM_SIZE)
- return (EINVAL);
+ return EINVAL;
if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0)
- return (error);
+ return error;
while (uio->uio_resid && uio->uio_offset < DS1307_NVRAM_SIZE) {
a = (int)uio->uio_offset;
@@ -179,17 +179,17 @@ dsrtc_read(dev_t dev, struct uio *uio, i
iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"dsrtc_read: read failed at 0x%x\n", a);
- return (error);
+ return error;
}
if ((error = uiomove(&ch, 1, uio)) != 0) {
iic_release_bus(sc->sc_tag, 0);
- return (error);
+ return error;
}
}
iic_release_bus(sc->sc_tag, 0);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -201,13 +201,13 @@ dsrtc_write(dev_t dev, struct uio *uio,
int a, error;
if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
- return (ENXIO);
+ return ENXIO;
if (uio->uio_offset >= DS1307_NVRAM_SIZE)
- return (EINVAL);
+ return EINVAL;
if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0)
- return (error);
+ return error;
while (uio->uio_resid && uio->uio_offset < DS1307_NVRAM_SIZE) {
a = (int)uio->uio_offset;
@@ -226,7 +226,7 @@ dsrtc_write(dev_t dev, struct uio *uio,
iic_release_bus(sc->sc_tag, 0);
- return (error);
+ return error;
}
static int
@@ -249,7 +249,7 @@ dsrtc_gettime(struct todr_chip_handle *c
dsrtc_clock_read(sc, &check);
} while (memcmp(dt, &check, sizeof(check)) != 0 && --retries);
- return (0);
+ return 0;
}
static int
@@ -258,9 +258,9 @@ dsrtc_settime(struct todr_chip_handle *c
struct dsrtc_softc *sc = ch->cookie;
if (dsrtc_clock_write(sc, dt) == 0)
- return (-1);
+ return -1;
- return (0);
+ return 0;
}
static int
@@ -272,7 +272,7 @@ dsrtc_clock_read(struct dsrtc_softc *sc,
if (iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) {
aprint_error_dev(sc->sc_dev,
"dsrtc_clock_read: failed to acquire I2C bus\n");
- return (0);
+ return 0;
}
/* Read each RTC register in order. */
@@ -286,7 +286,7 @@ dsrtc_clock_read(struct dsrtc_softc *sc,
aprint_error_dev(sc->sc_dev,
"dsrtc_clock_read: failed to read rtc "
"at 0x%x\n", i);
- return (0);
+ return 0;
}
}
@@ -299,15 +299,14 @@ dsrtc_clock_read(struct dsrtc_softc *sc,
dt->dt_sec = FROMBCD(bcd[DS1307_SECONDS] & DS1307_SECONDS_MASK);
dt->dt_min = FROMBCD(bcd[DS1307_MINUTES] & DS1307_MINUTES_MASK);
- if ((bcd[DS1307_HOURS] & DS1307_HOURS_24HRS) == 0) {
+ if ((bcd[DS1307_HOURS] & DS1307_HOURS_12HRS_MODE) != 0) {
dt->dt_hour = FROMBCD(bcd[DS1307_HOURS] &
- DS1307_HOURS_12MASK);
+ DS1307_HOURS_12MASK) % 12; /* 12AM -> 0, 12PM -> 12 */
if (bcd[DS1307_HOURS] & DS1307_HOURS_12HRS_PM)
dt->dt_hour += 12;
- } else {
+ } else
dt->dt_hour = FROMBCD(bcd[DS1307_HOURS] &
DS1307_HOURS_24MASK);
- }
dt->dt_day = FROMBCD(bcd[DS1307_DATE] & DS1307_DATE_MASK);
dt->dt_mon = FROMBCD(bcd[DS1307_MONTH] & DS1307_MONTH_MASK);
@@ -315,7 +314,7 @@ dsrtc_clock_read(struct dsrtc_softc *sc,
/* XXX: Should be an MD way to specify EPOCH used by BIOS/Firmware */
dt->dt_year = FROMBCD(bcd[DS1307_YEAR]) + POSIX_BASE_YEAR;
- return (1);
+ return 1;
}
static int
@@ -330,7 +329,7 @@ dsrtc_clock_write(struct dsrtc_softc *sc
*/
bcd[DS1307_SECONDS] = TOBCD(dt->dt_sec);
bcd[DS1307_MINUTES] = TOBCD(dt->dt_min);
- bcd[DS1307_HOURS] = TOBCD(dt->dt_hour) | DS1307_HOURS_24HRS;
+ bcd[DS1307_HOURS] = TOBCD(dt->dt_hour); /* DS1307_HOURS_12HRS_MODE=0 */
bcd[DS1307_DATE] = TOBCD(dt->dt_day);
bcd[DS1307_DAY] = TOBCD(dt->dt_wday);
bcd[DS1307_MONTH] = TOBCD(dt->dt_mon);
@@ -339,7 +338,7 @@ dsrtc_clock_write(struct dsrtc_softc *sc
if (iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) {
aprint_error_dev(sc->sc_dev,
"dsrtc_clock_write: failed to acquire I2C bus\n");
- return (0);
+ return 0;
}
/* Stop the clock */
@@ -351,7 +350,7 @@ dsrtc_clock_write(struct dsrtc_softc *sc
iic_release_bus(sc->sc_tag, I2C_F_POLL);
aprint_error_dev(sc->sc_dev,
"dsrtc_clock_write: failed to Hold Clock\n");
- return (0);
+ return 0;
}
/*
@@ -369,11 +368,11 @@ dsrtc_clock_write(struct dsrtc_softc *sc
"dsrtc_clock_write: failed to write rtc "
" at 0x%x\n", i);
/* XXX: Clock Hold is likely still asserted! */
- return (0);
+ return 0;
}
}
iic_release_bus(sc->sc_tag, I2C_F_POLL);
- return (1);
+ return 1;
}
Index: src/sys/dev/i2c/ds1307reg.h
diff -u src/sys/dev/i2c/ds1307reg.h:1.2 src/sys/dev/i2c/ds1307reg.h:1.3
--- src/sys/dev/i2c/ds1307reg.h:1.2 Sun Dec 11 12:21:22 2005
+++ src/sys/dev/i2c/ds1307reg.h Sat Jan 7 15:03:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307reg.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
+/* $NetBSD: ds1307reg.h,v 1.3 2012/01/07 15:03:11 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
#define DS1307_NVRAM_START 0x08
#define DS1307_NVRAM_END 0x3f
-#define DS1307_NRTC_REGS 8
+#define DS1307_NRTC_REGS 7
#define DS1307_NVRAM_SIZE ((DS1307_NVRAM_END - DS1307_NVRAM_START) + 1)
/*
@@ -64,7 +64,7 @@
#define DS1307_SECONDS_CH (1u << 7) /* Clock Hold */
#define DS1307_SECONDS_MASK 0x7f
#define DS1307_MINUTES_MASK 0x7f
-#define DS1307_HOURS_24HRS (1u << 6) /* Set for 24 hour mode */
+#define DS1307_HOURS_12HRS_MODE (1u << 6) /* Set for 12 hour mode */
#define DS1307_HOURS_12HRS_PM (1u << 5) /* If 12 hr mode, set = PM */
#define DS1307_HOURS_12MASK 0x1f
#define DS1307_HOURS_24MASK 0x3f
