Commit bcbd3602 authored by ROOL's avatar ROOL 🤖

Various kernel cleanups

Detail:
  NewReset.s: Remove warning about soft reset, this is not supported any longer
  MsgCode.s: Reload LR after potentially changing mode
  PMF/osinit.s: Delete vestiges of soft reset support
Admin:
  Submission from Timothy Baldwin.

Version 6.07. Tagged as 'Kernel-6_07'
parent 7e7901c8
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "6.06"
Module_Version SETA 606
Module_MajorVersion SETS "6.07"
Module_Version SETA 607
Module_MinorVersion SETS ""
Module_Date SETS "31 May 2018"
Module_ApplicationDate SETS "31-May-18"
Module_Date SETS "16 Jun 2018"
Module_ApplicationDate SETS "16-Jun-18"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "6.06"
Module_HelpVersion SETS "6.06 (31 May 2018)"
Module_FullVersion SETS "6.07"
Module_HelpVersion SETS "6.07 (16 Jun 2018)"
END
/* (6.06)
/* (6.07)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 6.06
#define Module_MajorVersion_CMHG 6.07
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 May 2018
#define Module_Date_CMHG 16 Jun 2018
#define Module_MajorVersion "6.06"
#define Module_Version 606
#define Module_MajorVersion "6.07"
#define Module_Version 607
#define Module_MinorVersion ""
#define Module_Date "31 May 2018"
#define Module_Date "16 Jun 2018"
#define Module_ApplicationDate "31-May-18"
#define Module_ApplicationDate "16-Jun-18"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "6.06"
#define Module_HelpVersion "6.06 (31 May 2018)"
#define Module_LibraryVersionInfo "6:6"
#define Module_FullVersion "6.07"
#define Module_HelpVersion "6.07 (16 Jun 2018)"
#define Module_LibraryVersionInfo "6:7"
......@@ -68,7 +68,8 @@ TranslateError_UseR4
MOV R5,#0
MOV R6,#0
MOV R7,#0
MOV R1,#-1 ; We are looking up an error, don't bother
MOV R1,#-1
LDR LR, =ZeroPage ; We are looking up an error, don't bother
STRB R1, [LR, #ErrorSemaphore] ; translating other errors.
[ CacheCommonErrors
......
......@@ -131,7 +131,6 @@ CmosScreenWillDo
LTORG
! 0, "*** DUMMY CONT_Break, soft breaks/resets will not work yet with HAL"
CONT_Break
AddressHAL
MOV a1, #1
......
......@@ -24,21 +24,16 @@ ExecuteInit ROUT
BYTEWS WsPtr
LDRB R1, LastBREAK ; 0 => soft, 1 => power-on, 2 => hard
CMP R1, #PowerOnReset
ASSERT SoftReset < PowerOnReset
ASSERT PowerOnReset < ControlReset
ADRCC R2, SoftResetVars
LDRB R4, LastBREAK ; 1 => power-on, 2 => hard
CMP R4, #PowerOnReset
ADREQ R2, PowerOnResetVars
ADRHI R2, HardResetVars
ADRNE R2, HardResetVars
LDRCCB R3, NoIgnore ; preserve NoIgnore over soft reset
MOVCS R3, #0 ; if hard or power-on reset, zero it
STRCS R3, TimerAlpha +0 ; and zero both copies of TIME
STRCS R3, TimerAlpha +4
STRCS R3, TimerBeta +0
STRCS R3, TimerBeta +4
MOV R4, R1 ; preserve LastBREAK
MOV R3, #0
STR R3, TimerAlpha +0 ; zero both copies of TIME
STR R3, TimerAlpha +4
STR R3, TimerBeta +0
STR R3, TimerBeta +4
MOV R1, #32 ; default FX11 and FX12
STRB R1, KeyRepDelay
......@@ -54,7 +49,7 @@ ByteVarInitLoop
TEQ R1, R2 ; at end ?
BNE ByteVarInitLoop ; [no, then loop]
STRB R3, NoIgnore ; put NoIgnore back
STRB R3, NoIgnore ; zero NoIgnore
STRB R4, LastBREAK ; put LastBREAK back
; Initialise buffer pointers
......@@ -316,9 +311,6 @@ ReadKeyDefaults
PostInit ROUT
Push R14
BYTEWS WsPtr
LDRB R0, LastBREAK ; get reset type
TEQ R0, #SoftReset
BEQ %FT10 ; [soft reset, skip]
SWI XPortable_ReadFeatures
BVC %FT01
......@@ -332,7 +324,6 @@ PostInit ROUT
AND R1, R1, #(PortableFeature_Speed :OR: PortableFeature_Idle :OR: PortableFeature_Stop)
LDR R0, =ZeroPage
STRB R1, [R0, #PortableFlags]
10
Pull PC
; *****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment