Commit 228c9741 authored by Ben Avison's avatar Ben Avison
Browse files

Relaxed filetype checking on ROM image file in Raspberry Pi case

Detail:
  Too many people were updating the ROM image file (for example using other
  OSes?) such that its filetype wasn't one of the two SDCMOS considered to
  be valid - EPROM or DOS. This resulted in CMOS support apparently not being
  functional for them. Since the filename tested for ("riscos/img") is
  probably quite a strong indicator that it really is a RISC OS ROM image,
  I think it's safe enough to remove the filetype check altogether.
Admin:
  Tested on a Raspberry Pi

Version 0.03. Tagged as 'SDCMOS-0_03'
parent ff5834db
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.02"
Module_Version SETA 2
Module_MajorVersion SETS "0.03"
Module_Version SETA 3
Module_MinorVersion SETS ""
Module_Date SETS "15 Jul 2012"
Module_ApplicationDate SETS "15-Jul-12"
Module_Date SETS "28 Aug 2012"
Module_ApplicationDate SETS "28-Aug-12"
Module_ComponentName SETS "SDCMOS"
Module_ComponentPath SETS "cddl/RiscOS/Sources/HWSupport/SD/SDCMOS"
Module_FullVersion SETS "0.02"
Module_HelpVersion SETS "0.02 (15 Jul 2012)"
Module_FullVersion SETS "0.03"
Module_HelpVersion SETS "0.03 (28 Aug 2012)"
END
/* (0.02)
/* (0.03)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.02
#define Module_MajorVersion_CMHG 0.03
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Jul 2012
#define Module_Date_CMHG 28 Aug 2012
#define Module_MajorVersion "0.02"
#define Module_Version 2
#define Module_MajorVersion "0.03"
#define Module_Version 3
#define Module_MinorVersion ""
#define Module_Date "15 Jul 2012"
#define Module_Date "28 Aug 2012"
#define Module_ApplicationDate "15-Jul-12"
#define Module_ApplicationDate "28-Aug-12"
#define Module_ComponentName "SDCMOS"
#define Module_ComponentPath "cddl/RiscOS/Sources/HWSupport/SD/SDCMOS"
#define Module_FullVersion "0.02"
#define Module_HelpVersion "0.02 (15 Jul 2012)"
#define Module_LibraryVersionInfo "0:2"
#define Module_FullVersion "0.03"
#define Module_HelpVersion "0.03 (28 Aug 2012)"
#define Module_LibraryVersionInfo "0:3"
......@@ -145,7 +145,6 @@ CallBackFromInit ROUT
LDRB r6, [r3]
STMIA r2!, {r4-r5}
STRB r6, [r2], #1
]
; Check it's the sort of file we're expecting
MOV r0, #OSFile_ReadWithTypeNoPath
......@@ -154,15 +153,12 @@ CallBackFromInit ROUT
BVS %F90
TST r0, #object_file
BEQ %F90
[ StoreInHAL
LDR r0, =FileType_EPROM
|
LDR r0, =FileType_Configuration
]
TEQ r6, r0
LDRNE r0, =FileType_MSDOS
TEQNE r6, r0
BNE %F90
]
; All good - get on ByteV
MOV r0, #ByteV
......
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