diff --git a/VersionASM b/VersionASM index e97b93f8155098b5acba7bf101ab1eb8df10f163..63194de5b5b9c63fdd990bba0cd039a79c069873 100644 --- a/VersionASM +++ b/VersionASM @@ -12,9 +12,9 @@ Module_MajorVersion SETS "6.34" Module_Version SETA 634 Module_MinorVersion SETS "" -Module_Date SETS "27 Feb 2020" -Module_ApplicationDate SETS "27-Feb-20" +Module_Date SETS "02 Mar 2020" +Module_ApplicationDate SETS "02-Mar-20" Module_ComponentName SETS "Kernel" Module_FullVersion SETS "6.34" -Module_HelpVersion SETS "6.34 (27 Feb 2020)" +Module_HelpVersion SETS "6.34 (02 Mar 2020)" END diff --git a/VersionNum b/VersionNum index 3fdd6f5de5e7f9c928cc0184a527dd71f398c1bf..4e79423aaea68fcbb8e4a95eb89b92eae5102e67 100644 --- a/VersionNum +++ b/VersionNum @@ -5,17 +5,17 @@ */ #define Module_MajorVersion_CMHG 6.34 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 27 Feb 2020 +#define Module_Date_CMHG 02 Mar 2020 #define Module_MajorVersion "6.34" #define Module_Version 634 #define Module_MinorVersion "" -#define Module_Date "27 Feb 2020" +#define Module_Date "02 Mar 2020" -#define Module_ApplicationDate "27-Feb-20" +#define Module_ApplicationDate "02-Mar-20" #define Module_ComponentName "Kernel" #define Module_FullVersion "6.34" -#define Module_HelpVersion "6.34 (27 Feb 2020)" +#define Module_HelpVersion "6.34 (02 Mar 2020)" #define Module_LibraryVersionInfo "6:34" diff --git a/hdr/OSMem b/hdr/OSMem index dc976678ded6e1c3f34f44efe95dc6778460becb..913a9a90946e8448736370ee5d7ccd66e5face93 100644 --- a/hdr/OSMem +++ b/hdr/OSMem @@ -26,6 +26,20 @@ ChangeDyn_FontArea # 1 ; 4 ChangeDyn_RamFS # 1 ; 5 ChangeDyn_FreePool # 1 ; 6 ChangeDyn_MaxArea # 0 ; For internal use by kernel +ChangeDyn_VRAMRescue # 1 ; 7 RISC OS 6 +ChangeDyn_KernelBuffers # 2 ; 8 RISC OS 6 +ChangeDyn_AbortSVCAndIRQStackCopy # 1 ; 10 RISC OS 6 +ChangeDyn_OperatingSystemROM # 1 ; 11 RISC OS 6 +ChangeDyn_SWIDispatchIRQWorkspace # 1 ; 12 RISC OS 6 +ChangeDyn_SVCStack # 1 ; 13 RISC OS 6 +ChangeDyn_IRQStack # 1 ; 14 RISC OS 6 +ChangeDyn_UNDStack # 1 ; 15 RISC OS 6 +ChangeDyn_Level2PageTables # 1 ; 16 RISC OS 6 +ChangeDyn_SoftCAM # 1 ; 17 RISC OS 6 +ChangeDyn_SystemInit # 1 ; 18 RISC OS 6 + ^ 48 +ChangeDyn_ZeroPage # 1 ; 48 Pyromaniac +ChangeDyn_HighVectors # 1 ; 49 Pyromaniac ReadDyn_ReturnMax * 128 ; OS_ReadDynamicArea flag to return max size of area in R2 (for areas 0 to 127 inclusive; other areas always return max size) ; OS_DynamicArea reason codes diff --git a/s/Middle b/s/Middle index 561593ca84d8df1a4903a341290bc99dfe026ec4..f3314f6a95085b6f146ab0a3a13fb4baeb95d8b4 100644 --- a/s/Middle +++ b/s/Middle @@ -1618,6 +1618,9 @@ osri6_maxvalue * (.-4-osri6_table) :SHR: 2 ; 3 = Morris+ (currently returned for A7000+ only) ; 4 = Phoebe (currently returned for Risc PC 2 only) ; 5 = HAL (returned for machines running a HAL) +; 6 = VirtualRPC +; 7 = A9Home +; 16 = Pyromaniac ; all other values currently reserved ; r1 = 32 additional platform specifier flags (if defined) ; bits 0..31 = value of flags 0..31 if defined, 0 if undefined diff --git a/s/PMF/osbyte b/s/PMF/osbyte index a017b476cfac30286401272dc17f27242a775146..af38b423ca97fc94f14e53152eef1d9ffe001d80 100644 --- a/s/PMF/osbyte +++ b/s/PMF/osbyte @@ -231,6 +231,28 @@ TryInternational ; special ones in the middle ; R2 is Preserved +; MosVer values clients might expect to read are as follows: +; (ref: http://beebwiki.mdfs.net/OSBYTE_%2600 ) +; Volume Directory Extension +; Electron 0 \ +; BBC A/B 1 | +; BBC B+ 2 | +; Master 128 3 | :d. . / +; Master ET 4 | +; Master Compact 5 | +; Arthur/RISC OS 6 | +; Springboard 7 / +; Unix 8 \ +; 6809/6309 9 | N/A / . +; Mac OS X 10 / +; 6809/6309 17 :d. . / +; Commodore 64/128 28 \ +; TI calculator 29 | d: N/A . +; Amstrad CPC 30 | +; Sinclair ZX Spectrum 31 / +; DOS/Windows 32 \ d:\ \ . +; 6809/6309 39 / + Osbyte00 ROUT TEQ R1, #0 MOVNE R1, #MosVer @@ -981,6 +1003,23 @@ AdvalPositive ROUT ; ***************************************************************************** ; Perform INKEY operation + +; OSVersionID values clients might expect to read include the following: +; (ref: http://beebwiki.mdfs.net/OSBYTE_%2681 ) +; Arthur 1.20 &A0 +; RISC OS 2.00 &A1 +; RISC OS 2.01 &A2 +; RISC OS 3.0x &A3 +; RISC OS 3.1x &A4 +; RISC OS 3.50 &A5 +; RISC OS 3.60 &A6 +; RISC OS 3.7x &A7 +; RISC OS 4.0x &A8 +; RISC OS 4.3x &A9 +; RISC OS 5.xx &AA +; Pyromaniac &AE +; Springboard &AF + Osbyte81 ROUT TST R2, #&80 ; is it negative inkey ? BEQ %FT10 ; no, then not INKEY-256