Commit ca0a32b3 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Minor fixes

Interface.s: Use error &1E6 for Bad SWI.
HelpTexts: Use hardspaces to ensure the print server lines up with other *Configure values.
Commands.s: Fix top-bit-set address bug where commands issued above 2G would be interpreted as a *Configure syntax request. Sort out confusion about internationalising configure commands - the 'PS' of the status report shouldn't be looked up since that would mean the *Configure command changed for each language.

Tested on a high vectors ARMv7 with strict alignment checking enabled, printing a ~170k DrawFile through PrinterManager 1.83 through NetI 6.26 to !Spooler 1.10 via Ethernet physical link.

Version 5.60. Tagged as 'NetPrint-5_60'
parent 5eebac9d
......@@ -64,7 +64,7 @@ ConfigurePS_Syntax
[ :LNOT: UseMsgTrans
SyntaxOnlyOfConfigurePS
]
= "PS <printer server name>|<station number>", 0
= "PS", 31, 31, 31, 31, 31, 31, 31, 31, 31, "<printer server name>|<station number>", 0
[ UseMsgTrans
SyntaxOnlyOfConfigurePS = "ConfPS", 0
......
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.59"
Module_Version SETA 559
Module_MajorVersion SETS "5.60"
Module_Version SETA 560
Module_MinorVersion SETS ""
Module_Date SETS "14 Mar 2011"
Module_ApplicationDate SETS "14-Mar-11"
Module_Date SETS "26 Jun 2016"
Module_ApplicationDate SETS "26-Jun-16"
Module_ComponentName SETS "NetPrint"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/NetPrint"
Module_FullVersion SETS "5.59"
Module_HelpVersion SETS "5.59 (14 Mar 2011)"
Module_FullVersion SETS "5.60"
Module_HelpVersion SETS "5.60 (26 Jun 2016)"
END
/* (5.59)
/* (5.60)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.59
#define Module_MajorVersion_CMHG 5.60
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Mar 2011
#define Module_Date_CMHG 26 Jun 2016
#define Module_MajorVersion "5.59"
#define Module_Version 559
#define Module_MajorVersion "5.60"
#define Module_Version 560
#define Module_MinorVersion ""
#define Module_Date "14 Mar 2011"
#define Module_Date "26 Jun 2016"
#define Module_ApplicationDate "14-Mar-11"
#define Module_ApplicationDate "26-Jun-16"
#define Module_ComponentName "NetPrint"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/NetPrint"
#define Module_FullVersion "5.59"
#define Module_HelpVersion "5.59 (14 Mar 2011)"
#define Module_LibraryVersionInfo "5:59"
#define Module_FullVersion "5.60"
#define Module_HelpVersion "5.60 (26 Jun 2016)"
#define Module_LibraryVersionInfo "5:60"
......@@ -266,6 +266,12 @@ FullHeader
ADR r6, StatusBuffer
B PrintHeader
Token_PSName
DCB "PSName", 0
Token_PSFullHeader
DCB "PSHead", 0
ALIGN
GetGivenStatus ROUT
Push "r0, r1, r2, lr" ; Make stack frame for reception into 'R0'
B %50
......@@ -451,7 +457,7 @@ ConfigurePS_Code ROUT
Push lr
LDR wp, [ r12 ]
CMP r0, #1
BGT %60 ; Configure
BHI %60 ; Configure
BEQ %02 ; Print status
[ UseMsgTrans
......@@ -463,64 +469,6 @@ ConfigurePS_Code ROUT
BL LookupAndPrint
SWIVC XOS_NewLine
B %95
02 ; Print the current seting of *Con. PS
MOV r0, #ReadCMOS
MOV r1, #NetPSIDCMOS
SWI XOS_Byte
BVS %95
TEQ r2, #0 ; Check flag for Numeric or Textual
BEQ %20 ; Text
MOV r3, r2 ; Save station number
MOV r1, #NetPSIDCMOS + 1
SWI XOS_Byte
BVS %95
MOV r1, r3
Push "r1, r2"
MOV r0, sp
ADR r1, TempPSName
MOV r2, #?TempPSName
SWI XOS_ConvertNetStation
INC sp, 8
ADR r1, Token_PSNumber
B %50 ; Now print it out
20
ADR r4, TempPSName
MOV r1, #NetPSIDCMOS + 1
SWI XOS_Byte
BVS %95
STRB r2, [ r4 ], #1
TEQ r2, #0
BEQ %40
MOV r1, #PSNameCMOS
30
SWI XOS_Byte
BVS %95
STRB r2, [ r4 ], #1
TEQ r2, #0
BEQ %40
INC r1
TEQ r1, #PSNameCMOS + 5
BNE %30
MOV r2, #0
STRB r2, [ r4 ]
40
ADR r1, Token_PSName
50
ADR r4, TempPSName
MOV r5, #0
MOV r6, #0
BL LookupAndPrint
B %95
Token_PSName
DCB "PSName", 0
Token_PSNumber
DCB "PSNumb", 0
Token_PSFullHeader
DCB "PSHead", 0
ALIGN
| ; UseMsgTrans
01
ADRL r0, SyntaxOnlyOfConfigurePS
......@@ -528,12 +476,12 @@ Token_PSFullHeader
SWI XOS_PrettyPrint
SWIVC XOS_NewLine
B %95
]
02 ; Print the current setting of *Con. PS
ADR r1, TemporaryBuffer
MOV r3, #30
BL AddString
= "Printer server ", 0
= "PS",31,31,31,31,31,31,31,31,31,0 ; Hardspaces for PrettyPrint
ALIGN
MOV r4, r1
MOVVC r0, #OsByte_ReadCMOS
......@@ -584,7 +532,6 @@ Token_PSFullHeader
SWI XOS_PrettyPrint
SWIVC XOS_NewLine
B %95
] ; UseMsgTrans
60 ; Configure
MOV r1, r0
......
......@@ -48,7 +48,7 @@ JumpTab
EndOfJumpTab
UnknownSWI
ADR r0, ErrorOutOfRange
ADR r0, ErrorBadSWI
[ UseMsgTrans
B MakeErrorWithModuleName
|
......@@ -58,8 +58,8 @@ UnknownSWI
ASSERT NetPrintSWICheckValue-NetPrint_ReadPSNumber=(EndOfJumpTab-JumpTab)/4
[ UseMsgTrans
ErrorOutOfRange
DCD ErrorNumber_OutOfRange
ErrorBadSWI
DCD ErrorNumber_NoSuchSWI
DCB "BadSWI", 0
ALIGN
|
......
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