phys. address 0x00040 points to fifo_list

[z180-stamp.git] / avr / pcf8583.c

diff --git a/avr/pcf8583.c b/avr/pcf8583.c
index af1331dad7a6fcdb82cab02f604830847f24fe7d..169e4e937baa4ad7aee475316c6332c0ae86cb94 100644 (file)
--- a/avr/pcf8583.c
+++ b/avr/pcf8583.c
@@ -1,13 +1,20 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
 /*
  * Date & Time support for Philips PCF8583 RTC
  */
 
 #include "common.h"
 #include <stdlib.h>
-#include "debug.h"
-#include "command.h"
+#include "time.h"
 #include "rtc.h"
 #include "i2c.h"
+#include "command.h"
+#include "debug.h"
 
 #define  DEBUG_RTC 0
 
@@ -34,17 +41,17 @@ static uint_fast8_t bcd2bin(uint8_t val)
 static uint8_t bin2bcd (uint_fast8_t val)
 {
        div_t d = div(val, 10);
-       
+
        return (d.quot << 4) | d.rem;
 }
 
 
-int rtc_get (struct rtc_time *tmp)
+int rtc_get (struct tm *tmp)
 {
        int rel = 0;
        uint8_t rtcbuf[NR_OF_REGS];
-       uint16_t year;
-       
+       int16_t year;
+
        i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, rtcbuf, NR_OF_REGS);
        i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0x10, 1, (uint8_t *) &year, 2);
 
@@ -56,12 +63,12 @@ int rtc_get (struct rtc_time *tmp)
        tmp->tm_min  = bcd2bin (rtcbuf[REG_MIN]    & 0x7F);
        tmp->tm_hour = bcd2bin (rtcbuf[REG_HOUR]   & 0x3F);
        tmp->tm_mday = bcd2bin (rtcbuf[REG_YRDATE] & 0x3F);
-       tmp->tm_mon  = bcd2bin (rtcbuf[REG_WDMON]  & 0x1F);
+       tmp->tm_mon  = bcd2bin (rtcbuf[REG_WDMON]  & 0x1F) - 1;
        while (year%4 < (rtcbuf[REG_YRDATE]>>6)) {
                year++;
                /* TODO: update RTC ram */
        }
-       tmp->tm_year  = year; 
+       tmp->tm_year  = year;
        tmp->tm_wday = rtcbuf[REG_WDMON] >> 5;
        tmp->tm_yday = 0;
        tmp->tm_isdst= 0;
@@ -74,7 +81,7 @@ int rtc_get (struct rtc_time *tmp)
        return rel;
 }
 
-int rtc_set (struct rtc_time *tmp)
+int rtc_set (struct tm *tmp)
 {
        uint8_t rtcbuf[NR_OF_REGS];
 
@@ -84,7 +91,7 @@ int rtc_set (struct rtc_time *tmp)
 
        rtcbuf[REG_CS] = 0x84;
        rtcbuf[REG_CSEC] = 0x00;
-       rtcbuf[REG_WDMON ] = bin2bcd(tmp->tm_mon) | ((tmp->tm_wday) << 5);
+       rtcbuf[REG_WDMON ] = (bin2bcd(tmp->tm_mon) + 1) | ((tmp->tm_wday) << 5);
        rtcbuf[REG_YRDATE] = ((tmp->tm_year % 4) << 6) | bin2bcd(tmp->tm_mday);
        rtcbuf[REG_HOUR  ] = bin2bcd(tmp->tm_hour);
        rtcbuf[REG_MIN   ] = bin2bcd(tmp->tm_min);