X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/0c728c8de88d86247d2a75348e71f5af37838c28..50939dece93115ee500261129f311a840ca21a81:/avr/z180-serv.c diff --git a/avr/z180-serv.c b/avr/z180-serv.c index 9b4228a..929cd97 100644 --- 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 */ @@ -27,22 +29,6 @@ debug_cond(DEBUG_CPM_SDIO, fmt, ##args) - -/*--------------------------------------------------------------------------*/ - - -uint8_t z80_get_byte(uint32_t adr) -{ - uint8_t data; - - z80_bus_cmd(Request); - data = z80_read(adr); - z80_bus_cmd(Release); - - return data; -} - - /*--------------------------------------------------------------------------*/ struct msg_item { @@ -111,6 +97,116 @@ void do_msg_echo(uint8_t subf, int len, uint8_t * msg) msg_xmit(1, 3, len, msg); } +/* get timer */ +void do_msg_get_timer(uint8_t subf, int len, uint8_t * msg) +{ + uint32_t time_ms = (len >= 4) ? *(uint32_t *) msg : 0; + + time_ms = get_timer(time_ms); + msg_xmit(3, subf, sizeof(time_ms), (uint8_t *) &time_ms); +} + +/* ---------------------------------------------------------------------------*/ + +#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]) * 3600L; + 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; +} + +/* 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 @@ -122,11 +218,64 @@ struct cpm_drive_s { uint8_t drv; uint8_t device; char *img_name; + bool dirty; FIL fd; }; static uint8_t disk_buffer[BLOCK_SIZE]; static struct cpm_drive_s drv_table[MAX_DRIVE]; +static int handle_cpm_drv_to; + +#define f_dirty(fp) ((fp)->fs->wflag != 0) + + +int cpm_drv_to(int state) +{ + static uint32_t ts; + + switch(state) { + case 0: + break; + + case 1: + ts = get_timer(0); + state = 2; + break; + + case 2: + if (get_timer(ts) > 1000) { + for (uint_fast8_t i=0; i < MAX_DRIVE; i++) { +// if (&drv_table[i].fd && f_dirty(&drv_table[i].fd)) { + if (drv_table[i].dirty) { + f_sync(&drv_table[i].fd); + drv_table[i].dirty = false; + debug_cpmsd("## %7lu f_sync: %c:\n", get_timer(0), i+'A'); + } + } + state = 0; + } + } + return state; +} + + +void msg_cpm_result(uint8_t subf, uint8_t rc, int res) +{ + uint8_t result_msg[3]; + + if (res) + rc |= 0x80; + + result_msg[0] = rc; + result_msg[1] = res; + result_msg[2] = res >> 8; + + if (rc) { + debug_cpmsd("###%7lu error rc: %.02x, res: %d\n", get_timer(0), rc, res); + } + + msg_xmit(2, subf, sizeof(result_msg), result_msg); +} /* db 2 ; disk command @@ -140,16 +289,13 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) { FRESULT res = 0; - uint8_t rc = 0; uint8_t drv; char *np; - uint8_t result_msg[3]; (void)subf; if (len != 5) { /* TODO: check adrv, rdrv */ - rc = 0x01; - goto out; + return msg_cpm_result(subf, 0x01, res); } debug_cpmsd("\n## %7lu login: %c:\n", get_timer(0), msg[0]+'A'); @@ -157,8 +303,7 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) drv = msg[0]; if ( drv>= MAX_DRIVE) { - rc = 0x02; - goto out; + return msg_cpm_result(subf, 0x02, res); } /* @@ -168,6 +313,7 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) if (drv_table[drv].img_name != NULL) { debug_cpmsd("## %7lu close: '%s'\n", get_timer(0), drv_table[drv].img_name); f_close(&drv_table[drv].fd); + drv_table[drv].dirty = false; free(drv_table[drv].img_name); drv_table[drv].img_name = NULL; } @@ -176,8 +322,7 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) disk_buffer[3] = msg[0] + '0'; if (((np = getenv((char*)disk_buffer)) == NULL) || ((drv_table[drv].img_name = strdup(np)) == NULL)) { - rc = 0x03; - goto out; + return msg_cpm_result(subf, 0x03, res); } @@ -187,21 +332,8 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) debug_cpmsd("## %7lu open: '%s', (env: '%s'), res: %d\n", get_timer(0), drv_table[drv].img_name, disk_buffer, res); -out: - - if (res) - rc |= 0x80; - - result_msg[0] = rc; - result_msg[1] = res; - result_msg[2] = res >> 8; - - if (rc) { - debug_cpmsd("## %7lu error rc: %.02x, res: %d\n", get_timer(0), rc, res); - }; - /* send result*/ - msg_xmit(2, subf, sizeof(result_msg), result_msg); + msg_cpm_result(subf, 0x00, res); } @@ -233,17 +365,14 @@ void do_msg_cpm_rw(uint8_t subf, int len, uint8_t * msg) FRESULT res = 0; uint8_t rc = 0; bool buserr = 0; - uint8_t result_msg[3]; if (len != 10) { /* TODO: check adrv, rdrv */ - rc = 0x01; - goto out; + return msg_cpm_result(subf, 0x01, res); } drv = msg[ADRV]; if ( drv>= MAX_DRIVE) { - rc = 0x02; - goto out; + return msg_cpm_result(subf, 0x02, res); } secs = msg[CNT]; @@ -314,27 +443,20 @@ void do_msg_cpm_rw(uint8_t subf, int len, uint8_t * msg) addr += BLOCK_SIZE; } - if (dowrite && !res) - res = f_sync(&drv_table[drv].fd); + if (dowrite && !res) { +// res = f_sync(&drv_table[drv].fd); + drv_table[drv].dirty = true; + bg_setstat(handle_cpm_drv_to, 1); + } + -out: if (buserr) { debug_cpmsd("Bus timeout\n"); rc = 0x03; } - if (res) - rc |= 0x80; - - result_msg[0] = rc; - result_msg[1] = res; - result_msg[2] = res >> 8; - - if (rc) { - debug_cpmsd("###%7lu error rc: %.02x, res: %d\n", get_timer(0), rc, res); - } /* send result*/ - msg_xmit(2, subf, sizeof(result_msg), result_msg); + msg_cpm_result(subf, rc, res); } @@ -355,6 +477,12 @@ const FLASH struct msg_item z80_messages[] = { 2, 1, 2, do_msg_cpm_rw}, + { 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}, @@ -447,12 +575,15 @@ void check_msg_fifo(void) int msg_handling(int state) { - uint8_t pending; + bool pending; ATOMIC_BLOCK(ATOMIC_FORCEON) { pending = (Stat & S_MSG_PENDING) != 0; Stat &= ~S_MSG_PENDING; } +/* + * TODO: if pending but no message chr --> special condition. ie init,... + */ if (pending) { switch (state) { @@ -492,6 +623,7 @@ void setup_z180_serv(void) { handle_msg_handling = bg_register(msg_handling, 0); + handle_cpm_drv_to = bg_register(cpm_drv_to, 0); } void restart_z180_serv(void) @@ -508,6 +640,7 @@ void restart_z180_serv(void) } +#if 0 /*--------------------------------------------------------------------------*/ const FLASH uint8_t iniprog[] = { @@ -559,3 +692,4 @@ const FLASH uint8_t test1[] = { 0x00, // db 0 ;dst 0x00, 0x00, // dw 0 ;count (64k) }; +#endif