X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/014840952dc85c55989a23a79b90d4d3f51de15c..2ca8d8c70415549571f3e6759683dd33daf1bc42:/avr/z180-serv.c diff --git a/avr/z180-serv.c b/avr/z180-serv.c index dfdb022..25ffc9c 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,21 +19,15 @@ #include "z80-if.h" #include "debug.h" #include "print-utils.h" -#include "z180-serv.h" - -/*--------------------------------------------------------------------------*/ - - -uint8_t z80_get_byte(uint32_t adr) -{ - uint8_t data; +#include "timer.h" +#include "time.h" +#include "bcd.h" +#include "rtc.h" - z80_bus_cmd(Request); - data = z80_read(adr); - z80_bus_cmd(Release); +#define DEBUG_CPM_SDIO 0 /* set to 1 to debug */ - return data; -} +#define debug_cpmsd(fmt, args...) \ + debug_cond(DEBUG_CPM_SDIO, fmt, ##args) /*--------------------------------------------------------------------------*/ @@ -102,82 +98,295 @@ 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 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; -struct cpm_drive_s { - uint8_t drv; - uint8_t device; - char *img_name; - FIL fd; -}; + if (len != 5) + return -1; -static uint8_t disk_buffer[BLOCK_SIZE]; -static struct cpm_drive_s drv_table[MAX_DRIVE]; + /* days since 2000-01-01 */ + long days = msg[3] + (msg[4] << 8) - 8036; -/* - db 2 ; disk command - ds 1 ; subcommand (login/read/write) - ds 1 ; @adrv (8 bits) +0 - ds 1 ; @rdrv (8 bits) +1 - ds 3 ; @xdph (24 bits) +2 -*/ + if (days < 0) + return -1; -void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) + 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; - FRESULT res = 0; - uint8_t rc = 0; - uint8_t drv; - char *np; - uint8_t result_msg[3]; + for (int year=78; year < tmp->tm_year; year++) { + days = days + 365 + (leap == 0); + leap = (leap+1)%4; + } + days += tmp->tm_yday; - (void)subf; + 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; + } - if (len != 5) { /* TODO: check adrv, rdrv */ - rc = 0x01; - goto out; + 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 >= 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; } - debug("\n## login: %c:\n", msg[0]+'A'); + 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; + + +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) { - drv = msg[0]; - if ( drv>= MAX_DRIVE) { - rc = 0x02; - goto out; + 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); } +} -/* - uint32_t dph = ((uint32_t)msg[4] << 16) + ((uint16_t)msg[3] << 8) + msg[2]; -*/ +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; +} - if (drv_table[drv].img_name != NULL) { - debug("## close: '%s'\n", drv_table[drv].img_name); - f_close(&drv_table[drv].fd); - free(drv_table[drv].img_name); - drv_table[drv].img_name = NULL; +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; + + uint32_t scb = getenv_ulong(ENV_CPM3_SCB, 16, 0); + if (scb && (z80_bus_cmd(Request) & ZST_ACQUIRED)) { + z80_write(scb + 0xf0, 0xff); + z80_write(p->dph + 11, 0xff); + z80_bus_cmd(Release); + } + } } + return 0; +} - 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)) { - rc = 0x03; - goto out; +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 { - res = f_open(&drv_table[drv].fd, drv_table[drv].img_name, - FA_WRITE | FA_READ); + if (p->img_name) + return AT_ALREADY; + if (drv_find_file_attached(filename) >= 0) + return AT_OTHER; - debug("## open: '%s', (env: '%s'), res: %d\n", - drv_table[drv].img_name, disk_buffer, res); + p->opt = options; -out: + /* 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; + + 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 < 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_debug(i, PSTR("f_sync")); + } + } + 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; @@ -187,119 +396,178 @@ out: result_msg[2] = res >> 8; if (rc) { - debug("## error rc: %.02x, res: %d\n", rc, res); - }; + 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); } - /* db 2 ; disk command ds 1 ; subcommand (login/read/write) ds 1 ; @adrv (8 bits) +0 ds 1 ; @rdrv (8 bits) +1 - ds 1 ; @cnt (8 bits) +2 - ds 2 ; @trk (16 bits) +3 - ds 2 ; @sect(16 bits) +5 + ds 3 ; @xdph (24 bits) +2 +*/ + +void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg) +{ + uint8_t drv; + struct cpm_drive_s *dp; + FRESULT res = 0; + + (void)subf; + + if (len != 5) { + return msg_cpm_result(subf, 0x01, res); + } + + /* 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); + } + + 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 (dp->img_name == NULL) { + /* no file attached */ + drv_debug(drv, PSTR("login failed: no file attached")); + return msg_cpm_result(subf, 0x03, res); + } + + dp->flags |= DRV_FLG_OPEN; + + /* send result*/ + msg_cpm_result(subf, 0x00, res); +} + + +/* + db 2 ; disk command + ds 1 ; subcommand (login/read/write) + ds 1 ; @adrv (8 bits) +0 + ds 1 ; @rdrv (8 bits) +1 + ds 2 ; @trk (16 bits) +2 + ds 2 ; @sect(16 bits) +4 + ds 1 ; @cnt (8 bits) +6 ds 3 ; phys. transfer addr +7 */ +#define ADRV 0 +#define RDRV 1 +#define TRK 2 +#define SEC 4 +#define CNT 6 +#define ADDR 7 + 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; - - bool dowrite = (subf == 2); + uint16_t track; + uint16_t sec; + uint8_t secs; + bool dowrite; 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; + if (len != 10) { + return msg_cpm_result(subf, 0x01, res); } - drv = msg[0]; - if ( drv>= MAX_DRIVE) { - rc = 0x02; - goto out; + drv = msg[RDRV]; + if ( drv>= CONFIG_CPM_MAX_DRIVE) { + return msg_cpm_result(subf, 0x02, res); } - addr = ((uint32_t)msg[9] << 16) + ((uint16_t)msg[8] << 8) + msg[7]; + dp = &drv_table[drv]; - /* bytes = BLOCK_SIZE; */ /* TODO: multi sector count */ - pos = (((uint16_t)(msg[4] << 8) + msg[3]) * 8 - + ((uint32_t)(msg[6] << 8) + msg[5])) * BLOCK_SIZE; + 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; + } - debug("## cpm_rw: %s %c: trk: %4d, sec: %d, pos: 0x%.5lx, addr: 0x%.5lx\n", - dowrite ? "write" : " read", msg[0]+'A', - ((uint16_t)(msg[4] << 8) + msg[3]), msg[5], pos, addr); + 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 = (track * 8UL + sec) * CONFIG_CPM_BLOCK_SIZE; - /* TODO: check bank boundary crossing */ - /* - if (addr + BLOCK_SIZE > MAX_MEMORY) - ... = MAX_MEMORY - 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) { + 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); - if (!res) { - unsigned int br; + 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 { - z80_read_block(disk_buffer, addr, BLOCK_SIZE); + 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); - if (!res) - res = f_sync(&drv_table[drv].fd); } + 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); + 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 { - z80_write_block(disk_buffer, addr, br); + z80_write_block(disk_buffer, addr, CONFIG_CPM_BLOCK_SIZE); z80_bus_cmd(Release); } } } - - if (br != BLOCK_SIZE) { - debug("## f_read res: %d, bytes rd/wr: %u\n", 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 += CONFIG_CPM_BLOCK_SIZE; } -out: - if (buserr) { - debug("Bus timeout\n"); - rc = 0x03; + if (dowrite && !res) { + dp->flags |= DRV_FLG_DIRTY; + bg_setstat(handle_cpm_drv_to, 1); } - if (res) - rc |= 0x80; - - result_msg[0] = rc; - result_msg[1] = res; - result_msg[2] = res >> 8; - if (rc) { - debug("#### error rc: %.02x, res: %d\n", rc, res); + if (buserr) { + drv_debug(drv, PSTR("Bus timeout")); + rc = 0x03; } /* send result*/ - msg_xmit(2, subf, sizeof(result_msg), result_msg); + msg_cpm_result(subf, rc, res); } @@ -320,6 +588,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}, @@ -412,7 +686,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; @@ -420,30 +694,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; } } @@ -457,14 +728,13 @@ 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) { 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++) @@ -473,6 +743,7 @@ void restart_z180_serv(void) } +#if 0 /*--------------------------------------------------------------------------*/ const FLASH uint8_t iniprog[] = { @@ -524,3 +795,4 @@ const FLASH uint8_t test1[] = { 0x00, // db 0 ;dst 0x00, 0x00, // dw 0 ;count (64k) }; +#endif