Commits (2)
  • Robert Sprowson's avatar
    Fix for misreported errors from sleep_on_[tx|rx] · 9d79ab31
    Robert Sprowson authored
    An early PullEnv corrupted R0 so the tests of ff_FileError and ff_TimedOut were on the wrong flags.
    
    Version 0.71. Tagged as 'DeviceFS-0_71'
    9d79ab31
  • Jeffrey Lee's avatar
    Escape some dollars · ad3d0e44
    Jeffrey Lee authored
    Detail:
      s/DeviceFS - Escape some dollars contained in strings to avoid warnings from objasm
    Admin:
      Resulting binary unchanged
    
    
    Version 0.71. Retagged as 'DeviceFS-0_71'
    ad3d0e44
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.70"
Module_Version SETA 70
Module_MajorVersion SETS "0.71"
Module_Version SETA 71
Module_MinorVersion SETS ""
Module_Date SETS "25 May 2013"
Module_ApplicationDate SETS "25-May-13"
Module_Date SETS "15 Jun 2013"
Module_ApplicationDate SETS "15-Jun-13"
Module_ComponentName SETS "DeviceFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/DeviceFS"
Module_FullVersion SETS "0.70"
Module_HelpVersion SETS "0.70 (25 May 2013)"
Module_FullVersion SETS "0.71"
Module_HelpVersion SETS "0.71 (15 Jun 2013)"
END
/* (0.70)
/* (0.71)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.70
#define Module_MajorVersion_CMHG 0.71
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 May 2013
#define Module_Date_CMHG 15 Jun 2013
#define Module_MajorVersion "0.70"
#define Module_Version 70
#define Module_MajorVersion "0.71"
#define Module_Version 71
#define Module_MinorVersion ""
#define Module_Date "25 May 2013"
#define Module_Date "15 Jun 2013"
#define Module_ApplicationDate "25-May-13"
#define Module_ApplicationDate "15-Jun-13"
#define Module_ComponentName "DeviceFS"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/DeviceFS"
#define Module_FullVersion "0.70"
#define Module_HelpVersion "0.70 (25 May 2013)"
#define Module_LibraryVersionInfo "0:70"
#define Module_FullVersion "0.71"
#define Module_HelpVersion "0.71 (15 Jun 2013)"
#define Module_LibraryVersionInfo "0:71"
......@@ -331,8 +331,6 @@ ff_Error * 1:SHL:3 ; bit 3 set => error has occured
object_subdevice * -1 ; object type returned by findobject if the path is
; an object inside a device eg "$.Parallel.Fred"
SVC_Mode * 3
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
;
; Now define module header.
......@@ -384,11 +382,11 @@ fs_name = "devices", 0 ; filing system
resource_file = "Resources:$.Resources.DeviceFS.Messages", 0
]
devicevarbits = "DeviceFS$", 0, "$Options", 0 ; DeviceFS$<device name>$Options
pathvarbits = "$Path", 0, "devices#<FileSwitch$SpecialField>:$"
devicevarbits = "DeviceFS$", 0, "$$Options", 0 ; DeviceFS$<device name>$Options
pathvarbits = "$$Path", 0, "devices#<FileSwitch$$SpecialField>:$"
pathvarbits2 = ".", 0 ; used twice
set_filetype = "Set File$Type_FCC Device", 0 ; setup variable for device file type
set_filetype = "Set File$$Type_FCC Device", 0 ; setup variable for device file type
ALIGN
......
......@@ -127,16 +127,15 @@ sleep_on_rx ALTENTRY
PLP r1
EXIT EQ
PullEnv
TST r0, #ff_TimedOut :OR: ff_Error
EXIT EQ ; awake, no timeout and no error
TST r0, #ff_TimedOut
BEQ %f20
ADR r0, ErrorBlock_DeviceFS_Timeout ; so set r0 -> error block
DoError ; translate error and return V set
20
TST r0, #ff_Error
MOVEQ pc, lr
PullEnv
ADRNE r0, ErrorBlock_DeviceFS_Timeout ; so set r0 -> error block
DoError NE ; translate error and return V set
ADD r0, fr, #file_Error
ADD r0, fr, #file_Error ; not a time out, implies file error
[ debug
ADD r0, r0, #4
DebugS fs, "waking up with error: ", r0
......