X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/1aed7fd5dc9fb03d459ad7fb096bfc52c80d2cd3..9461ecf31e8c701160059af2836337f79fc837b3:/avr/z180-serv.c?ds=sidebyside diff --git a/avr/z180-serv.c b/avr/z180-serv.c index 62e8729..a49c9f9 100644 --- a/avr/z180-serv.c +++ b/avr/z180-serv.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0 */ +#include "z180-serv.h" #include "common.h" #include #include @@ -18,13 +19,12 @@ #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) @@ -207,22 +207,147 @@ void do_msg_get_set_time(uint8_t subf, int len, uint8_t * msg) /* ---------------------------------------------------------------------------*/ -/* TODO: Variable Disk Format */ -#define CONFIG_CPM_DISKSIZE (8*1024*1024L) - -struct cpm_drive_s { - uint8_t drv; - uint8_t device; - char *img_name; - bool dirty; - FIL fd; -}; - 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; +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) { static uint32_t ts; @@ -239,10 +364,10 @@ int cpm_drv_to(int state) case 2: if (get_timer(ts) > 1000) { for (uint_fast8_t i=0; i < CONFIG_CPM_MAX_DRIVE; i++) { - if (drv_table[i].dirty) { + 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; @@ -280,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>= CONFIG_CPM_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")); + + dp = &drv_table[drv]; + dp->flags &= ~DRV_FLG_OPEN; + dp->dph = ((uint32_t)msg[4] << 16) + ((uint16_t)msg[3] << 8) + msg[2]; - 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; - } - strcpy_P((char *)disk_buffer, PSTR("dsk0")); - disk_buffer[3] = msg[0] + '0'; - if (((np = getenv_char((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); @@ -351,43 +463,61 @@ 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]; + 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])) * CONFIG_CPM_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); if (pos + secs * CONFIG_CPM_BLOCK_SIZE > CONFIG_CPM_DISKSIZE) { - debug_cpmsd(" access > DISKSIZE (%.8lx > %.8lx) aborted!\n", + 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); } - res = f_lseek(&drv_table[drv].fd, pos); + res = f_lseek(&dp->fd, pos); while (!res && secs--) { unsigned int brw; @@ -399,9 +529,9 @@ void do_msg_cpm_rw(uint8_t subf, int len, uint8_t * msg) z80_read_block(disk_buffer, addr, CONFIG_CPM_BLOCK_SIZE); z80_bus_cmd(Release); } - res = f_write(&drv_table[drv].fd, disk_buffer, CONFIG_CPM_BLOCK_SIZE, &brw); + res = f_write(&dp->fd, disk_buffer, CONFIG_CPM_BLOCK_SIZE, &brw); } else { - res = f_read(&drv_table[drv].fd, disk_buffer, CONFIG_CPM_BLOCK_SIZE, &brw); + 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; @@ -412,25 +542,20 @@ void do_msg_cpm_rw(uint8_t subf, int len, uint8_t * msg) } } } - if (brw != CONFIG_CPM_BLOCK_SIZE) { - debug_cpmsd("## %7lu f_read res: %d, bytes rd/wr: %u\n", get_timer(0), res, brw); - dump_ram(disk_buffer, 0, 64, "Read Data"); - res = -1; + drv_debug(drv, PSTR("short read or write: res: %d, bytes rd/wr: %u"), res, brw); + res = 64; } - 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; }