Server: Time and Date support

diff --git a/avr/Tupfile b/avr/Tupfile
index 0c35de4cfb94e9d5f38424d40d4c04264315d98e..d73db12fb4f391127025161dd09b3f370ec666a4 100644 (file)
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -9,7 +9,7 @@ SRC             += cli.c cli_readline.c command.c command_tbl.c
 SRC            += cmd_help.c cmd_date.c cmd_mem.c cmd_boot.c cmd_gpio.c cmd_misc.c
 SRC            += cmd_loadihex.c cmd_loadcpm3.c cmd_sd.c cmd_fat.c
 SRC            += env.c xmalloc.c con-utils.c print-utils.c getopt-min.c
-SRC            += timer.c serial.c i2c.c pcf8583.c mmc.c
+SRC            += timer.c serial.c i2c.c bcd.c pcf8583.c mmc.c
 SRC            += background.c z180-serv.c z80-if.c gpio.c
 SRC            += $(FATFS) $(TOP)/fatfs/src/option/unicode.c
 

diff --git a/avr/bcd.c b/avr/bcd.c
new file mode 100644 (file)
index 0000000..5154852
--- /dev/null
+++ b/avr/bcd.c
@@ -0,0 +1,21 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "stdlib.h"
+#include "stdint.h"
+#include "bcd.h"
+
+uint_fast8_t bcd2bin(uint8_t val)
+{
+       return (val >> 4) * 10 + (val & 0x0f);
+}
+
+uint8_t bin2bcd (uint_fast8_t val)
+{
+       div_t d = div(val, 10);
+
+       return (d.quot << 4) | d.rem;
+}

diff --git a/avr/z180-serv.c b/avr/z180-serv.c
index 7193495d513e4b9f42a743d108e4291b34a21e46..0712d8d2815cf8fc3ffac3fcb11794db3ec19194 100644 (file)
--- a/avr/z180-serv.c
+++ b/avr/z180-serv.c
@@ -19,7 +19,9 @@
 #include "print-utils.h"
 #include "z180-serv.h"
 #include "timer.h"
-
+#include "time.h"
+#include "bcd.h"
+#include "rtc.h"
 
 #define DEBUG_CPM_SDIO 0       /* set to 1 to debug */
 
@@ -122,6 +124,110 @@ void do_msg_get_timer(uint8_t subf, int len, uint8_t * msg)
 
 /* ---------------------------------------------------------------------------*/
 
+#define CPM_DAY_OFFSET ((1978-1900) * 365 + 19)                /* 19 leap years */
+
+/*
+ * Convert CP/M time stamp to a broken-down time structure
+ *
+ */
+int mk_date_time (int len, uint8_t *msg, struct tm *tmp)
+{
+       time_t stamp;
+
+       if (len != 5)
+               return -1;
+
+       /* days since 2000-01-01 */
+       long days = msg[3] + (msg[4] << 8) - 8036;
+
+       if (days < 0)
+               return -1;
+
+       stamp = days * ONE_DAY;
+       stamp += bcd2bin(msg[0]);
+       stamp += bcd2bin(msg[1]) * 60 ;
+       stamp += bcd2bin(msg[2]) * 3600;
+       gmtime_r(&stamp, tmp);
+       return 0;
+}
+
+void mk_cpm_time(struct tm *tmp, uint8_t cpm_time[5])
+{
+       uint16_t days = 1;
+       uint_fast8_t leap=2;
+
+       for (int year=78; year < tmp->tm_year; year++) {
+               days = days + 365 + (leap == 0);
+               leap = (leap+1)%4;
+       }
+       days += tmp->tm_yday;
+
+       cpm_time[0] = bin2bcd(tmp->tm_sec);
+       cpm_time[1] = bin2bcd(tmp->tm_min);
+       cpm_time[2] = bin2bcd(tmp->tm_hour);
+       cpm_time[3] = days;
+       cpm_time[4] = days >> 8;
+
+       debug("## mk_cpmtime: tm_year: %d, tm_yday: %d, days: %d\n",
+       tmp->tm_year, tmp->tm_yday, days);
+}
+
+/* get/set cp/m time */
+void do_msg_get_set_time(uint8_t subf, int len, uint8_t * msg)
+{
+       struct tm t;
+       uint8_t cpm_time[5];
+       int rc;
+
+       memset(cpm_time, 0, ARRAY_SIZE(cpm_time));
+
+       switch (subf) {
+       case 3:                 /* set date & time */
+               /* initialize t with current time */
+               rc = rtc_get (&t);
+
+               if (rc == 0) {
+                       /* insert new date & time */
+                       if (mk_date_time (len, msg, &t) != 0) {
+                               my_puts_P(PSTR("## set_time: Bad date format\n"));
+                               break;
+                       }
+
+                       time_t time;
+                       time = mk_gmtime(&t);
+                       gmtime_r(&time, &t);
+
+                       /* and write to RTC */
+                       rc = rtc_set (&t);
+                       if(rc)
+                               my_puts_P(PSTR("## set_time: Set date failed\n"));
+               } else {
+                       my_puts_P(PSTR("## set_time: Get date failed\n"));
+               }
+               /* FALL TROUGH */
+       case 2:                 /* get date & time */
+               rc = rtc_get (&t);
+
+               if (rc) {
+                       my_puts_P(PSTR("## get_time: Get date failed\n"));
+                       break;
+               }
+
+               time_t time;
+               time = mk_gmtime(&t);
+               //mktime(&t);
+               gmtime_r(&time, &t);
+
+
+               mk_cpm_time(&t, cpm_time);
+               break;
+       }
+
+       msg_xmit(3, subf, sizeof(cpm_time), cpm_time);
+}
+
+/* ---------------------------------------------------------------------------*/
+
 #define MAX_DRIVE      4
 #define BLOCK_SIZE     512
 #define TPA_BASE       0x10000
