Skip to content

GitLab

Commit 587eb2dc authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Check-in of the few last-minute changes for the Customer L demo. Nothing... 

Check-in of the few last-minute changes for the Customer L demo. Nothing exciting, apart from an extended touchscreen API.

Version 5.35, 4.79.2.13. Tagged as 'Kernel-5_35-4_79_2_13'
parent da847c79
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 45 deletions
Version
View file @ 587eb2dc
......@@ -5,22 +5,18 @@
GBLA Version
GBLS VString
GBLS Date
GBLA OSVersionID
OSVersionID SETA &A8
[ STB
Version SETA Module_Version
VString SETS Module_MajorVersion
Date SETS Module_Date ; version for STB/NC OS
|
[ M_Phoebe
Version SETA 400
VString SETS "4.00"
Date SETS "02 Feb 2000" ; version for RISC OS on desktop computers
;OSVersionID SETA &A8 ; was &A7 for 3.70,3.71
|
Version SETA 371
VString SETS "3.71"
Date SETS "19 Feb 1997" ; version for RISC OS on desktop computers
]
Version SETA 420
VString SETS "4.20"
Date SETS "02 Nov 2000" ; version for RISC OS on desktop computers
]
END
VersionASM
View file @ 587eb2dc
......@@ -13,12 +13,12 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.12"
Module_MinorVersion SETS "4.79.2.13"
Module_Date SETS "10 Nov 2000"
Module_ApplicationDate2 SETS "10-Nov-00"
Module_ApplicationDate4 SETS "10-Nov-2000"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.12)"
Module_HelpVersion SETS "5.35 (10 Nov 2000) 4.79.2.12"
Module_FullVersion SETS "5.35 (4.79.2.13)"
Module_HelpVersion SETS "5.35 (10 Nov 2000) 4.79.2.13"
END
VersionNum
View file @ 587eb2dc
......@@ -4,12 +4,12 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.12
#define Module_MinorVersion_CMHG 4.79.2.13
#define Module_Date_CMHG 10 Nov 2000
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.12"
#define Module_MinorVersion "4.79.2.13"
#define Module_Date "10 Nov 2000"
#define Module_ApplicationDate2 "10-Nov-00"
......@@ -18,5 +18,5 @@
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.12)"
#define Module_HelpVersion "5.35 (10 Nov 2000) (4.79.2.12)"
#define Module_FullVersion "5.35 (4.79.2.13)"
#define Module_HelpVersion "5.35 (10 Nov 2000) (4.79.2.13)"
hdr/HALEntries
View file @ 587eb2dc
......@@ -79,6 +79,8 @@ EntryNo_HAL_MatrixScan # 1
EntryNo_HAL_TouchscreenType # 1
EntryNo_HAL_TouchscreenRead # 1
EntryNo_HAL_TouchscreenMode # 1
EntryNo_HAL_TouchscreenMeasure # 1
EntryNo_HAL_MachineID # 1
EntryNo_HAL_ControllerAddress # 1
......
hdr/KernelWS
View file @ 587eb2dc
......@@ -1685,19 +1685,11 @@ OffsetLogicalToPhysical * TopOfDMAPhysRAM - TopOfDMAWorkSpace
SoundWorkSpaceSize * &1000
[ HAL32
SoundDMABufferSize * &1000
|
Export_SoundDMABufferSize * &1000
ASSERT Export_SoundDMABufferSize = SoundDMABufferSize
]
SoundEvtSize * &1000
[ HAL32
SoundDMABuffers |#| SoundDMABufferSize * 2
SoundWorkSpace |#| SoundWorkSpaceSize + SoundEvtSize
|
Export_SoundDMABuffers |#| SoundDMABufferSize * 2
ASSERT Export_SoundDMABuffers = SoundDMABuffers
ASSERT ?Export_SoundDMABuffers = ?SoundDMABuffers
......@@ -1705,7 +1697,6 @@ Export_SoundDMABuffers |#| SoundDMABufferSize * 2
Export_SoundWorkSpace |#| SoundWorkSpaceSize + SoundEvtSize
ASSERT Export_SoundWorkSpace = SoundWorkSpace
ASSERT ?Export_SoundWorkSpace = ?SoundWorkSpace
]
; Cursor
; mjs Sep 2000, Kernel/HAL split
......
hdr/Options
View file @ 587eb2dc
......@@ -301,13 +301,13 @@ RogerEXEY SETL {FALSE} ; Marketing don't like it!
DAF_SpecifyBit SETL {TRUE}
GBLL DebugROMInit
DebugROMInit SETL (MEMC_Type = "IOMD") :LAND: {TRUE}
DebugROMInit SETL (MEMC_Type = "IOMD") :LAND: {FALSE}
GBLL DebugROMPostInit ; Displays when the PostInit service call is sent to each ROM module (currently works on vanilla service call handling only)
DebugROMPostInit SETL (MEMC_Type = "IOMD") :LAND: :LNOT: ChocolateService :LAND: {TRUE}
DebugROMPostInit SETL (MEMC_Type = "IOMD") :LAND: :LNOT: ChocolateService :LAND: {FALSE}
GBLL DebugROMErrors
DebugROMErrors SETL (MEMC_Type = "IOMD") :LAND: {TRUE}
DebugROMErrors SETL (MEMC_Type = "IOMD") :LAND: {FALSE}
GBLL DebugHeaps ; initialise claimed and freed blocks
DebugHeaps SETL {FALSE} ; (may slow things down unacceptably)
......
hdr/PublicWS
View file @ 587eb2dc
......@@ -106,6 +106,7 @@ SvcTable # &400
^ &01F037FC
BranchToSWIExit # 4 ; from SWI despatcher
]
^ &01F04000
SoundWorkSpace # &2000
......@@ -113,7 +114,6 @@ SoundDMABufferSize * &1000
^ &01F06000
SoundDMABuffers # SoundDMABufferSize * 2
]
OPT OldOpt
......
s/ARM600
View file @ 587eb2dc
......@@ -369,7 +369,7 @@ PPLTrans
& (AP_Full * L2_APMult) + L2_SmallPage ; R any W any
& (AP_Read * L2_APMult) + L2_SmallPage ; R any W sup
& (AP_None * L2_APMult) + L2_SmallPage ; R sup W sup
& (AP_None * L2_APMult) + L2_SmallPage ; R sup W sup
& (AP_ROM * L2_APMult) + L2_SmallPage ; R any W none
PageSizes
& 4*1024 ; 0 is 4K
......
s/ChangeDyn
View file @ 587eb2dc
......@@ -1171,11 +1171,18 @@ CheckForOverlappingAreas Entry "r0-r5"
FixedAreasTable ; table of fixed areas (address, size)
; [ HAL32
; ! 0, "Sort out FixedAreasTable"
; |
[ HAL
! 0, "Sort out FixedAreasTable"
& 0, AplWorkMaxSize ; application space
& CursorChunkAddress, 64*1024 ; 32K for cursor, 32K for "nowhere"
[ OSROM_ImageSize > 8192
& &03000000, 8*1024*1024+OSROM_ImageSize*1024 ; I/O + ROM
|
& &03000000, 16*1024*1024 ; I/O + ROM
]
& IO, &FFFFFFFF-IO ; Kernel workspace (fix - what about dynamic allocs)
|
& 0, AplWorkMaxSize ; application space
; ]
& UndStackSoftCamChunk, 1024*1024 ; undefined stack / soft cam map
& CursorChunkAddress, 64*1024 ; 32K for cursor, 32K for "nowhere"
& L2PT, 4*1024*1024 ; L2PT (and L1PT)
......@@ -1184,15 +1191,14 @@ FixedAreasTable ; table of fixed areas (
|
& &03000000, 16*1024*1024 ; I/O + ROM
]
[ :LNOT: HAL
& PhysSpace, 512*1024*1024 ; PhysSpace
[ No26bitCode
& AbtStack, AbtStackSize
]
]
[ ShadowROM
& &FF800000, &007FFFFF ; Shadow ROM (length has been bodged to avoid wrap problems)
]
] ; HAL
& -1, 0 ; termination
;**************************************************************************
......
s/GetAll
View file @ 587eb2dc
......@@ -177,7 +177,7 @@ EndOfAMB
! 0, "AMB section size = &" :CC: :STR: (EndOfAMB - StartOfAMB)
ALIGN 65536
; ALIGN 65536
EndOfKernel
DCD 0
......
s/HAL
View file @ 587eb2dc
......@@ -702,7 +702,7 @@ MMUon_nol1ptoverlap
; Allocate the cursor/system/sound block
LDR a1, =CursorChunkAddress
LDR a2, =(AP_None * L2_APMult) + L2_C + L2_B
LDR a2, =(AP_Read * L2_APMult) + L2_C + L2_B ; Should be AP_None?
LDR a3, =32*1024
BL Init_MapInRAM
......@@ -745,6 +745,12 @@ MMUon_nol1ptoverlap
MOV a1, #4096
STR a1, [v8, #Page_Size]
MOV a1, #InitKbdWs
MOV a2, #0
MOV a3, #0
STMIA a1!, {a2,a3}
STMIA a1!, {a2,a3}
B Continue_after_HALInit
LTORG
......
s/Kernel
View file @ 587eb2dc
......@@ -770,7 +770,7 @@ JTABLE & SWIWriteC ; this entry never gets used (see ^)
; The fudge branch to exit a dirty SWI handler
DirtyBranch
B Local_SLVK
B SLVK +DirtyBranch-BranchToSWIExit
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
s/NewReset
View file @ 587eb2dc
......@@ -984,7 +984,14 @@ not_full_reset
BL Write
! 0, "Sort out 16-bit sound + PS/2 mouse CMOS reset selection"
dont_program_mousetype
; set print and sound CMOS (16bit sound)
MOV R0, #TutuCMOS
MOV R1, #2_10100100 ; tbs chars valid, ctrlchars '|x'
BL Write
|
[ MorrisSupport
......
s/PMF/osbyte
View file @ 587eb2dc
......@@ -30,8 +30,6 @@ OsbyteSetCountry * &46
OsbyteSetAlphKey * &47
OsbyteKeyStatus * &CA ; only OS_Byte variable which isn't pure any more!
ArthurINKEY256 * &A7 ; INKEY-256 value
; *****************************************************************************
MACRO
......@@ -912,7 +910,7 @@ Osbyte81 ROUT
TST R2, #&80 ; is it negative inkey ?
BEQ %FT10 ; no, then not INKEY-256
ANDS R1, R1, #&FF ; zero => INKEY(-256)
MOVEQ R1, #ArthurINKEY256 ; then X := OS version number
MOVEQ R1, #OSVersionID ; then X := OS version number
MOVEQ R2, #0 ; and Y := 0
MyOsbyte EQ ; if was INKEY-256 then claim
10
......
s/Utility
View file @ 587eb2dc
......@@ -33,8 +33,7 @@ UtilityMod
& Util_SWITab-UtilityMod
& 0
[ International_Help <> 0
; & MessageFileName-UtilityMod
& UtilityMod
& MessageFileName-UtilityMod
|
& 0
]
......
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