Skip to content

GitLab

Source
...
Target
Commits (1)
  • Robert Sprowson's avatar
    Have BootNet look after its own messages · 6cb4860c
    Robert Sprowson authored 
    Fix confusion about configure syntax needing internationalising.
Internationalise the "needs RISC OS 3.10" error message.
Delete the unused GSLookup functions.

Version 0.97. Tagged as 'BootNet-0_97'
    6cb4860c
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 117 deletions
HelpTexts
View file @ 6cb4860c
......@@ -9,8 +9,6 @@ SyntaxOfConfigureBootNetError
DCD ErrorNumber_Syntax
SyntaxOfConfigureBootNet
DCB "SBNTCBN",0
SyntaxOnlyOfConfigureBootNet
DCB "CBNTCBN",0
|
......@@ -21,8 +19,6 @@ SyntaxOfConfigureBootNetError
DCD ErrorNumber_Syntax
SyntaxOfConfigureBootNet
DCB "Syntax: *Configure BootNet On|Off", 0
SyntaxOnlyOfConfigureBootNet
DCB "BootNet On|Off", 0
]
......
Makefile
View file @ 6cb4860c
......@@ -27,7 +27,6 @@ COMPONENT = BootNet
TOKHELPSRC = ${TOKENSOURCE}
HELPSRC = HelpTexts
ROM_SOURCE = Module.s
RESOURCES = No
include StdTools
include AAsmModule
......
Resources/UK/CmdHelp 0 → 100644
View file @ 6cb4860c
File added
Resources/UK/Messages 0 → 100644
View file @ 6cb4860c
#{DictTokens}
KTooOld:BootNet requires RISC OS 3.10 or later
VersionASM
View file @ 6cb4860c
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.96"
Module_Version SETA 96
Module_MajorVersion SETS "0.97"
Module_Version SETA 97
Module_MinorVersion SETS ""
Module_Date SETS "26 Feb 2012"
Module_ApplicationDate SETS "26-Feb-12"
Module_Date SETS "17 Jun 2015"
Module_ApplicationDate SETS "17-Jun-15"
Module_ComponentName SETS "BootNet"
Module_ComponentPath SETS "castle/RiscOS/Sources/Networking/AUN/BootNet"
Module_FullVersion SETS "0.96"
Module_HelpVersion SETS "0.96 (26 Feb 2012)"
Module_FullVersion SETS "0.97"
Module_HelpVersion SETS "0.97 (17 Jun 2015)"
END
VersionNum
View file @ 6cb4860c
/* (0.96)
/* (0.97)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.96
#define Module_MajorVersion_CMHG 0.97
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Feb 2012
#define Module_Date_CMHG 17 Jun 2015
#define Module_MajorVersion "0.96"
#define Module_Version 96
#define Module_MajorVersion "0.97"
#define Module_Version 97
#define Module_MinorVersion ""
#define Module_Date "26 Feb 2012"
#define Module_Date "17 Jun 2015"
#define Module_ApplicationDate "26-Feb-12"
#define Module_ApplicationDate "17-Jun-15"
#define Module_ComponentName "BootNet"
#define Module_ComponentPath "castle/RiscOS/Sources/Networking/AUN/BootNet"
#define Module_FullVersion "0.96"
#define Module_HelpVersion "0.96 (26 Feb 2012)"
#define Module_LibraryVersionInfo "0:96"
#define Module_FullVersion "0.97"
#define Module_HelpVersion "0.97 (17 Jun 2015)"
#define Module_LibraryVersionInfo "0:97"
s/Commands
View file @ 6cb4860c
......@@ -27,20 +27,20 @@ ConfigureBootNet ROUT
Push "r0-r4, lr"
LDR wp, [ r12 ]
CMP r0, #1
BHI DoConfigureBootNet ; Configure
BEQ StatusOfBootNet ; Print status
PrintSyntaxOfConfigureBootNet
[ international_help
ADRL r1, SyntaxOnlyOfConfigureBootNet
BL MessageTransLookupOnce
MOV r0, r2
MOV r1, r3
SWI XOS_WriteN
B PrintNewLineAndExit
|
ADRL r0, SyntaxOnlyOfConfigureBootNet
BHI DoConfigureBootNet ; *Configure BootNet
BEQ StatusOfBootNet ; *Status BootNet
ADR r0, SyntaxOnlyOfConfigureBootNet ; Bare *Configure (show syntax)
B PrintMessageAndExit
]
SyntaxOnlyOfConfigureBootNet
DCB "BootNet On|Off",0 ; Command keyword and its switches cannot
Status_Common ; be internationalised, like all other commands
DCB "BootNet O", 0
Status_BootNetOff
DCB "ff", 0
Status_BootNetOn
DCB "n", 0
ALIGN
StatusOfBootNet ; Print the status
ADR r0, Status_Common
......
s/Module
View file @ 6cb4860c
......@@ -17,7 +17,6 @@
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:Machine.<Machine>
GET Hdr:CMOS
GET Hdr:ModHand
GET Hdr:Debug
......@@ -122,8 +121,12 @@ DontBoot
DontBootAndDontInitialise
BL Action_NoBoot
ADR r0, ErrorBadOSVersion
ADR r0, ErrorBlock_ModuleTooOld
[ international_help
BL MessageTransErrorLookupOnce
|
SETV
]
ExitDoBootNet
BL Action_BootShareFS
STRVS r0, [ sp, #0 ]
......@@ -196,9 +199,15 @@ Action_BootShareFS
LTORG
ErrorBadOSVersion
DCD 0
DCB "Module BootNet unable to initialise; needs RISC OS 3.10 or later", 0
[ international_help
MakeInternatErrorBlock ModuleTooOld,,"KTooOld"
|
ErrorBlock_ModuleTooOld
DCD ErrorNumber_ModuleTooOld
DCB "BootNet requires RISC OS 3.10 or later", 0
ALIGN
]
Module_Kernel
DCB "UtilityModule", 0
Module_NetPrint
......@@ -219,12 +228,6 @@ Module_Internet
Module_Net
DCB "Net", 0
]
Status_Common
DCB "BootNet O", 0
Status_BootNetOff
DCB "ff", 0
Status_BootNetOn
DCB "n", 0
File_BootShareFS
DCB "Run Resources:$.Resources.ShareFS.!Boot", 0
ALIGN
......@@ -269,78 +272,6 @@ ExitReInitModule
InsertDebugRoutines
]
[ {FALSE}
MakeError ROUT
Push "r4, r5, lr"
MOV r4, #0
DoMakeError1
MOV r5, #0
BL MessageTransErrorLookup2
Pull "r4, r5, pc"
MakeErrorWithModuleName
Push "r4, r5, lr"
ADR r4, ModuleTitle
B DoMakeError1
MessageTransErrorLookup2
Push "r1-r3, r6, r7, lr"
LD r1, MessageBlockAddress
CMP r1, #0 ; Clears V
BNE DoErrorLookup
MOV r7, r0
ADR r0, MessageBlock
ADR r1, MessageFileName
MOV r2, #0 ; Use the file where she lies
SWI XMessageTrans_OpenFile
ADRVC r1, MessageBlock
STRVC r1, MessageBlockAddress
MOV r0, r7 ; Preserve R0 even in the error case
DoErrorLookup
MOV r2, #0
MOV r3, #0
MOV r6, #0
MOV r7, #0
SWIVC XMessageTrans_ErrorLookup
Pull "r1-r3, r6, r7, pc"
MessageFileName
DCB "Resources:$.Resources.BootNet.Messages", 0
ALIGN
MessageTransGSLookup0
Push "r4, r5, lr"
MOV r4, #0
MOV r5, #0
BL MessageTransGSLookup2
Pull "r4, r5, pc"
MessageTransGSLookup1
Push "r5, lr"
MOV r5, #0
BL MessageTransGSLookup2
Pull "r5, pc"
MessageTransGSLookup2
Push "r6, r7, lr"
LD r0, MessageBlockAddress
CMP r0, #0 ; Clears V
BNE DoGSLookup
Push "r1, r2"
ADR r0, MessageBlock
ADR r1, MessageFileName
MOV r2, #0 ; Use the file where she lies
SWI XMessageTrans_OpenFile
ADRVC r0, MessageBlock
STRVC r0, MessageBlockAddress
Pull "r1, r2"
DoGSLookup
MOV r6, #0
MOV r7, #0
SWIVC XMessageTrans_GSLookup
Pull "r6, r7, pc"
]
[ international_help
MessageFileName
......