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

Fix for spurious error message mounting DVDs

When CDFS wants to change the drive's data mode to mount a DVD it does so via CD_SetParameters. As a side effect of that call, the read retry count is written too.
Some drives return illegal request errors when trying to set the read retry count (even though they're marked as changeable), so just swallow the error like CDFSSoftSCSI does (driver.c revision 1.4 line 566).
Fixes "Compact disc is faulty" error with Samsung SH-S223B drive - the error message was spurious as it's just the default the error handler assumes when it can't look up error 0x50.

Version 1.38. Tagged as 'ATAPI-1_38'
parent 7e900d54
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.37"
Module_Version SETA 137
Module_MajorVersion SETS "1.38"
Module_Version SETA 138
Module_MinorVersion SETS ""
Module_Date SETS "17 Jan 2016"
Module_ApplicationDate SETS "17-Jan-16"
Module_Date SETS "23 Jan 2016"
Module_ApplicationDate SETS "23-Jan-16"
Module_ComponentName SETS "ATAPI"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/CD/ATAPI"
Module_FullVersion SETS "1.37"
Module_HelpVersion SETS "1.37 (17 Jan 2016)"
Module_FullVersion SETS "1.38"
Module_HelpVersion SETS "1.38 (23 Jan 2016)"
END
/* (1.37)
/* (1.38)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.37
#define Module_MajorVersion_CMHG 1.38
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Jan 2016
#define Module_Date_CMHG 23 Jan 2016
#define Module_MajorVersion "1.37"
#define Module_Version 137
#define Module_MajorVersion "1.38"
#define Module_Version 138
#define Module_MinorVersion ""
#define Module_Date "17 Jan 2016"
#define Module_Date "23 Jan 2016"
#define Module_ApplicationDate "17-Jan-16"
#define Module_ApplicationDate "23-Jan-16"
#define Module_ComponentName "ATAPI"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/CD/ATAPI"
#define Module_FullVersion "1.37"
#define Module_HelpVersion "1.37 (17 Jan 2016)"
#define Module_LibraryVersionInfo "1:37"
#define Module_FullVersion "1.38"
#define Module_HelpVersion "1.38 (23 Jan 2016)"
#define Module_LibraryVersionInfo "1:38"
......@@ -1048,7 +1048,14 @@ SP_DoneSpeed
MOV r8, # ATAPICONTROL__SEND_COMMAND
BL ATAPI_Control
BVS error_handler
BVC SP_Page1Written
BIC r14, r0, # (1:SHL:ZERRORFLAGS__SENSEKEY_SHIFT) - 1
TEQ r14, # TARGETERROR__ILLEGAL_REQUEST
BNE error_handler ; An error other than read-only
SP_Page1Written
; Copy page &d over page 1
MOV r1, r5
......
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