]> cloudbase.mooo.com Git - z180-stamp.git/blobdiff - avr/z180-serv.c
avr/z180-serv.c: Workaround for GCC bug PR61443
[z180-stamp.git] / avr / z180-serv.c
index 929cd97148472d060afc2675f7bcdc4ae6bbf602..d1f52ddbac19f42e46b43e75bcd4ff679c66458f 100644 (file)
@@ -1,15 +1,17 @@
 /*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014-2016 Leo C. <erbl259-lmu@yahoo.de>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
+#include "z180-serv.h"
 #include "common.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <util/atomic.h>
 
+#include "config.h"
 #include "background.h"
 #include "env.h"
 #include "ff.h"
@@ -17,7 +19,6 @@
 #include "z80-if.h"
 #include "debug.h"
 #include "print-utils.h"
-#include "z180-serv.h"
 #include "timer.h"
 #include "time.h"
 #include "bcd.h"
@@ -167,7 +168,7 @@ void do_msg_get_set_time(uint8_t subf, int len, uint8_t * msg)
                /* initialize t with current time */
                rc = rtc_get (&t);
 
-               if (rc == 0) {
+               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"));
@@ -188,19 +189,16 @@ void do_msg_get_set_time(uint8_t subf, int len, uint8_t * msg)
                /* 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);
 
-               if (rc) {
+                       mk_cpm_time(&t, cpm_time);
+               } else {
                        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;
        }
 
@@ -209,24 +207,159 @@ void do_msg_get_set_time(uint8_t subf, int len, uint8_t * msg)
 
 /* ---------------------------------------------------------------------------*/
 
-#define MAX_DRIVE      4
-#define BLOCK_SIZE     512
-#define TPA_BASE       0x10000
-#define COMMON_BASE    0xC000
-
-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 uint8_t drv;
+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)
+typedef enum {SINGLE, START, MIDDLE, END} dbgmsg_t;
+
+void drv_debug(dbgmsg_t phase, const FLASH char *const fmt, ...)                                                           \
+{
+       struct cpm_drive_s *dp = &drv_table[drv];
+
+       if (dp->opt & DRV_OPT_DEBUG) {
+
+               va_list ap;
+               va_start (ap, fmt);
+
+               if (phase == SINGLE || phase == START)
+                       printf_P(PSTR("# %7lu dsk%d: "), get_timer(0), drv);
+
+               vfprintf_P (stdout, fmt, ap);
+
+               if (phase == SINGLE || phase == END)
+                       putc('\n', stdout);
+
+               va_end (ap);
+       }
+}
+
+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 unit)
+{
+       drv = unit;
+       if (drv < CONFIG_CPM_MAX_DRIVE) {
+               struct cpm_drive_s *p = &drv_table[drv];
+
+               drv_debug(SINGLE, 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(PSTR(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;
+}
+
+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 unit, const char *filename, drv_opt_t options)
+{
+       int res;
+
+       drv = unit;
+       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(SINGLE, 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)
@@ -244,12 +377,12 @@ 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 = i;
+                                       drv_debug(SINGLE, PSTR("f_sync"));
                                }
                        }
                        state = 0;
@@ -258,6 +391,16 @@ int cpm_drv_to(int state)
        return state;
 }
 
+static const FLASH char * const FLASH rc_messages[] = {
+                       FSTR("OK"),
+                       FSTR("Internal error: wrong message len"),      /* 01 */
+                       FSTR("Invalid relative drive #"),                       /* 02 */
+                       FSTR("Bus timeout"),                                            /* 03 */
+                       FSTR("Access byond disk size"),                         /* 04 */
+                       FSTR("Write protect"),                                          /* 05 */
+                       FSTR("No media"),                                                       /* 06 */
+                       FSTR("R/W address == 0 !!!!"),                          /* 07 */
+               };
 
 void msg_cpm_result(uint8_t subf, uint8_t rc, int res)
 {
@@ -270,11 +413,21 @@ void msg_cpm_result(uint8_t subf, uint8_t rc, int res)
        result_msg[1] = res;
        result_msg[2] = res >> 8;
 
+       msg_xmit(2, subf, sizeof(result_msg), result_msg);
+
        if (rc) {
-               debug_cpmsd("###%7lu  error rc: %.02x, res: %d\n", get_timer(0), rc, res);
-       }
+#if GCC_BUG_61443
+               char msg[40];
+               strncpy_P(msg, rc_messages[rc & 0x7f], sizeof msg -1);
+               drv_debug(END, PSTR(" rc: %.02x/%d, '%s'"),
+                                       rc, res, msg);
+#else
+               drv_debug(END, PSTR(" rc: %.02x/%d, '%S'"),
+                                       rc, res, rc_messages[rc & 0x7f]);
+#endif
+       } else
+               drv_debug(END, PSTR(""));
 
-       msg_xmit(2, subf, sizeof(result_msg), result_msg);
 }
 
 /*
@@ -287,50 +440,38 @@ 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)
 {
-
+       struct cpm_drive_s *dp;
        FRESULT res = 0;
-       uint8_t drv;
-       char *np;
 
        (void)subf;
 
-       if (len != 5) {     /* TODO: check adrv, rdrv */
+       /* Get relative drive number */
+       drv = msg[1];
+       drv_debug(START, PSTR("login"));
+
+       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) {
+       if ( drv >= CONFIG_CPM_MAX_DRIVE) {
+               /* invalid relative drive number */
                return msg_cpm_result(subf, 0x02, res);
        }
 
-/*
-       uint32_t 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;
-       }
+       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)) {
-               return msg_cpm_result(subf, 0x03, res);
+       if (dp->img_name == NULL) {
+               /* no file attached */
+               return msg_cpm_result(subf, 0x06, res);
        }
 
