From 1c3fff83f13e58040c7daeb4c20655e209864fb6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 30 Nov 2014 15:07:15 +0000 Subject: [PATCH] z80: add NMOS v CMOS indicator to all the platforms We need to know this to cover the interrupt erratum in di() and the flag restore code --- Kernel/platform-msx1/kernel.def | 10 ++++++++++ Kernel/platform-msx2/kernel.def | 3 +++ Kernel/platform-nc100/kernel.def | 1 + Kernel/platform-pcw8256/kernel.def | 2 ++ Kernel/platform-socz80/kernel.def | 1 + Kernel/platform-trs80/kernel.def | 1 + Kernel/platform-z80pack-lite/kernel.def | 2 ++ Kernel/platform-z80pack/kernel.def | 4 +++- Kernel/platform-z80pack32/kernel.def | 3 +++ Kernel/platform-zx128/kernel.def | 4 +++- 10 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 Kernel/platform-msx1/kernel.def diff --git a/Kernel/platform-msx1/kernel.def b/Kernel/platform-msx1/kernel.def new file mode 100644 index 00000000..fb9d5ca5 --- /dev/null +++ b/Kernel/platform-msx1/kernel.def @@ -0,0 +1,10 @@ +; UZI mnemonics for memory addresses etc + +U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) +U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. + +U_DATA_STASH .equ 0x7D00 ; 0x7D00-0x7FFF + +; as far as I can tell either is allowed by the spec + +NMOS_Z80 .equ 1 diff --git a/Kernel/platform-msx2/kernel.def b/Kernel/platform-msx2/kernel.def index 1189bbee..e0f4da11 100644 --- a/Kernel/platform-msx2/kernel.def +++ b/Kernel/platform-msx2/kernel.def @@ -3,3 +3,6 @@ U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +; as far as I can tell either is allowed by the spec + +NMOS_Z80 .equ 1 diff --git a/Kernel/platform-nc100/kernel.def b/Kernel/platform-nc100/kernel.def index 1189bbee..8e6bb145 100644 --- a/Kernel/platform-nc100/kernel.def +++ b/Kernel/platform-nc100/kernel.def @@ -3,3 +3,4 @@ U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +NMOS_Z80 .equ 0 diff --git a/Kernel/platform-pcw8256/kernel.def b/Kernel/platform-pcw8256/kernel.def index 7097f8e4..be4a3f00 100644 --- a/Kernel/platform-pcw8256/kernel.def +++ b/Kernel/platform-pcw8256/kernel.def @@ -2,3 +2,5 @@ U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. + +NMOS_Z80 .equ 0 ; FIXME: check diff --git a/Kernel/platform-socz80/kernel.def b/Kernel/platform-socz80/kernel.def index 895914cb..40bc6dec 100644 --- a/Kernel/platform-socz80/kernel.def +++ b/Kernel/platform-socz80/kernel.def @@ -4,3 +4,4 @@ U_DATA .equ 0xf900 ; (this is struct u_data from kern U_DATA__PAGEOFFSET .equ 0x0900 ; U_DATA % 0x1000 U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +NMOS_Z80 .equ 0 ; Actually a T80 diff --git a/Kernel/platform-trs80/kernel.def b/Kernel/platform-trs80/kernel.def index 5342798b..003a09e1 100644 --- a/Kernel/platform-trs80/kernel.def +++ b/Kernel/platform-trs80/kernel.def @@ -3,3 +3,4 @@ U_DATA .equ 0xF900 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +NMOS_Z80 .equ 1 diff --git a/Kernel/platform-z80pack-lite/kernel.def b/Kernel/platform-z80pack-lite/kernel.def index 7097f8e4..8e6bb145 100644 --- a/Kernel/platform-z80pack-lite/kernel.def +++ b/Kernel/platform-z80pack-lite/kernel.def @@ -2,3 +2,5 @@ U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. + +NMOS_Z80 .equ 0 diff --git a/Kernel/platform-z80pack/kernel.def b/Kernel/platform-z80pack/kernel.def index 95178b3e..d60b6ef7 100644 --- a/Kernel/platform-z80pack/kernel.def +++ b/Kernel/platform-z80pack/kernel.def @@ -3,4 +3,6 @@ U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. -U_DATA_STASH .equ 0xED00 ; ED00-EFFF \ No newline at end of file +U_DATA_STASH .equ 0xED00 ; ED00-EFFF + +NMOS_Z80 .equ 0 diff --git a/Kernel/platform-z80pack32/kernel.def b/Kernel/platform-z80pack32/kernel.def index d5211a93..1cbf67a6 100644 --- a/Kernel/platform-z80pack32/kernel.def +++ b/Kernel/platform-z80pack32/kernel.def @@ -5,3 +5,6 @@ U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. U_STASH_HIGH .equ 0xBD00 ; BD00-BFFF U_STASH_LOW .equ 0x7D00 ; 7D00-BFFF + + +NMOS_Z80 .equ 0 diff --git a/Kernel/platform-zx128/kernel.def b/Kernel/platform-zx128/kernel.def index 9c1a2049..7d4a50f4 100644 --- a/Kernel/platform-zx128/kernel.def +++ b/Kernel/platform-zx128/kernel.def @@ -3,4 +3,6 @@ U_DATA .equ 0x5B00 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. -U_DATA_STASH .equ 0xFD00 ; BD00-BFFF \ No newline at end of file +U_DATA_STASH .equ 0xFD00 ; BD00-BFFF + +NMOS_Z80 .equ 1 -- 2.34.1