]> cloudbase.mooo.com Git - z180-stamp.git/blobdiff - avr/z180-serv.c
Server: get_time command/response
[z180-stamp.git] / avr / z180-serv.c
index 22dafe10484e6c7f49d4c74e8528a4c94a762599..c7869a68f310e0c38d484887e5488ec03ecf66ee 100644 (file)
 #include "debug.h"
 #include "print-utils.h"
 #include "z180-serv.h"
+#include "timer.h"
+
+
+#define DEBUG_CPM_SDIO 0       /* set to 1 to debug */
+
+#define debug_cpmsd(fmt, args...)                                                          \
+       debug_cond(DEBUG_CPM_SDIO, fmt, ##args)
+
+
 
 /*--------------------------------------------------------------------------*/
 
@@ -102,21 +111,85 @@ 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)
+{
+       (void)len; (void)msg;
+
+       uint32_t time_ms = get_timer(0);
+
+       msg_xmit(3, subf, sizeof(time_ms), (uint8_t *) &time_ms);
+}
+
 /* ---------------------------------------------------------------------------*/
 
-#define MAX_DRIVE      2
+#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 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
@@ -130,25 +203,21 @@ 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("\n##  login: %c:\n", msg[0]+'A');
+       debug_cpmsd("\n## %7lu  login: %c:\n", get_timer(0), msg[0]+'A');
 
 
        drv = msg[0];
        if ( drv>= MAX_DRIVE) {
-               rc = 0x02;
-               goto out;
+               return msg_cpm_result(subf, 0x02, res);
        }
 
 /*
@@ -156,8 +225,9 @@ void do_msg_cpm_login(uint8_t subf, int len, uint8_t * msg)
 */
 
        if (drv_table[drv].img_name != NULL) {
-               debug("##  close: '%s'\n", drv_table[drv].img_name);
+               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;
        }
@@ -166,140 +236,141 @@ 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);
        }
 
 
        res = f_open(&drv_table[drv].fd, drv_table[drv].img_name,
                        FA_WRITE | FA_READ);
 
-    debug("##   open: '%s', (env: '%s'), res: %d\n",
+    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("##   error    rc: %.02x, res: %d\n", rc, res);
-       };
-
        /* send  result*/
-       msg_xmit(2, subf, sizeof(result_msg), result_msg);
+       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      1       ; @cnt  (8 bits)        +2
-       ds      2       ; @trk (16 bits)        +3
-       ds      2       ; @sect(16 bits)        +5
+       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;
        uint32_t addr;
        uint32_t pos;
-
+       uint8_t secs;
        bool dowrite = (subf == 2);
        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[0];
+       drv = msg[ADRV];
        if ( drv>= MAX_DRIVE) {
-               rc = 0x02;
-               goto out;
+               return msg_cpm_result(subf, 0x02, res);
        }
 
-       addr = ((uint32_t)msg[9] << 16) + ((uint16_t)msg[8] << 8) + msg[7];
-
-       /* 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;
-
+       secs = msg[CNT];
+       addr = ((uint32_t)msg[ADDR+2] << 16) + ((uint16_t)msg[ADDR+1] << 8) + msg[ADDR];
 
-       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);
 
+       /* 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;
 
-
-       /* TODO: check bank boundary crossing */
-       /*
-          if (addr + BLOCK_SIZE > MAX_MEMORY)
-               ... = MAX_MEMORY - addr;
-       */
-
+       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);
 
        res = f_lseek(&drv_table[drv].fd, pos);
-       if (!res) {
-               unsigned int br;
+       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 (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 (dowrite) {
                        if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
                                buserr = 1;
+                               break;
                        } else {
-                               z80_read_block(disk_buffer, addr, BLOCK_SIZE);
+                               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_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(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &br);
                } else {
                        res = f_read(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &br);
-                       if (res == FR_OK) {
+                       if (res == FR_OK && br == BLOCK_SIZE) {
                                if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
                                        buserr = 1;
+                                       break;
                                } else {
-                                       z80_write_block(disk_buffer, addr, br);
+                                       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_bus_cmd(Release);
                                }
                        }
                }
 
                if (br != BLOCK_SIZE) {
-                       debug("##  f_read res: %d, bytes rd/wr: %u\n", res, br);
+                       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;
                }
+
+               addr += BLOCK_SIZE;
        }
 
-out:
-       if (buserr) {
-               debug("Bus timeout\n");
-               rc = 0x03;
+       if (dowrite && !res) {
+//             res = f_sync(&drv_table[drv].fd);
+               drv_table[drv].dirty = true;
+               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) {
+               debug_cpmsd("Bus timeout\n");
+               rc = 0x03;
        }
 
        /* send  result*/
-       msg_xmit(2, subf, sizeof(result_msg), result_msg);
+       msg_cpm_result(subf, rc, res);
 }
 
 
@@ -320,6 +391,9 @@ const FLASH struct msg_item z80_messages[] =
        { 2,
          1, 2,
          do_msg_cpm_rw},
+       { 3,
+         1, 1,
+         do_msg_get_timer},
        { 0xff,                         /* end mark */
          0, 0,
          0},
@@ -457,6 +531,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)