From: Alan Cox <alan@linux.intel.com>
Date: Mon, 1 Oct 2018 12:42:44 +0000 (+0100)
Subject: z80pack32: update to handle int_disabled
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=790b8fb42f13b40f335f078419b6b318f798a04e;p=FUZIX.git

z80pack32: update to handle int_disabled
---

diff --git a/Kernel/platform-z80pack32/tricks.s b/Kernel/platform-z80pack32/tricks.s
index 4621b92b..792abcba 100644
--- a/Kernel/platform-z80pack32/tricks.s
+++ b/Kernel/platform-z80pack32/tricks.s
@@ -176,7 +176,8 @@ switchlow2:
         pop hl ; return code
 
         ; enable interrupts, if the ISR isn't already running
-        ld a, (_inint)
+        ld a, (U_DATA__U_ININTERRUPT)
+	ld (_int_disabled),a
         or a
         ret z ; in ISR, leave interrupts off
         ei
@@ -224,7 +225,7 @@ _flush_cache:		; argument is the process it may apply to
 	pop hl
 	push hl
 	push de
-	ld a, i
+	ld a, (_int_disabled)
 	push af
 	ld de, #P_TAB__P_PAGE_OFFSET + 1
 	add hl, de
@@ -234,7 +235,8 @@ _flush_cache:		; argument is the process it may apply to
 	di
 	call flush_cache_self
 	pop af
-	ret po
+	or a
+	ret nz
 	ei
 	ret
 flush_none: