From 027a75e3809dcd884f78405a80d7b4ccc9094041 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 12 Feb 2015 01:51:28 +0000 Subject: [PATCH] zx128: move uarea We need 0xFFFx free in order to use it for the IM2 stunts needed on the Spectrum boxes --- Kernel/platform-zx128/config.h | 4 ++-- Kernel/platform-zx128/kernel.def | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kernel/platform-zx128/config.h b/Kernel/platform-zx128/config.h index c0a19a9f..caec8a4d 100644 --- a/Kernel/platform-zx128/config.h +++ b/Kernel/platform-zx128/config.h @@ -1,5 +1,5 @@ /* Simple IDE interface */ -//#define CONFIG_IDE +#define CONFIG_IDE #define IDE_REG_DATA 0xA3 #define IDE_REG_ERROR 0xA7 #define IDE_REG_FEATURES 0xA7 @@ -53,7 +53,7 @@ #define TICKSPERSEC 50 /* Ticks per second */ #define PROGBASE 0x8000 /* also data base */ #define PROGLOAD 0x8000 /* also data base */ -#define PROGTOP 0xFD00 /* Top of program, base of U_DATA copy */ +#define PROGTOP 0xFC00 /* Top of program, base of U_DATA copy */ #define PROC_SIZE 32 /* Memory needed per process */ #define UDATA_BLOCKS 0 /* We swap the stash not the uarea */ diff --git a/Kernel/platform-zx128/kernel.def b/Kernel/platform-zx128/kernel.def index de474aa3..2f6a24f6 100644 --- a/Kernel/platform-zx128/kernel.def +++ b/Kernel/platform-zx128/kernel.def @@ -1,9 +1,9 @@ ; UZI mnemonics for memory addresses etc -U_DATA .equ 0x5B00 ; (this is struct u_data from kernel.h) +U_DATA .equ 0x4000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. -U_DATA_STASH .equ 0xFD00 ; BD00-BFFF +U_DATA_STASH .equ 0xFC00 ; FC00-FEFF Z80_TYPE .equ 1 @@ -13,4 +13,4 @@ PROGLOAD .equ 0x8000 ; ; Ways we may boot ; -MICRODRIVE_BOOT .equ 1 +MICRODRIVE_BOOT .equ 0 -- 2.34.1