Skip to content

GitLab

Commit e4f162a3 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Correct new OS_ReadSysInfo 6 item numbers 

Detail:
  s/Middle - Correct the actual item numbers to match those defined in the header 9and those used in the HAL branch)
  hdr/OSRSI6 - Corrected ROM version numbere where the new items are available from
Admin:
  Untested!


Version 5.35, 4.79.2.98.2.45. Tagged as 'Kernel-5_35-4_79_2_98_2_45'
parent d2c62e16
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 28 deletions
VersionASM
View file @ e4f162a3
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.98.2.44"
Module_MinorVersion SETS "4.79.2.98.2.45"
Module_Date SETS "04 Aug 2011"
Module_ApplicationDate SETS "04-Aug-11"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.98.2.44)"
Module_HelpVersion SETS "5.35 (04 Aug 2011) 4.79.2.98.2.44"
Module_FullVersion SETS "5.35 (4.79.2.98.2.45)"
Module_HelpVersion SETS "5.35 (04 Aug 2011) 4.79.2.98.2.45"
END
VersionNum
View file @ e4f162a3
......@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.98.2.44
#define Module_MinorVersion_CMHG 4.79.2.98.2.45
#define Module_Date_CMHG 04 Aug 2011
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.98.2.44"
#define Module_MinorVersion "4.79.2.98.2.45"
#define Module_Date "04 Aug 2011"
#define Module_ApplicationDate "04-Aug-11"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.98.2.44)"
#define Module_HelpVersion "5.35 (04 Aug 2011) 4.79.2.98.2.44"
#define Module_FullVersion "5.35 (4.79.2.98.2.45)"
#define Module_HelpVersion "5.35 (04 Aug 2011) 4.79.2.98.2.45"
#define Module_LibraryVersionInfo "5:35"
hdr/OSRSI6
View file @ e4f162a3
......@@ -57,7 +57,7 @@ OSRSI6_Danger_SoundWorkSpace * 22 ; workspace (8K) and buffers
OSRSI6_Danger_IRQsema * 23
; Safe versions of the danger allocations
; Only supported by OS 5.19+, so if backwards compatability is required code
; Only supported by OS 5.17+, so if backwards compatability is required code
; should (safely!) fall back on the danger versions
OSRSI6_SWIDispatchTable * 64 ; JTABLE-SWIRelocation (Relocated base of OS SWI dispatch table)
......
s/Middle
View file @ e4f162a3
......@@ -1864,28 +1864,27 @@ osri6_table
DCD IRQSTK ;21 - top of the IRQ stack
DCD SoundWorkSpace ;22 - workspace (8K) and buffers (2*4K)
DCD ZeroPage+IRQsema ;23 - the address of the IRQ semaphore
DCD 0
DCD IRQSTK ;25 - Safe replacement for #21 (matches ROL)
DCD JTABLE-SWIRelocation ;26 - Safe replacement for #18 (matches ROL)
% (256-(.-osri6_table))
; Use 64+ for a repeat of of the remaining conflicts, and for our new allocs
DCD DefaultIRQ1V+(Devices-DefaultIRQ1Vcode) ;64 - relocated base of IRQ device head nodes
DCD DefaultIRQ1V+(DevicesEnd-DefaultIRQ1Vcode) ;65 - relocated end of IRQ device head nodes
DCD SoundWorkSpace ;66 - workspace (8K) and buffers (2*4K)
DCD ZeroPage+IRQsema ;67 - the address of the IRQ semaphore
; Use 64+ for a repeat of the danger zone, and our new allocations
DCD JTABLE-SWIRelocation ;64 - relocated base of OS SWI despatch table
DCD DefaultIRQ1V+(Devices-DefaultIRQ1Vcode) ;65 - relocated base of IRQ device head nodes
DCD DefaultIRQ1V+(DevicesEnd-DefaultIRQ1Vcode) ;66 - relocated end of IRQ device head nodes
DCD IRQSTK ;67 - top of the IRQ stack
DCD SoundWorkSpace ;68 - workspace (8K) and buffers (2*4K)
DCD ZeroPage+IRQsema ;69 - the address of the IRQ semaphore
; New allocations
DCD ZeroPage+DomainId ;68 - current Wimp task handle
DCD ZeroPage+OsbyteVars-&A6 ;69 - OS_Byte vars (previously available via OS_Byte &A6/VarStart)
DCD ZeroPage+VduDriverWorkSpace+FgEcfOraEor ;70
DCD ZeroPage+VduDriverWorkSpace+BgEcfOraEor ;71
DCD DebuggerSpace ;72
DCD DebuggerSpace_Size ;73
DCD ZeroPage+CannotReset ;74
DCD ZeroPage+MetroGnome ;75 - OS_ReadMonotonicTime
DCD ZeroPage+CLibCounter ;76
DCD ZeroPage+RISCOSLibWord ;77
DCD ZeroPage+CLibWord ;78
DCD ZeroPage+FPEAnchor ;79
DCD ZeroPage+DomainId ;70 - current Wimp task handle
DCD ZeroPage+OsbyteVars-&A6 ;71 - OS_Byte vars (previously available via OS_Byte &A6/VarStart)
DCD ZeroPage+VduDriverWorkSpace+FgEcfOraEor ;72
DCD ZeroPage+VduDriverWorkSpace+BgEcfOraEor ;73
DCD DebuggerSpace ;74
DCD DebuggerSpace_Size ;75
DCD ZeroPage+CannotReset ;76
DCD ZeroPage+MetroGnome ;77 - OS_ReadMonotonicTime
DCD ZeroPage+CLibCounter ;78
DCD ZeroPage+RISCOSLibWord ;79
DCD ZeroPage+CLibWord ;80
DCD ZeroPage+FPEAnchor ;81
osri6_maxvalue * (.-4-osri6_table) :SHR: 2
......
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