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

z80pack: update to use int_disabled not ld a,i
---

diff --git a/Kernel/platform-z80pack-lite/z80pack.s b/Kernel/platform-z80pack-lite/z80pack.s
index fcf1f3b9..59669880 100644
--- a/Kernel/platform-z80pack-lite/z80pack.s
+++ b/Kernel/platform-z80pack-lite/z80pack.s
@@ -77,7 +77,7 @@ _fd_bankcmd:pop de		; return
 	    push hl
 	    push bc
 	    push de		; fix stack
-	    ld a, i
+	    ld a, (_int_disabled)
 	    di
 	    push af		; save DI state
 	    call map_process	; (HL) holds our bank
@@ -85,7 +85,8 @@ _fd_bankcmd:pop de		; return
 	    out (13), a		;
 	    call map_kernel	; return to kernel mapping
 	    pop af
-	    ret po
+	    or a
+	    ret nz
 	    ei
 	    ret
 
diff --git a/Kernel/platform-z80pack/z80pack.s b/Kernel/platform-z80pack/z80pack.s
index 337a62c1..2057f884 100644
--- a/Kernel/platform-z80pack/z80pack.s
+++ b/Kernel/platform-z80pack/z80pack.s
@@ -87,7 +87,7 @@ _fd_bankcmd:pop de		; return
 	    push hl
 	    push bc
 	    push de		; fix stack
-	    ld a, i
+	    ld a, (int_disabled)
 	    di
 	    push af		; save DI state
 	    call map_process_di	; HL alread holds our bank
@@ -95,7 +95,8 @@ _fd_bankcmd:pop de		; return
 	    out (13), a		;
 	    call map_kernel_di	; return to kernel mapping
 	    pop af
-	    ret po
+	    or a
+	    ret nz
 	    ei
 	    ret