Commit 3a43212f authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Ursula branch merged (new service call table only).

Changed to use srccommit.

Version 1.49. Tagged as 'Podule-1_49'
parent 10c8499f
SUBT => Time+Date
GBLS CurrentDate
GBLS CurrentTime
GBLS CurrentVersion
GBLS CurrentIteration
GBLL ReleaseVersion
CurrentDate SETS "03 Sep 1998"
CurrentTime SETS "16:57:57"
CurrentVersion SETS "48"
CurrentIteration SETS "0000"
ReleaseVersion SETL True
END
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "0.48"
Module_Version SETA 48
Module_MajorVersion SETS "1.49"
Module_Version SETA 149
Module_MinorVersion SETS ""
Module_Date SETS "04 Aug 1999"
Module_FullVersion SETS "0.48"
Module_FullVersion SETS "1.49"
END
/* (0.48)
/* (1.49)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.48
#define Module_MajorVersion_CMHG 1.49
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Aug 1999
#define Module_MajorVersion "0.48"
#define Module_Version 48
#define Module_MajorVersion "1.49"
#define Module_Version 149
#define Module_MinorVersion ""
#define Module_Date "04 Aug 1999"
#define Module_FullVersion "0.48"
#define Module_FullVersion "1.49"
......@@ -62,6 +62,8 @@ OldOpt SETA {OPT}
; s.Module: Changed build options NetworkPodule and
; ExtensionROMs to be equal to system build options
; NetPodSupport and ExtROMSupport.
; 02-Jun-97 KJB Created C version of this file - ensure it stays in step
; Added constants for access speeds
SWIClass SETS PoduleSWI_Name
^ PoduleSWI_Base
......@@ -157,6 +159,12 @@ Podule_BaseAddressANDMask * 2_11111111111111111111110000000000
Podule_CMOSAddressBICMask * 2_11111111111111111111110000000000
Podule_CMOSAddressANDMask * 2_00000000000000000000001111111111
; Access speeds, as passed to Podule_SetSpeed
Podule_Speed_TypeA * 1
Podule_Speed_TypeB * 2
Podule_Speed_TypeC * 3
Podule_Speed_TypeD * 4
; Operating system identity bytes for load chunks
^ 2_10000000 ; OS=0, RISCOS
OSType_Loader # 1 ; &80 The loader for the rest of the image
......
......@@ -34,7 +34,10 @@
GET Hdr:MsgTrans
GET Hdr:PoduleReg
GET Time+Date
GET VersionASM
GBLL ReleaseVersion
ReleaseVersion SETL True
GBLS GetHelpTexts
[ International_Help <> 0
......
......@@ -584,14 +584,12 @@ TotalRAMRequired * :INDEX: @
OPT OptPage
HelpString
DCB "Podule Manager", 9, "1.", CurrentVersion
[ ReleaseVersion
! 0, "Assembling Podule Manager 1.$CurrentVersion"
|
DCB "/", CurrentIteration
! 0, "Assembling Podule Manager 1.$CurrentVersion/$CurrentIteration"
DCB "Podule Manager", 9, "$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
= " (", CurrentDate, ")"
! 0, "Assembling Podule Manager $Module_MajorVersion $Module_MinorVersion"
[ :LNOT: ReleaseVersion
= " [", (:STR: NumberOfPodules) :RIGHT: 1
[ NetworkPodule
......@@ -601,7 +599,7 @@ HelpString
= "/E"
]
= "]"
= " assembled at ", CurrentTime, " as a development version."
= " assembled as a development version."
]
= 0
ALIGN
......@@ -714,10 +712,20 @@ ResetAllLoaders
BL close_message_file ; close messages file if it is open, marking it closed
BICS pc, r6, #VFlag
ASSERT Service_Reset < Service_PreReset
ServiceTable
DCD 0 ;flags
DCD UServiceEntry - Origin
DCD Service_Reset
DCD Service_PreReset
DCD 0 ;terminator
DCD ServiceTable - Origin ;table anchor
ServiceEntry ROUT
MOV r0, r0 ;magic instruction
TEQ r1, #Service_PreReset
TEQNE r1, #Service_Reset
MOVNES pc, lr
UServiceEntry
Push "r0-r6, lr"
BL ResetAllLoaders
Pull "r0-r6, pc",,^
......
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