[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 12/14] timer: ds-rtc handle CENTURY bit
From: |
David Gibson |
Subject: |
Re: [Qemu-devel] [PATCH 12/14] timer: ds-rtc handle CENTURY bit |
Date: |
Mon, 16 Jul 2018 19:43:10 +1000 |
User-agent: |
Mutt/1.10.0 (2018-05-17) |
On Thu, Jul 05, 2018 at 11:19:59AM -0700, Michael Davidsaver wrote:
> Signed-off-by: Michael Davidsaver <address@hidden>
> Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: David Gibson <address@hidden>
> ---
> hw/timer/ds-rtc.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/hw/timer/ds-rtc.c b/hw/timer/ds-rtc.c
> index 6d3a8b5586..9abac38628 100644
> --- a/hw/timer/ds-rtc.c
> +++ b/hw/timer/ds-rtc.c
> @@ -70,6 +70,7 @@ typedef struct DSRTCState {
> typedef struct DSRTCClass {
> I2CSlaveClass parent_obj;
>
> + bool has_century;
> /* actual address space size must be <= NVRAM_SIZE */
> unsigned addr_size;
> unsigned ctrl_offset;
> @@ -93,6 +94,7 @@ static const VMStateDescription vmstate_dsrtc = {
>
> static void capture_current_time(DSRTCState *s)
> {
> + DSRTCClass *k = DSRTC_GET_CLASS(s);
> /* Capture the current time into the secondary registers
> * which will be actually read by the data transfer operation.
> */
> @@ -125,7 +127,10 @@ static void capture_current_time(DSRTCState *s)
> }
> s->nvram[R_DATE] = to_bcd(now.tm_mday);
> s->nvram[R_MONTH] = to_bcd(now.tm_mon + 1);
> - s->nvram[R_YEAR] = to_bcd(now.tm_year - 100);
> + s->nvram[R_YEAR] = to_bcd(now.tm_year % 100u);
> +
> + ARRAY_FIELD_DP32(s->nvram, MONTH, CENTURY,
> + k->has_century && now.tm_year >= 100)
> }
>
> static void inc_regptr(DSRTCState *s)
> @@ -282,6 +287,7 @@ static void ds1338_class_init(ObjectClass *klass, void
> *data)
> {
> DSRTCClass *k = DSRTC_CLASS(klass);
>
> + k->has_century = false;
> k->addr_size = 0x40;
> k->ctrl_offset = R_DS1338_CTRL;
> k->ctrl_write = ds1338_control_write;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- [Qemu-devel] [PATCH v2 06/14] tests: ds-rtc test 12 hour mode, (continued)
- [Qemu-devel] [PATCH 07/14] tests: ds-rtc test wday offset, Michael Davidsaver, 2018/07/05
- [Qemu-devel] [PATCH 09/14] timer: rename file ds1338.c -> ds-rtc.c, Michael Davidsaver, 2018/07/05
- [Qemu-devel] [PATCH 10/14] timer: ds1338 remove vestige of un-modeled OSF, Michael Davidsaver, 2018/07/05
- [Qemu-devel] [PATCH 08/14] timer: rename ds1338 -> dsrtc, Michael Davidsaver, 2018/07/05
- [Qemu-devel] [PATCH 12/14] timer: ds-rtc handle CENTURY bit, Michael Davidsaver, 2018/07/05
- Re: [Qemu-devel] [PATCH 12/14] timer: ds-rtc handle CENTURY bit,
David Gibson <=
- [Qemu-devel] [PATCH 13/14] timer: ds-rtc model ds1375, Michael Davidsaver, 2018/07/05
- [Qemu-devel] [PATCH 14/14] tests: drop ds1338-test, Michael Davidsaver, 2018/07/05
- Message not available