Skip to content

GitLab

Commit 10410a0a authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Converted to use objasm instead of aasm. 

Detail:
  Makefile changes too.
Admin:
  Might have been built once?


Version 2.32. Tagged as 'ScrBlank-2_32'
parent d72f4b74
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 100 deletions
Makefile
View file @ 10410a0a
......@@ -19,69 +19,15 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 23-Mar-01 SNB Recreated.
#
#
# Paths
#
EXP_HDR = <export$dir>
#
# Generic options:
#
MKDIR = cdir
AS = aasm
CP = copy
RM = remove
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From
CPFLAGS = ~cfr~v
#
# Program specific options:
#
COMPONENT = ScrBlank
SOURCE = s.ScrBlank
TARGET = rm.ScrBlank
EXPORTS = ${EXP_HDR}.${COMPONENT}
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
export: ${EXPORTS}
@echo ${COMPONENT}: export complete
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
clean:
${RM} ${TARGET}
@echo ${COMPONENT}: cleaned
resources: resources-${CMDHELP}
@echo ${COMPONENT}: resource files copied
resources_common:
${MKDIR} ${RESDIR}.ScrBlanker
TokenCheck LocalRes:Messages
${CP} LocalRes:Messages ${RESDIR}.ScrBlanker.Messages ${CPFLAGS}
resources-None: resources_common
@
resources-: resources_common
TokenCheck LocalRes:CmdHelp
print LocalRes:CmdHelp { >> ${RESDIR}.ScrBlanker.Messages }
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} ${SOURCE}
COMPONENT = ScreenBlanker
TARGET = ScrBlank
RESFSDIR = ${RESDIR}.ScrBlanker
HEADER1 = ScrBlank
${EXP_HDR}.${COMPONENT}: hdr.${COMPONENT}
${CP} hdr.${COMPONENT} $@ ${CPFLAGS}
include StdTools
include AAsmModule
# Dynamic dependencies:
MkClean,fd7
View file @ 10410a0a
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
VersionASM
View file @ 10410a0a
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.31"
Module_Version SETA 231
Module_MajorVersion SETS "2.32"
Module_Version SETA 232
Module_MinorVersion SETS ""
Module_Date SETS "21 Nov 2000"
Module_ApplicationDate2 SETS "21-Nov-00"
Module_ApplicationDate4 SETS "21-Nov-2000"
Module_Date SETS "02 Jul 2001"
Module_ApplicationDate2 SETS "02-Jul-01"
Module_ApplicationDate4 SETS "02-Jul-2001"
Module_ComponentName SETS "ScrBlank"
Module_ComponentPath SETS "RiscOS/Sources/Video/Render/ScrBlank"
Module_FullVersion SETS "2.31"
Module_HelpVersion SETS "2.31 (21 Nov 2000)"
Module_FullVersion SETS "2.32"
Module_HelpVersion SETS "2.32 (02 Jul 2001)"
END
VersionNum
View file @ 10410a0a
/* (2.31)
/* (2.32)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.31
#define Module_MajorVersion_CMHG 2.32
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Nov 2000
#define Module_Date_CMHG 02 Jul 2001
#define Module_MajorVersion "2.31"
#define Module_Version 231
#define Module_MajorVersion "2.32"
#define Module_Version 232
#define Module_MinorVersion ""
#define Module_Date "21 Nov 2000"
#define Module_Date "02 Jul 2001"
#define Module_ApplicationDate2 "21-Nov-00"
#define Module_ApplicationDate4 "21-Nov-2000"
#define Module_ApplicationDate2 "02-Jul-01"
#define Module_ApplicationDate4 "02-Jul-2001"
#define Module_ComponentName "ScrBlank"
#define Module_ComponentPath "RiscOS/Sources/Video/Render/ScrBlank"
#define Module_FullVersion "2.31"
#define Module_HelpVersion "2.31 (21 Nov 2000)"
#define Module_FullVersion "2.32"
#define Module_HelpVersion "2.32 (02 Jul 2001)"
s/ScrBlank
View file @ 10410a0a
......@@ -157,6 +157,7 @@ MouseBuff # 5
StrBuff # StrBuffLen
workspacesize * :INDEX:@
AREA |ScreenBlanker$$Code|, CODE, READONLY, PIC
Module_BaseAddr
DCD 0 ; No StartCode
......@@ -282,14 +283,14 @@ Go_Online
; R1 is time in cs. Leaves time in ticks in R0.
ConvertCSToTicks ENTRY "R1,R2"
ConvertCSToTicks Entry "R1,R2"
MOV R2, #TickDelta
DivRem R0, R1, R2, LR
EXIT
; R0 is time in ticks. Leaves time in seconds in R1.
ConvertTicksToSecs ENTRY "R0,R2"
ConvertTicksToSecs Entry "R0,R2"
MOV R2, #TicksPerSec
DivRem R1, R0, R2, LR
EXIT
......@@ -297,7 +298,7 @@ ConvertTicksToSecs ENTRY "R0,R2"
; [ Stork
; R0 is time in ticks. Leaves time in centi-seconds in R1.
ConvertTicksToCS ENTRY "R0,R2"
ConvertTicksToCS Entry "R0,R2"
MOV R2, #TickDelta ;centi-seconds per tick
MUL R1, R0, R2
EXIT
......@@ -338,7 +339,7 @@ Go_Flash
; Wakes the screen and cancels flashing, if it's happening
; Input registers corrupted
Subr_SetTimeout ENTRY ; CORRUPTS REGISTERS
Subr_SetTimeout Entry ; CORRUPTS REGISTERS
Go_SetTimeout
TEQ R1, #0 ; 0 means "never blank"
MOVEQ R0, #0
......@@ -365,7 +366,7 @@ Go_ReadTimeout2
; R1 holds dimmer time in centiseconds (or 0 for "never")
; Input registers corrupted
Subr_SetDimTime ENTRY ; CORRUPTS REGISTERS
Subr_SetDimTime Entry ; CORRUPTS REGISTERS
Go_SetDimTime
TEQ R1, #0 ; 0 means "never blank"
MOVEQ R0, #0
......@@ -441,7 +442,7 @@ BlankTimeSyn
ALIGN
[ ConfSupport
CBlankTime ENTRY
CBlankTime Entry
LDR R12, [R12] ; get workspace pointer
CMP R0, #0
EXIT EQ ; should never happen
......@@ -507,7 +508,7 @@ CPrintTime
EXIT
]
BlankTime ENTRY
BlankTime Entry
LDR R12, [R12] ; get workspace pointer
TEQ R1,#0
......@@ -613,7 +614,7 @@ DimTimeSyn
]
ALIGN
DimTimeCmd ENTRY
DimTimeCmd Entry
LDR R12, [R12] ; get workspace pointer
TEQ R1,#0
......@@ -666,7 +667,7 @@ DimOff DCB "DimOff", 0
DimTim DCB "DimTm", 0
ALIGN
DecodeDimPar ENTRY "R6"
DecodeDimPar Entry "R6"
LDRB R1,[R0]
MOV R1,R0 ; Move strpointer to R1
MOV R0,#(1<<29) ; Check 0<=R2<=2^18 (ca. 3 days)
......@@ -723,7 +724,7 @@ BlankTimes DCD 0
; keypress. This can 'disable' the blanker when using an editor eg. TWIN
; which keeps an onscreen clock.
ClaimVectorsAndStuff ENTRY "R0-R3"
ClaimVectorsAndStuff Entry "R0-R3"
MOV R1,#0
STR R1,LastMouse
......@@ -879,7 +880,7 @@ Finish
; Used by Service_Reset; only reclaim if it's a soft reset.
ReclaimVectorsAndStuff ENTRY "R0-R2"
ReclaimVectorsAndStuff Entry "R0-R2"
MOV R0, #&FD
MOV R1, #0
MOV R2, #&FF
......@@ -943,7 +944,7 @@ ServiceUrsula
TEQ R1,#Service_ModeChange
BNE %FT00
ENTRY "R0"
Entry "R0"
BL TurnScreenOn ; if so, then screen ON.
LDR R0,TimeOn
STR R0,timer
......@@ -996,7 +997,7 @@ EventAction
MOVNE PC, LR
; fall thru...
Action ENTRY "R0"
Action Entry "R0"
LDR LR, Blanked
TEQ LR, #Blanked_Standby
EXIT EQ
......@@ -1015,7 +1016,7 @@ Action ENTRY "R0"
; Tick is called from OS_CallEvery, and is therefore effectively an interrupt
; handler.
Tick ENTRY "R0-R5"
Tick Entry "R0-R5"
LDR LR, Blanked
TEQ LR, #Blanked_Standby
......@@ -1116,7 +1117,7 @@ offaction
STR R0,timer
EXIT
RemovePendingCallBacks ENTRY "R0-R1"
RemovePendingCallBacks Entry "R0-R1"
[ NewService
ADR R0, CallBackHandler
MOV R1, R12
......@@ -1134,7 +1135,7 @@ RemovePendingCallBacks ENTRY "R0-R1"
; Could determine current state of screen here, and issue the right call
; instead of registering the state in the callback R12.
CallBackHandler ENTRY "R0-R12"
CallBackHandler Entry "R0-R12"
[ NewService
LDR R0, FlashFlags
LDR R1, NextService
......@@ -1150,7 +1151,7 @@ CallBackHandler ENTRY "R0-R12"
; Turn the screen off.
; R0 = reason for blanking (Blank_*)
TurnScreenOff ENTRY "R0-R9"
TurnScreenOff Entry "R0-R9"
; We could be in an interrupt, so we have to save the svc_link register
; before calling any SWI's
......@@ -1211,7 +1212,7 @@ TurnScreenOff ENTRY "R0-R9"
; Turn the screen on
TurnScreenOn ENTRY "R0-R9"
TurnScreenOn Entry "R0-R9"
; We could be in an interrupt, so we have to save the svc_link register
; before calling any SWI's
......@@ -1268,7 +1269,7 @@ TurnScreenOn ENTRY "R0-R9"
;
; DimScreen - Dim the screen.
;
DimScreen ENTRY "R0-R9"
DimScreen Entry "R0-R9"
; We could be in an interrupt, so we have to save the svc_link register
; before calling any SWI's
......@@ -1308,7 +1309,7 @@ CancelDim
;
; UndimScreen - Restore full brightness
;
UndimScreen ENTRY "R0-R9"
UndimScreen Entry "R0-R9"
; We could be in an interrupt, so we have to save the svc_link register
; before calling any SWI's
......@@ -1340,7 +1341,7 @@ messagefilename
ALIGN
openmsgfile
ENTRY r0-r2
Entry r0-r2
LDR r0, messagefilehand
CMP r0, #0
ADREQ r0, messageblock
......@@ -1352,7 +1353,7 @@ openmsgfile
EXIT
error_lookup
ENTRY r1-r2
Entry r1-r2
BL openmsgfile
EXIT VS
LDR r1, messagefilehand
......
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