Kernel was accidentally storing PortableFlags in the wrong place.

Now calls XPortable_Idle, not Portable_Idle in key-wait code.
Calls Portable_Idle in OS_Byte 19.

Version 4.94. Tagged as 'Kernel-4_94'

VersionASM

@@ -6,9 +6,9 @@
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
 			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "4.93"
-Module_Version          SETA    493
+Module_MajorVersion	SETS    "4.94"
+Module_Version          SETA    494
 Module_MinorVersion	SETS	""
-Module_Date		SETS    "07 Oct 1999"
-Module_FullVersion      SETS    "4.93"
+Module_Date		SETS    "13 Oct 1999"
+Module_FullVersion      SETS    "4.94"
                         END

VersionNum

-/* (4.93)
+/* (4.94)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	4.93
+#define Module_MajorVersion_CMHG     	4.94
 #define Module_MinorVersion_CMHG	
-#define Module_Date_CMHG      		07 Oct 1999
+#define Module_Date_CMHG      		13 Oct 1999
 
-#define Module_MajorVersion     	"4.93"
-#define Module_Version                  493
+#define Module_MajorVersion     	"4.94"
+#define Module_Version                  494
 #define Module_MinorVersion		""
-#define Module_Date      		"07 Oct 1999"
+#define Module_Date      		"13 Oct 1999"
 
-#define Module_FullVersion              "4.93"
+#define Module_FullVersion              "4.94"

s/PMF/key

@@ -963,7 +963,7 @@ RdchLoop
 
  [ StorkPowerSave
         TST     R5, #PortableFeature_Idle
-        SWINE   Portable_Idle
+        SWINE   XPortable_Idle
         TST     R5, #PowerSave
         BNE     RdchLoop                ; if we've gone slow already, then loop
         TST     R5, #PortableFeature_Speed

s/PMF/osbyte

@@ -659,21 +659,29 @@ Osbyte13 ROUT
         TSTNE   R1, #1                  ; NE => blanked and DPMS turned off HSyncs
         BNE     %FT20                   ; if true exit immediately
 
-        LDRB    R0, CFStime
+        LDRB    R2, CFStime
 10
         TEQP    R14, #I_bit             ; CLI
- [ StrongARM
+
    ;StrongARM core will not see interrupt unless disable is cleared for at least 5 cycles,
    ;in order to fill synchroniser pipe
+ [ StorkPowerSave
+        NOP
+        MOV     R0, #0
+        LDRB    R0, [R0, #PortableFlags]
+        TST     R0, #PortableFeature_Idle
+        SWINE   XPortable_Idle
+ |
         NOP
         NOP
         NOP
         NOP
         NOP
  ]
+
         TEQP    R14, #0                 ; SEI
         LDRB    R1, CFStime
-        TEQ     R1, R0
+        TEQ     R1, R2
         BEQ     %BT10
 20
         MyOsbyte

s/PMF/osinit

@@ -352,8 +352,8 @@ PostInit ROUT
         MOVVC   R1, #PortableFeature_Speed
         MOVVS   R1, #0
 01
-        AND     R0, R1, #(PortableFeature_Speed :OR: PortableFeature_Idle :OR: PortableFeature_Stop)
-        STRB    r0, [r0, #PortableFlags]
+        AND     R1, R1, #(PortableFeature_Speed :OR: PortableFeature_Idle :OR: PortableFeature_Stop)
+        STRB    R1, [R0, #PortableFlags]
  |
         MOV     r0, #0                  ; allow SWI Portable_Speed to be issued
         STRB    r0, [r0, #PortableFlag]