Skip to content

GitLab

Commit d5916783 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

OSDelink/RelinkApp now work on the list in opposite orders so that the order... 

OSDelink/RelinkApp now work on the list in opposite orders so that the order of vector claims doesn't get toggled.

Fix for *FX5 not working due to a TST having been swapped for CMP.
Checkprotectionlink option added to HAL version so CMOS lock is
implemented.
Updated HAL docs.

Version 5.35, 4.79.2.58. Tagged as 'Kernel-5_35-4_79_2_58'
parent b6c3d8fb
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 42 deletions
Docs/HAL/HAL_API
View file @ d5916783
...@@ -998,6 +998,8 @@ This call must not be made after RISCOS_Start. ...@@ -998,6 +998,8 @@ This call must not be made after RISCOS_Start.
bit 1: CMOS reset inhibited (eg protection link on Risc PC) bit 1: CMOS reset inhibited (eg protection link on Risc PC)
bit 2: perform a CMOS reset (if bit 1 clear and bit 0 set - eg front panel bit 2: perform a CMOS reset (if bit 1 clear and bit 0 set - eg front panel
button held down on an NC) button held down on an NC)
bit 3: there is no CMOS (the Kernel must use a RAM cache)
bit 4: the RAM has already been cleared to zero
On entry: On entry:
SVC32 mode SVC32 mode
......
Version
View file @ d5916783
...@@ -16,7 +16,7 @@ Date SETS Module_Date ; version for STB/NC OS ...@@ -16,7 +16,7 @@ Date SETS Module_Date ; version for STB/NC OS
| |
Version SETA 502 Version SETA 502
VString SETS "5.02" VString SETS "5.02"
Date SETS "21 Feb 2003" ; version for RISC OS on desktop computers Date SETS "28 Feb 2003" ; version for RISC OS on desktop computers
] ]
END END
VersionASM
View file @ d5916783
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35" Module_MajorVersion SETS "5.35"
Module_Version SETA 535 Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.57" Module_MinorVersion SETS "4.79.2.58"
Module_Date SETS "28 Feb 2003" Module_Date SETS "02 Mar 2003"
Module_ApplicationDate SETS "28-Feb-03" Module_ApplicationDate SETS "02-Mar-03"
Module_ComponentName SETS "Kernel" Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "RiscOS/Sources/Kernel" Module_ComponentPath SETS "RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.57)" Module_FullVersion SETS "5.35 (4.79.2.58)"
Module_HelpVersion SETS "5.35 (28 Feb 2003) 4.79.2.57" Module_HelpVersion SETS "5.35 (02 Mar 2003) 4.79.2.58"
END END
VersionNum
View file @ d5916783
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
* *
*/ */
#define Module_MajorVersion_CMHG 5.35 #define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.57 #define Module_MinorVersion_CMHG 4.79.2.58
#define Module_Date_CMHG 28 Feb 2003 #define Module_Date_CMHG 02 Mar 2003
#define Module_MajorVersion "5.35" #define Module_MajorVersion "5.35"
#define Module_Version 535 #define Module_Version 535
#define Module_MinorVersion "4.79.2.57" #define Module_MinorVersion "4.79.2.58"
#define Module_Date "28 Feb 2003" #define Module_Date "02 Mar 2003"
#define Module_ApplicationDate "28-Feb-03" #define Module_ApplicationDate "02-Mar-03"
#define Module_ComponentName "Kernel" #define Module_ComponentName "Kernel"
#define Module_ComponentPath "RiscOS/Sources/Kernel" #define Module_ComponentPath "RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.57)" #define Module_FullVersion "5.35 (4.79.2.58)"
#define Module_HelpVersion "5.35 (28 Feb 2003) 4.79.2.57" #define Module_HelpVersion "5.35 (02 Mar 2003) 4.79.2.58"
#define Module_LibraryVersionInfo "5:35" #define Module_LibraryVersionInfo "5:35"
hdr/Options
View file @ d5916783
...@@ -134,7 +134,7 @@ ChecksumCMOS SETL {TRUE} ...@@ -134,7 +134,7 @@ ChecksumCMOS SETL {TRUE}
GBLL SqueezeMods ; whether squeezed modules are allowed GBLL SqueezeMods ; whether squeezed modules are allowed
SqueezeMods SETL {TRUE} SqueezeMods SETL {TRUE}
GBLL International ; whether text and error messages come from messaeges file. GBLL International ; whether text and error messages come from messages file.
International SETL {TRUE} International SETL {TRUE}
GBLL CacheCommonErrors ; whether common internationalised errors are cached in sysheap GBLL CacheCommonErrors ; whether common internationalised errors are cached in sysheap
...@@ -318,6 +318,9 @@ DebugHALTX SETL {FALSE} ...@@ -318,6 +318,9 @@ DebugHALTX SETL {FALSE}
GBLL DebugHeaps ; initialise claimed and freed blocks GBLL DebugHeaps ; initialise claimed and freed blocks
DebugHeaps SETL {FALSE} ; (may slow things down unacceptably) DebugHeaps SETL {FALSE} ; (may slow things down unacceptably)
[ DebugHeaps
! 0, "*** WARNING *** Heap debugging assembled in"
]
; ChangeDynamicArea and related options ; ChangeDynamicArea and related options
...@@ -343,12 +346,8 @@ FixCallBacks SETL {TRUE} ; also addresses some atomicity ...@@ -343,12 +346,8 @@ FixCallBacks SETL {TRUE} ; also addresses some atomicity
GBLL InterlacedPointer GBLL InterlacedPointer
InterlacedPointer SETL {TRUE} :LAND: STB ; enable code to do proper interlaced pointer InterlacedPointer SETL {TRUE} :LAND: STB ; enable code to do proper interlaced pointer
GBLL ValidateCMOS ; Apply special CMOS-corruption detection code, and do minimal default settings. GBLL ValidateCMOS ; Apply special CMOS-corruption detection code,
ValidateCMOS SETL {TRUE} ValidateCMOS SETL {TRUE} ; and do minimal default settings.
[ DebugHeaps
! 0, "*** WARNING *** Heap debugging assembled in"
]
GBLS GetMessages GBLS GetMessages
[ International [ International
...@@ -364,7 +363,7 @@ DebugForcedReset SETL {FALSE} ...@@ -364,7 +363,7 @@ DebugForcedReset SETL {FALSE}
ConfiguredLang SETA 11 ; default configured language ConfiguredLang SETA 11 ; default configured language
GBLA FirstUnpluggableModule GBLA FirstUnpluggableModule
FirstUnpluggableModule SETA 8 ; Podule, FileSwitch, ResourceFS, Messages, MessageTrans, FirstUnpluggableModule SETA 8 ; Podule, FileSwitch, ResourceFS, Messages, MessageTrans,
; TerritoryManager, UKTerritory ; TerritoryManager, UKTerritory
[ DebugForcedReset [ DebugForcedReset
......
s/ArthurSWIs
View file @ d5916783
...@@ -693,6 +693,27 @@ Application_Delink ROUT ...@@ -693,6 +693,27 @@ Application_Delink ROUT
; Returns V set if can't relink all ; Returns V set if can't relink all
Application_Relink ROUT Application_Relink ROUT
[ {TRUE}
; Run through the buffer BACKWARDS to ensure that the vectors are
; reinstalled in the same order.
Push "R0-R3, lr"
MOV R3, R0 ; R3 -> start of buffer
MOV R10, R0
01 LDR R0, [R10], #12 ; search forwards to find terminator
CMP R0, #-1
BNE %BT01
SUB R10, R10, #12 ; R10 -> terminator
02 CMP R10, R3 ; loop backwards until we get to start
Pull "R0-R3, lr", EQ
ExitSWIHandler EQ
LDMDB R10!, {R0-R2}
SWI XOS_AddToVector
BVC %BT02
STR R0, [stack]
Pull "R0-R3, lr"
B SLVK_SetV
|
Push "R0-R2, lr" Push "R0-R2, lr"
MOV R10, R0 MOV R10, R0
02 LDR R0, [R10], #4 02 LDR R0, [R10], #4
...@@ -706,6 +727,7 @@ Application_Relink ROUT ...@@ -706,6 +727,7 @@ Application_Relink ROUT
STR R0, [stack] STR R0, [stack]
Pull "R0-R2, lr" Pull "R0-R2, lr"
B SLVK_SetV B SLVK_SetV
]
;******************************************************************** ;********************************************************************
; Now the stuff that issues service calls; also deals with the MOS ; Now the stuff that issues service calls; also deals with the MOS
......
s/NewReset
View file @ d5916783
...@@ -784,7 +784,7 @@ checkboot ...@@ -784,7 +784,7 @@ checkboot
] ]
; IF power-on bit set in IOC AND R/T/Del/Copy pressed THEN reset CMOS RAM ; IF power-on bit set AND R/T/Del/Copy pressed THEN reset CMOS RAM
; note that memory cleared if POR, so key info has had plenty of time! ; note that memory cleared if POR, so key info has had plenty of time!
[ HAL [ HAL
MOV R0, #HAL_StartFlags MOV R0, #HAL_StartFlags
...@@ -792,9 +792,11 @@ checkboot ...@@ -792,9 +792,11 @@ checkboot
TST R1, #OSStartFlag_NoCMOS ; If no CMOS, reset for sensible cache TST R1, #OSStartFlag_NoCMOS ; If no CMOS, reset for sensible cache
BNE cmos_reset BNE cmos_reset
TST R1, #OSStartFlag_POR TST R1, #OSStartFlag_POR
BEQ no_cmos_reset BEQ no_cmos_reset ; not a power on reset
[ CheckProtectionLink
TST R1, #OSStartFlag_NoCMOSReset TST R1, #OSStartFlag_NoCMOSReset
BNE no_cmos_reset BNE no_cmos_reset
]
TST R1, #OSStartFlag_CMOSReset TST R1, #OSStartFlag_CMOSReset
BNE cmos_reset BNE cmos_reset
| |
...@@ -803,12 +805,11 @@ checkboot ...@@ -803,12 +805,11 @@ checkboot
ANDS R1, R1, #por_bit ANDS R1, R1, #por_bit
BEQ no_cmos_reset BEQ no_cmos_reset
[ CheckProtectionLink [ CheckProtectionLink
LDR r0, =IOMD_MonitorType LDR r0, =IOMD_MonitorType
; on Issue A's the protection bit is only weakly pulled up, ; on Issue A's the protection bit is only weakly pulled up,
; so force it high, then read it back ; so force it high, then read it back
LDRB r1, [r0] LDRB r1, [r0]
ORR r1, r1, #IOMD_ProtectionLinkBit ORR r1, r1, #IOMD_ProtectionLinkBit
STRB r1, [r0] STRB r1, [r0]
...@@ -816,18 +817,18 @@ checkboot ...@@ -816,18 +817,18 @@ checkboot
LDRB r1, [r0] LDRB r1, [r0]
TST r1, #IOMD_ProtectionLinkBit TST r1, #IOMD_ProtectionLinkBit
BEQ no_cmos_reset ; if zero then CMOS is protected BEQ no_cmos_reset ; if zero then CMOS is protected
] ]
[ STB :LAND: IOMD_C_FrontPanelButton <> 0 [ STB :LAND: IOMD_C_FrontPanelButton <> 0
[ FrontPanelButtClearsCMOS [ FrontPanelButtClearsCMOS
MOV r0, #IOMD_Base ; if front panel button pressed then CMOS reset MOV r0, #IOMD_Base ; if front panel button pressed then CMOS reset
LDRB r0, [r0, #IOMD_CLINES] LDRB r0, [r0, #IOMD_CLINES]
TST r0, #IOMD_C_FrontPanelButton TST r0, #IOMD_C_FrontPanelButton
BEQ cmos_reset BEQ cmos_reset
] ]
] ]
] ; HAL ]
MOV R0, #InitIRQWs MOV R0, #InitIRQWs
[ HAL [ HAL
...@@ -839,9 +840,9 @@ checkboot ...@@ -839,9 +840,9 @@ checkboot
] ]
BEQ no_cmos_reset ; power on bit checked again there BEQ no_cmos_reset ; power on bit checked again there
[ :LNOT: STB [ :LNOT: STB
ADD sp, sp, #4 ; junk CannotReset flag from stack ADD sp, sp, #4 ; junk CannotReset flag from stack
] ]
; CMOS reset detectified. ; CMOS reset detectified.
; ************************************************************************** ; **************************************************************************
...@@ -2007,18 +2008,18 @@ SkipHardResetPart2 ; code executed on all types of reset ...@@ -2007,18 +2008,18 @@ SkipHardResetPart2 ; code executed on all types of reset
CMP r1, #PowerOnReset CMP r1, #PowerOnReset
BNE %FT75 BNE %FT75
[ HAL [ HAL :LAND: CheckProtectionLink
LDR r1, =HAL_StartFlags LDR r1, =HAL_StartFlags
LDR r1, [r1] LDR r1, [r1]
TST r1, #OSStartFlag_NoCMOSReset TST r1, #OSStartFlag_NoCMOSReset
BNE %FT75 BNE %FT75
| |
[ CheckProtectionLink [ CheckProtectionLink
LDR r1, =IOMD_MonitorType ; check link bit again LDR r1, =IOMD_MonitorType ; check link bit again
LDRB r1, [r1] ; no need to preload bus, since should LDRB r1, [r1] ; no need to preload bus, since should
TST r1, #IOMD_ProtectionLinkBit ; be still there from earlier TST r1, #IOMD_ProtectionLinkBit ; be still there from earlier
BEQ %FT75 ; zero => protected BEQ %FT75 ; zero => protected
] ]
] ]
......
s/PMF/oseven
View file @ d5916783
...@@ -46,11 +46,12 @@ MOSDoPrint ROUT ...@@ -46,11 +46,12 @@ MOSDoPrint ROUT
Pull "R12,PC" Pull "R12,PC"
MOSDoPrintWS ; entry point when R12-> BYTEWS MOSDoPrintWS ; entry point when R12-> BYTEWS
CLRV
LDRB R1, WrchDest LDRB R1, WrchDest
CMP R1, #4 ; is printer disabled ? TST R1, #4 ; is 'printer disabled' bit set ?
MOVNE PC, R14 ; yes, then return (and V:=0) MOVNE PC, R14 ; yes, then return with V clear
SWIPrintCharEntry SWIPrintCharEntry
LDRB R1, PrinterDrivType ; is it user/net ??? LDRB R1, PrinterDrivType ; get the stream type
B FudgePrinterInsert B FudgePrinterInsert
; ***************************************************************************** ; *****************************************************************************
...@@ -90,7 +91,7 @@ WRITE ROUT ...@@ -90,7 +91,7 @@ WRITE ROUT
; ***************************************************************************** ; *****************************************************************************
; ;
; FudgePrinterInsert - Write byte to net printer ; FudgePrinterInsert - Write byte to printer stream
; ;
; in: R0 = character to send ; in: R0 = character to send
; R1 = printer type (3..255) ; R1 = printer type (3..255)
......
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