From 17ae866f41954922232eaa399d14a3e1899a2e65 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Sat, 30 May 2015 14:54:18 +0100
Subject: [PATCH] z80pack: resync to IRQ changes

---
 Kernel/platform-z80pack-lite/tricks.s  | 7 +------
 Kernel/platform-z80pack-lite/z80pack.s | 6 +++---
 Kernel/platform-z80pack/z80pack.s      | 5 -----
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Kernel/platform-z80pack-lite/tricks.s b/Kernel/platform-z80pack-lite/tricks.s
index c56f668d..4b7ec31d 100644
--- a/Kernel/platform-z80pack-lite/tricks.s
+++ b/Kernel/platform-z80pack-lite/tricks.s
@@ -8,7 +8,6 @@
         .globl _getproc
         .globl _trap_monitor
         .globl trap_illegal
-        .globl _inint
         .globl _switchout
         .globl _switchin
         .globl _doexec
@@ -57,10 +56,6 @@ _switchout:
         push iy
         ld (U_DATA__U_SP), sp ; this is where the SP is restored in _switchin
 
-        ; set inint to false
-        xor a
-        ld (_inint), a
-
         ; find another process to run (may select this one again)
         call _getproc
 
@@ -146,7 +141,7 @@ not_swapped:
         pop hl ; return code
 
         ; enable interrupts, if the ISR isn't already running
-        ld a, (_inint)
+        ld a, (U_DATA__U_ININTERRUPT)
         or a
         ret z ; in ISR, leave interrupts off
         ei
diff --git a/Kernel/platform-z80pack-lite/z80pack.s b/Kernel/platform-z80pack-lite/z80pack.s
index d4f0ce06..9b884aca 100644
--- a/Kernel/platform-z80pack-lite/z80pack.s
+++ b/Kernel/platform-z80pack-lite/z80pack.s
@@ -25,7 +25,7 @@
 	    .globl platform_interrupt_all
 	    .globl map_save
 	    .globl map_restore
-	    .globl _kernel_flag
+	    .globl _need_resched
 
             ; exported debugging tools
             .globl _trap_monitor
@@ -217,8 +217,8 @@ map_restore:
 
 saved_map:  .db 0
 
-_kernel_flag:
-	    .db 1
+_need_resched:
+	    .db 0
 
 
 ; outchar: Wait for UART TX idle, then print the char in A
diff --git a/Kernel/platform-z80pack/z80pack.s b/Kernel/platform-z80pack/z80pack.s
index afef5026..bf32b50e 100644
--- a/Kernel/platform-z80pack/z80pack.s
+++ b/Kernel/platform-z80pack/z80pack.s
@@ -27,8 +27,6 @@
 
 	    .globl _fd_bankcmd
 
-	    .globl _kernel_flag
-
             ; exported debugging tools
             .globl _trap_monitor
             .globl outchar
@@ -205,9 +203,6 @@ map_restore:
 map_store:
 	    .db 0
 
-_kernel_flag:
-	    .db 1
-
 ; outchar: Wait for UART TX idle, then print the char in A
 ; destroys: AF
 outchar:
-- 
2.34.1