Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check and clear the HT bit in strtc_clock_read(), not just strtc_clock_write()

Browse Source 
otherwise we end up reading the date/time of the previous powerfail event.
This commit is contained in:
scw 2004-11-24 14:46:18 +00:00
parent fc7a4ed42c
commit 1d6e3e9f5a
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/i2c/m41st84.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: m41st84.c,v 1.2 2004/01/20 19:12:54 briggs Exp $ */ /* $NetBSD: m41st84.c,v 1.3 2004/11/24 14:46:18 scw Exp $ */
/* /*
* Copyright (c) 2003 Wasabi Systems, Inc. * Copyright (c) 2003 Wasabi Systems, Inc.
@ -287,6 +287,30 @@ strtc_clock_read(struct strtc_softc *sc, struct clock_ymdhms *dt)
return (0); return (0);
} }
/*
* Check for the HT bit -- if set, then clock lost power & stopped
* If that happened, then clear the bit so that the clock will have
* a chance to run again.
*/
cmdbuf[0] = M41ST84_REG_AL_HOUR;
if (iic_exec(sc->sc_tag, I2C_OP_READ, sc->sc_address,
cmdbuf, 1, &cmdbuf[1], 1, I2C_F_POLL)) {
iic_release_bus(sc->sc_tag, I2C_F_POLL);
printf("%s: strtc_clock_read: failed to read HT\n",
sc->sc_dev.dv_xname);
return (0);
}
if (cmdbuf[1] & M41ST84_AL_HOUR_HT) {
cmdbuf[1] &= ~M41ST84_AL_HOUR_HT;
if (iic_exec(sc->sc_tag, I2C_OP_WRITE, sc->sc_address,
cmdbuf, 1, &cmdbuf[1], 1, I2C_F_POLL)) {
iic_release_bus(sc->sc_tag, I2C_F_POLL);
printf("%s: strtc_clock_read: failed to reset HT\n",
sc->sc_dev.dv_xname);
return (0);
}
}
/* Read each RTC register in order. */ /* Read each RTC register in order. */
for (i = M41ST84_REG_CSEC; i < M41ST84_REG_DATE_BYTES; i++) { for (i = M41ST84_REG_CSEC; i < M41ST84_REG_DATE_BYTES; i++) {
cmdbuf[0] = i; cmdbuf[0] = i;