@@ -393,6 +499,9 @@ const FLASH struct msg_item z80_messages[] =
        { 3,
          1, 1,
          do_msg_get_timer},
+       { 3,
+         2, 3,                         /* 2: get, 3: set time and date */
+         do_msg_get_set_time},
        { 0xff,                         /* end mark */
          0, 0,
          0},
@@ -550,6 +659,7 @@ void restart_z180_serv(void)
 
 }
 
+#if 0
 /*--------------------------------------------------------------------------*/
 
 const FLASH uint8_t iniprog[] = {
@@ -601,3 +711,4 @@ const FLASH uint8_t test1[] = {
        0x00,              //   db      0               ;dst
        0x00, 0x00,        //   dw      0               ;count (64k)
 };
+#endif

diff --git a/include/bcd.h b/include/bcd.h
new file mode 100644 (file)
index 0000000..efbebcc
--- /dev/null
+++ b/include/bcd.h
@@ -0,0 +1,13 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef BCD_H
+#define BCD_H
+
+uint_fast8_t bcd2bin(uint8_t val);
+uint8_t bin2bcd (uint_fast8_t val);
+
+#endif /* BCD_H */

diff --git a/z180/config.inc b/z180/config.inc
index 2a8a842d0c4067f00f38425fab6c66601b3b9490..034febe128e698d4d96938239d5dfad44e7751c9 100644 (file)
--- a/z180/config.inc
+++ b/z180/config.inc
@@ -21,8 +21,8 @@ AVRCLK                equ     18432           ;[KHz]
     if CPU_Z180\r
 \r
 ;-----------------------------------------------------\r
-FOSC           equ     AVRCLK/2        ;Oscillator frequency [KHz]\r
-PHI            equ     FOSC*2          ;CPU frequency (clock doubler enabled)\r
+;FOSC          equ     AVRCLK/2        ;Oscillator frequency [KHz]\r
+;PHI           equ     FOSC*2          ;CPU frequency (clock doubler enabled)\r
 \r
 ;----------------------------------------------------------------------\r
 ; Baudrate Generator for x16 clock mode:\r
@@ -43,11 +43,6 @@ PHI          equ     FOSC*2          ;CPU frequency (clock doubler enabled)
 \r
 PRT_PRE                equ     20              ;PRT prescaler\r
 \r
-; Reload value for 10 ms Int. (0.1KHz):\r
-; tc10ms = phi/prescale/0.1KHz  = phi / (prescale/10)\r
-\r
-PRT_TC10MS     equ     PHI / (PRT_PRE/10)\r
-\r
 ;-----------------------------------------------------\r
 ; MMU\r
 \r

diff --git a/z180/init.180 b/z180/init.180
index b0b4b21f681a8898fe84ae737304a326fda91f4a..d56975e7ae3b5021dec463d303853361961ae7e6 100644 (file)
--- a/z180/init.180
+++ b/z180/init.180
@@ -416,6 +416,12 @@ ivt_i1:
 \r
 ;----------------------------------------------------------------------\r
 \r
+; Reload value for 10 ms Int. (0.1KHz):\r
+; tc10ms = phi/prescale/0.1KHz  = phi / (prescale/10)\r
+\r
+PRT_TC10MS     equ     18432 / (PRT_PRE/10)\r
+\r
+\r
     if CPU_Z180\r
 prt0_init:\r
        ld      a,i\r