+       f_close(&dp->fd);
+       res = f_open(&dp->fd, dp->img_name,
+                       FA_READ | (dp->opt&DRV_OPT_RO ? 0 : FA_WRITE));
 
-       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);
@@ -357,101 +498,101 @@ 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 */
+       drv = msg[RDRV];
+       dowrite = (subf == 2);
+
+       drv_debug(START, PSTR("%2S"), dowrite ? PSTR("W ") : PSTR(" R"));
+
+       if (len != 10) {
                return msg_cpm_result(subf, 0x01, res);
        }
-
-       drv = msg[ADRV];
-       if ( drv>= MAX_DRIVE) {
+       if ( drv>= CONFIG_CPM_MAX_DRIVE) {
                return msg_cpm_result(subf, 0x02, res);
        }
 
+       dp = &drv_table[drv];
+       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];
 
+       if (dp->img_name == NULL) {
+               /* no media */
+               return msg_cpm_result(subf, 0x06, res);
+       }
 
        /* 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(MIDDLE, PSTR(" T:%4d, S:%2d, cnt:%2d, lba: %.8lx, addr: %.5lx"),
+                               track, sec, secs, pos, addr);
 
-       res = f_lseek(&drv_table[drv].fd, pos);
-       while (!res && secs--) {
-               unsigned int cnt, br;
+       if (addr == 0) {
+               return msg_cpm_result(subf, 0x07, res);
+       }
 
-               /* 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 (dowrite && dp->opt & DRV_OPT_RO) {
+               return msg_cpm_result(subf, 0x05, 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);
-               }
 
+       if (pos + secs * CONFIG_CPM_BLOCK_SIZE > CONFIG_CPM_DISKSIZE) {
+               drv_debug(MIDDLE, PSTR(" access > DISKSIZE:%.8lx!"),
+                                               CONFIG_CPM_DISKSIZE);
+               return msg_cpm_result(subf, 0x04, res);
+       }
+
+       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(MIDDLE, PSTR(" short rd/wr: res: %d, brw: %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");
+               /* Bus timeout. how can this happen? */
                rc = 0x03;
        }
 
@@ -581,35 +722,29 @@ int msg_handling(int state)
                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) {
-               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;
                }
        }
 
@@ -629,9 +764,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++)