From caf0a1add76cdc55fd4feee2050496b5ad76812c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 20 Apr 2015 22:33:23 +0100 Subject: [PATCH] trs80: bring in line with new swap (compile tested only) --- Kernel/platform-trs80/config.h | 2 ++ Kernel/platform-trs80/devhd.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Kernel/platform-trs80/config.h b/Kernel/platform-trs80/config.h index dc1e73ce..e7e7a36c 100644 --- a/Kernel/platform-trs80/config.h +++ b/Kernel/platform-trs80/config.h @@ -43,6 +43,8 @@ #define MAX_SWAPS 64 /* Should be plenty (2MB!) */ +#define swap_map(x) ((uint8_t *)(x)) + #define BOOT_TTY (512 + 1) /* Set this to default device for stdio, stderr */ /* In this case, the default is the first TTY device */ diff --git a/Kernel/platform-trs80/devhd.c b/Kernel/platform-trs80/devhd.c index 0ba55330..70f11880 100644 --- a/Kernel/platform-trs80/devhd.c +++ b/Kernel/platform-trs80/devhd.c @@ -85,7 +85,7 @@ int hd_transfer(uint8_t minor, bool is_read, uint8_t rawflag) } else if (rawflag == 2) { nblock = swapcnt >> 8; /* in 256 byte chunks */ dptr = (uint16_t)swapbase; - hd_page = swapproc->p_page; + hd_page = swappage; block = swapblk; } else goto bad2; -- 2.34.1