Commits (2)
  • Robert Sprowson's avatar
    Reclassify *CDDevices · b49b6b90
    Robert Sprowson authored
    Unlike SCSI/USB/PCI/SDIO device list commands, *CDDevices required CDFS to be the active filing system. Remove the FS flag from its command table entry so it can be entered at other times.
    Tested briefly, drive was listed with SCSIFS active.
    
    Version 2.62. Tagged as 'CDFS-2_62'
    b49b6b90
  • Jeffrey Lee's avatar
    Avoid unnecessary remainder calculations · 41f48826
    Jeffrey Lee authored
    Detail:
      s/EntryFile, s/FileMan, s/Misc - Avoid unnecessary remainder calculation in DivRem macro
    Admin:
      Tested on Cortex-A15
    
    
    Version 2.63. Tagged as 'CDFS-2_63'
    41f48826
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.61"
Module_Version SETA 261
Module_MajorVersion SETS "2.63"
Module_Version SETA 263
Module_MinorVersion SETS ""
Module_Date SETS "15 Aug 2013"
Module_ApplicationDate SETS "15-Aug-13"
Module_Date SETS "08 May 2016"
Module_ApplicationDate SETS "08-May-16"
Module_ComponentName SETS "CDFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/CDFS/CDFS"
Module_FullVersion SETS "2.61"
Module_HelpVersion SETS "2.61 (15 Aug 2013)"
Module_FullVersion SETS "2.63"
Module_HelpVersion SETS "2.63 (08 May 2016)"
END
/* (2.61)
/* (2.63)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.61
#define Module_MajorVersion_CMHG 2.63
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Aug 2013
#define Module_Date_CMHG 08 May 2016
#define Module_MajorVersion "2.61"
#define Module_Version 261
#define Module_MajorVersion "2.63"
#define Module_Version 263
#define Module_MinorVersion ""
#define Module_Date "15 Aug 2013"
#define Module_Date "08 May 2016"
#define Module_ApplicationDate "15-Aug-13"
#define Module_ApplicationDate "08-May-16"
#define Module_ComponentName "CDFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/CDFS/CDFS"
#define Module_FullVersion "2.61"
#define Module_HelpVersion "2.61 (15 Aug 2013)"
#define Module_LibraryVersionInfo "2:61"
#define Module_FullVersion "2.63"
#define Module_HelpVersion "2.63 (08 May 2016)"
#define Module_LibraryVersionInfo "2:63"
......@@ -157,7 +157,7 @@ LoadFile_Ordinary
LDR R4, [ R1, #LENGTHOFFSET ]
MOV R5, #myblocksize
DivRem R7, R4, R5, R14 ; r7 = r4 DIV r5
DivRem R7, R4, R5, R14, norem ; r7 = r4 DIV r5
;***************
......@@ -171,7 +171,7 @@ LoadFile_Ordinary
LDR R5, [ R9, #DiscBuff_BlockSize ]
DivRem R6, R4, R5, R14 ; R6 = log. sec size / lbsize
DivRem R6, R4, R5, R14, norem ; R6 = log. sec size / lbsize
LDR R5, [ R1, #LBASTARTOFFSET ]
MOV R5, R5, LSR #8 ; remove objecttype rubbish
......@@ -188,7 +188,7 @@ LoadFile_Ordinary
;------------------------------------------------------
DivRem R3, R5, R6, R14 ; R3 = start LBA / R6
DivRem R3, R5, R6, R14, norem ; R3 = start LBA / R6
STR R3, temp1 ; temp1 = STart LBA
......
......@@ -181,12 +181,12 @@ OpenFile ROUT ; see page 973
MOV R7, #myblocksize
DivRem R8, R7, R3, R14
DivRem R8, R7, R3, R14, norem
LDR R3, [ R1, #LBASTARTOFFSET ] ; add start block to details
MOV R3, R3, LSR #8
DivRem R7, R3, R8, R14
DivRem R7, R3, R8, R14, norem
STR R7, [ R2, #STARTLBAOPEN ]
......
......@@ -103,6 +103,8 @@ CDDevices_Code ROUT ; no parameters *CDDevices
;
; ( + 4 indicates number of spaces )
LDR r12, [ r12 ]
PushAllWithReturnFrame
; R0 -> tempbuffer is used to receive the details of the Inquiry command
......@@ -1123,7 +1125,7 @@ PlayListLoop ; loop
; R3 = address DIV 75
;
DivRem R3, R5, #MaxNumberOfBlocks + 1, R14 ; R6 = address MOD 75
DivRem R3, R5, #MaxNumberOfBlocks + 1, R14 ; R5 = address MOD 75
DivRem R0, R3, #MaxNumberOfSeconds + 1, R14 ; R0 = ( address / 75 ) / 60
;
......
......@@ -26,8 +26,8 @@ KeywordTable
]
[ international_help
Command "Bye", 0, 0, International_Help + FS_Command_Flag
Command "CDDevices", 0, 0, International_Help + FS_Command_Flag
Command "CDFS", 0, 0, International_Help
Command "CDDevices", 0, 0, International_Help
Command "CDROMBuffers", 1, 1, International_Help + Status_Keyword_Flag
Command "CDROMDrives", 1, 1, International_Help + Status_Keyword_Flag
Command "CDSpeed", 2, 0, International_Help + FS_Command_Flag
......@@ -46,8 +46,8 @@ KeywordTable
Command "WhichDisc", 1, 0, International_Help + FS_Command_Flag
|
Command "Bye", 0, 0, Help_Is_Code_Flag + FS_Command_Flag
Command "CDDevices", 0, 0, Help_Is_Code_Flag + FS_Command_Flag
Command "CDFS", 0, 0, Help_Is_Code_Flag
Command "CDDevices", 0, 0, Help_Is_Code_Flag
Command "CDROMBuffers", 1, 1, Help_Is_Code_Flag + Status_Keyword_Flag
Command "CDROMDrives", 1, 1, Help_Is_Code_Flag + Status_Keyword_Flag
Command "CDSpeed", 2, 0, Help_Is_Code_Flag + FS_Command_Flag
......