X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/393b1897603fddeb4f16170880ddd9414b3726e0..9461ecf31e8c701160059af2836337f79fc837b3:/avr/z180-serv.c diff --git a/avr/z180-serv.c b/avr/z180-serv.c index bf49a6c..a49c9f9 100644 --- a/avr/z180-serv.c +++ b/avr/z180-serv.c @@ -1,15 +1,17 @@ /* - * (C) Copyright 2014 Leo C. + * (C) Copyright 2014-2016 Leo C. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0 */ +#include "z180-serv.h" #include "common.h" #include #include #include #include +#include "config.h" #include "background.h" #include "env.h" #include "ff.h" @@ -17,32 +19,17 @@ #include "z80-if.h" #include "debug.h" #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 */ +#define DEBUG_CPM_SDIO 1 /* set to 1 to debug */ #define debug_cpmsd(fmt, args...) \ 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,26 +98,254 @@ 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 MAX_DRIVE 4 -#define BLOCK_SIZE 512 -#define TPA_BASE 0x10000 -#define COMMON_BASE 0xC000 +#define CPM_DAY_OFFSET ((1978-1900) * 365 + 19) /* 19 leap years */ -struct cpm_drive_s { - uint8_t drv; - uint8_t device; - char *img_name; - bool dirty; - FIL fd; -}; +/* + * 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); -static uint8_t disk_buffer[BLOCK_SIZE]; -static struct cpm_drive_s drv_table[MAX_DRIVE]; + /* 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 >= 0) { + time_t time; + time = mk_gmtime(&t); + //mktime(&t); + gmtime_r(&time, &t); + + mk_cpm_time(&t, cpm_time); + } else { + my_puts_P(PSTR("## get_time: Get date failed\n")); + } + break; + } + + msg_xmit(3, subf, sizeof(cpm_time), cpm_time); +} + +/* ---------------------------------------------------------------------------*/ + +static uint8_t disk_buffer[CONFIG_CPM_BLOCK_SIZE]; +static struct cpm_drive_s drv_table[CONFIG_CPM_MAX_DRIVE]; static int handle_cpm_drv_to; -#define f_dirty(fp) ((fp)->fs->wflag != 0) + +void drv_debug(uint8_t drv, const FLASH char *const fmt, ...) \ +{ + struct cpm_drive_s *dp = &drv_table[drv]; + + if (dp->opt & DRV_OPT_DEBUG) { + + va_list ap; + + printf_P(PSTR("# %7lu dsk%d: "), get_timer(0), drv); + + va_start (ap, fmt); + vfprintf_P (stdout, fmt, ap); + va_end (ap); + + putc('\n', stdout); + } +} + +int drv_list(void) +{ + for (uint8_t i = 0; i < CONFIG_CPM_MAX_DRIVE; i++) { + struct cpm_drive_s * p = &drv_table[i]; + if (p->img_name) { + printf_P(PSTR(" dsk%d: %2s %3s attached to %s\n"), i, + p->opt&DRV_OPT_RO ? "RO":"RW", p->opt&DRV_OPT_DEBUG ? "DBG":"", + p->img_name); + } + } + return 0; +} + +int drv_detach(uint8_t drv) +{ + if (drv < CONFIG_CPM_MAX_DRIVE) { + struct cpm_drive_s *p = &drv_table[drv]; + + drv_debug(drv, PSTR("detach from '%s'"), p->img_name ? p->img_name : "-"); + + if (p->img_name) { + f_close(&p->fd); + free(p->img_name); + p->opt = 0; + p->flags &= ~DRV_FLG_DIRTY; + p->img_name = NULL; + } + } + return 0; +} + +static int drv_find_file_attached(const char *fn) +{ + for (uint8_t i = 0; i < CONFIG_CPM_MAX_DRIVE; i++) { + struct cpm_drive_s *p = &drv_table[i]; + if (p->img_name && !strcmp(fn, p->img_name)) { + return i; + } + } + return -1; +} + +int drv_attach(uint8_t drv, const char *filename, drv_opt_t options) +{ + int res; + + if (drv >= CONFIG_CPM_MAX_DRIVE) + return AT_RANGE; + + struct cpm_drive_s *p = &drv_table[drv]; + + if (options & DRV_OPT_REATTATCH) { + if (filename) { + return AT_ERROR; + } + + if (!p->img_name) { + return AT_NOT; + } + + /* change options */ + if ((p->opt ^ options) & DRV_OPT_RO) { + f_close(&p->fd); + res = f_open(&p->fd, p->img_name, + FA_READ | (options&DRV_OPT_RO ? 0 : FA_WRITE)); + } + + p->opt = options & ~DRV_OPT_REATTATCH; + + } else { + + if (p->img_name) + return AT_ALREADY; + if (drv_find_file_attached(filename) >= 0) + return AT_OTHER; + + p->opt = options; + + /* new attachment */ + + if ((p->img_name = strdup(filename)) == NULL) + return AT_NOMEM; + + res = f_open(&p->fd, p->img_name, + FA_READ | (options&DRV_OPT_RO ? 0 : FA_WRITE)); + + if (!res && f_size(&p->fd) < CONFIG_CPM_DISKSIZE) { +#if 0 + unsigned int bw; + debug_cpmsd(" expanding image file from %ld to %ld\n", + f_size(&p->fd), CONFIG_CPM_DISKSIZE); + + res = f_lseek(&p->fd, CONFIG_CPM_DISKSIZE-CONFIG_CPM_BLOCK_SIZE); + if (!res) { + memset(disk_buffer, 0xe5, CONFIG_CPM_BLOCK_SIZE); + res = f_write(&p->fd, disk_buffer, CONFIG_CPM_BLOCK_SIZE, &bw); + if (res || bw < CONFIG_CPM_BLOCK_SIZE) { + debug_cpmsd(" failed! res: %d, bytes written: %u\n", res, bw); + } + p->flags |= DRV_FLG_DIRTY; + bg_setstat(handle_cpm_drv_to, 1); + } +#else + drv_debug(drv, PSTR("wrong image file size: %ld, should be %ld"), + f_size(&p->fd), CONFIG_CPM_DISKSIZE); + res = 64; +#endif + } + if (res) { + drv_detach(drv); + return AT_OPEN; + } + } + + return AT_OK; +} int cpm_drv_to(int state) @@ -148,12 +363,11 @@ int cpm_drv_to(int state) 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) { + for (uint_fast8_t i=0; i < CONFIG_CPM_MAX_DRIVE; i++) { + if (drv_table[i].flags & DRV_FLG_DIRTY) { + drv_table[i].flags &= ~DRV_FLG_DIRTY; f_sync(&drv_table[i].fd); - drv_table[i].dirty = false; - debug_cpmsd("## %7lu f_sync: %c:\n", get_timer(0), i+'A'); + drv_debug(i, PSTR("f_sync")); } } state = 0; @@ -191,50 +405,37 @@ void msg_cpm_result(uint8_t subf, uint8_t rc, int res) void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) { - - FRESULT res = 0; uint8_t drv; - char *np; + struct cpm_drive_s *dp; + FRESULT res = 0; (void)subf; - if (len != 5) { /* TODO: check adrv, rdrv */ + if (len != 5) { return msg_cpm_result(subf, 0x01, res); } - debug_cpmsd("\n## %7lu login: %c:\n", get_timer(0), msg[0]+'A'); - - - drv = msg[0]; - if ( drv>= MAX_DRIVE) { + /* Get relative drive number */ + drv = msg[1]; + if ( drv >= CONFIG_CPM_MAX_DRIVE) { + debug_cpmsd("## login failed: invalid relative drive number '%d'\n", drv); return msg_cpm_result(subf, 0x02, res); } -/* - uint32_t dph = ((uint32_t)msg[4] << 16) + ((uint16_t)msg[3] << 8) + msg[2]; -*/ + drv_debug(drv, PSTR("login")); - 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; - } + dp = &drv_table[drv]; + dp->flags &= ~DRV_FLG_OPEN; + dp->dph = ((uint32_t)msg[4] << 16) + ((uint16_t)msg[3] << 8) + msg[2]; - strcpy_P((char *)disk_buffer, PSTR("dsk0")); - disk_buffer[3] = msg[0] + '0'; - if (((np = getenv((char*)disk_buffer)) == NULL) || - ((drv_table[drv].img_name = strdup(np)) == NULL)) { + + if (dp->img_name == NULL) { + /* no file attached */ + drv_debug(drv, PSTR("login failed: no file attached")); return msg_cpm_result(subf, 0x03, res); } - - res = f_open(&drv_table[drv].fd, drv_table[drv].img_name, - FA_WRITE | FA_READ); - - debug_cpmsd("## %7lu open: '%s', (env: '%s'), res: %d\n", get_timer(0), - drv_table[drv].img_name, disk_buffer, res); + dp->flags |= DRV_FLG_OPEN; /* send result*/ msg_cpm_result(subf, 0x00, res); @@ -262,100 +463,99 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) void do_msg_cpm_rw(uint8_t subf, int len, uint8_t * msg) { uint8_t drv; + struct cpm_drive_s *dp; uint32_t addr; uint32_t pos; + uint16_t track; + uint16_t sec; uint8_t secs; - bool dowrite = (subf == 2); + bool dowrite; FRESULT res = 0; uint8_t rc = 0; bool buserr = 0; - if (len != 10) { /* TODO: check adrv, rdrv */ + if (len != 10) { return msg_cpm_result(subf, 0x01, res); } - drv = msg[ADRV]; - if ( drv>= MAX_DRIVE) { + drv = msg[RDRV]; + if ( drv>= CONFIG_CPM_MAX_DRIVE) { return msg_cpm_result(subf, 0x02, res); } + dp = &drv_table[drv]; + + if (dp->img_name == NULL) { + /* no media */ + return msg_cpm_result(subf, 0x06, res); + } + + if (subf == 2) { + dowrite = true; + if (dp->opt & DRV_OPT_RO) { + return msg_cpm_result(subf, 0x05, res); + } + } else { + dowrite = false; + } + + track = (uint16_t)(msg[TRK+1] << 8) + msg[TRK]; + sec = (uint16_t)(msg[SEC+1] << 8) + msg[SEC]; secs = msg[CNT]; addr = ((uint32_t)msg[ADDR+2] << 16) + ((uint16_t)msg[ADDR+1] << 8) + msg[ADDR]; /* TODO: tracks per sector from dpb */ - pos = (((uint16_t)(msg[TRK+1] << 8) + msg[TRK]) * 8 - + ((uint32_t)(msg[SEC+1] << 8) + msg[SEC])) * BLOCK_SIZE; + pos = (track * 8UL + sec) * CONFIG_CPM_BLOCK_SIZE; - debug_cpmsd("## %7lu cpm_rw: %s %c: trk:%4d, sec: %d, pos: %.8lx, secs: %2d, " - "addr: %.5lx\n", get_timer(0), dowrite ? "write" : " read", - msg[ADRV]+'A', ((uint16_t)(msg[TRK+1] << 8) + msg[TRK]), msg[SEC], - pos, msg[CNT], addr); + drv_debug(drv, PSTR("%5s trk:%4d, sec: %d, pos: %.8lx, secs: %2d, addr: %.5lx"), + dowrite ? "write" : " read", track, sec, pos, secs, addr); - res = f_lseek(&drv_table[drv].fd, pos); - while (!res && secs--) { - unsigned int cnt, br; - - /* check bank boundary crossing */ - cnt = 0; - if (addr < (TPA_BASE + COMMON_BASE) && - (addr + BLOCK_SIZE) > (TPA_BASE + COMMON_BASE)) { - cnt = (TPA_BASE + COMMON_BASE) - addr; - } + if (pos + secs * CONFIG_CPM_BLOCK_SIZE > CONFIG_CPM_DISKSIZE) { + drv_debug(drv, PSTR("access > DISKSIZE (%.8lx > %.8lx) aborted!"), + pos + secs * CONFIG_CPM_BLOCK_SIZE, CONFIG_CPM_DISKSIZE); + return msg_cpm_result(subf, 0x04, res); + } - if (cnt) { - debug_cpmsd("## %67c addr: %.5lx, cnt: %3d\n", ' ', addr, cnt); - debug_cpmsd("## %67c addr: %.5lx, cnt: %3d\n", ' ', addr+cnt-TPA_BASE, BLOCK_SIZE-cnt); - } + res = f_lseek(&dp->fd, pos); + while (!res && secs--) { + unsigned int brw; if (dowrite) { if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) { buserr = 1; break; } else { - if (cnt) { - z80_read_block(disk_buffer, addr, cnt); - addr = addr + cnt - TPA_BASE; - } - z80_read_block(disk_buffer+cnt, addr, BLOCK_SIZE - cnt); + z80_read_block(disk_buffer, addr, CONFIG_CPM_BLOCK_SIZE); z80_bus_cmd(Release); } - res = f_write(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &br); + res = f_write(&dp->fd, disk_buffer, CONFIG_CPM_BLOCK_SIZE, &brw); } else { - res = f_read(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &br); - if (res == FR_OK && br == BLOCK_SIZE) { + res = f_read(&dp->fd, disk_buffer, CONFIG_CPM_BLOCK_SIZE, &brw); + if (res == FR_OK) { if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) { buserr = 1; break; } else { - if (cnt) { - z80_write_block(disk_buffer, addr, cnt); - addr = addr + cnt - TPA_BASE; - } - z80_write_block(disk_buffer+cnt, addr, BLOCK_SIZE - cnt); + z80_write_block(disk_buffer, addr, CONFIG_CPM_BLOCK_SIZE); z80_bus_cmd(Release); } } } - - if (br != BLOCK_SIZE) { - debug_cpmsd("## %7lu f_read res: %d, bytes rd/wr: %u\n", get_timer(0), res, br); - dump_ram(disk_buffer, 0, 64, "Read Data"); - res = -1; + if (brw != CONFIG_CPM_BLOCK_SIZE) { + drv_debug(drv, PSTR("short read or write: res: %d, bytes rd/wr: %u"), res, brw); + res = 64; } - - addr += BLOCK_SIZE; + addr += CONFIG_CPM_BLOCK_SIZE; } if (dowrite && !res) { -// res = f_sync(&drv_table[drv].fd); - drv_table[drv].dirty = true; + dp->flags |= DRV_FLG_DIRTY; bg_setstat(handle_cpm_drv_to, 1); } - if (buserr) { - debug_cpmsd("Bus timeout\n"); + drv_debug(drv, PSTR("Bus timeout")); rc = 0x03; } @@ -381,6 +581,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}, @@ -473,7 +679,7 @@ 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; @@ -481,30 +687,27 @@ int msg_handling(int state) } if (pending) { - switch (state) { - case 0: /* need init */ - /* Get address of fifo_list */ + uint8_t init_request; + z80_bus_cmd(Request); + init_request = z80_read(0x43); + z80_bus_cmd(Release); + if ( init_request != 0) { + /* Get address of fifo 0 */ z80_bus_cmd(Request); - uint32_t fifo_list = z80_read(0x40) + - ((uint16_t) z80_read(0x41) << 8) + - ((uint32_t) z80_read(0x42) << 16); + uint32_t fifo_addr = z80_read(0x40) + + ((uint16_t) z80_read(0x40+1) << 8) + + ((uint32_t) z80_read(0x40+2) << 16); + z80_write(0x43, 0); z80_bus_cmd(Release); - if (fifo_list != 0) { - /* Get address of fifo 0 */ - z80_bus_cmd(Request); - uint32_t fifo_addr = z80_read(fifo_list) + - ((uint16_t) z80_read(fifo_list+1) << 8) + - ((uint32_t) z80_read(fifo_list+2) << 16); - z80_bus_cmd(Release); - if (fifo_addr != 0) { - z80_memfifo_init(fifo_msgin, fifo_addr); - state = 1; - } - } - break; - case 1: /* awaiting messages */ + + if (fifo_addr != 0) { + z80_memfifo_init(fifo_msgin, fifo_addr); + state = 1; + } else + state = 0; + + } else { check_msg_fifo(); - break; } } @@ -524,9 +727,7 @@ void setup_z180_serv(void) void restart_z180_serv(void) { z80_bus_cmd(Request); - z80_write(0x40, 0); - z80_write(0x41, 0); - z80_write(0x42, 0); + z80_memset(0x40, 0, 4); z80_bus_cmd(Release); for (int i = 0; i < NUM_FIFOS; i++) @@ -535,6 +736,7 @@ void restart_z180_serv(void) } +#if 0 /*--------------------------------------------------------------------------*/ const FLASH uint8_t iniprog[] = { @@ -586,3 +788,4 @@ const FLASH uint8_t test1[] = { 0x00, // db 0 ;dst 0x00, 0x00, // dw 0 ;count (64k) }; +#endif