Commit 09740560 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix memory corruption when encountering a floppy-type device with SCSI ID >= 4

Detail:
  s/ScsiFs20 - Fix UnlockMedia to perform the correct translation between SCSI ID and FileCore drive number
Admin:
  Tested on Raspberry Pi
  Fixes issue reported on forums when many drives connected:
  https://www.riscosopen.org/forum/forums/4/topics/3831


Version 1.30. Tagged as 'SCSIFS-1_30'
parent 48d890c1
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.29"
Module_Version SETA 129
Module_MajorVersion SETS "1.30"
Module_Version SETA 130
Module_MinorVersion SETS ""
Module_Date SETS "28 Nov 2016"
Module_ApplicationDate SETS "28-Nov-16"
Module_Date SETS "09 Sep 2017"
Module_ApplicationDate SETS "09-Sep-17"
Module_ComponentName SETS "SCSIFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
Module_FullVersion SETS "1.29"
Module_HelpVersion SETS "1.29 (28 Nov 2016)"
Module_FullVersion SETS "1.30"
Module_HelpVersion SETS "1.30 (09 Sep 2017)"
END
/* (1.29)
/* (1.30)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.29
#define Module_MajorVersion_CMHG 1.30
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Nov 2016
#define Module_Date_CMHG 09 Sep 2017
#define Module_MajorVersion "1.29"
#define Module_Version 129
#define Module_MajorVersion "1.30"
#define Module_Version 130
#define Module_MinorVersion ""
#define Module_Date "28 Nov 2016"
#define Module_Date "09 Sep 2017"
#define Module_ApplicationDate "28-Nov-16"
#define Module_ApplicationDate "09-Sep-17"
#define Module_ComponentName "SCSIFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
#define Module_FullVersion "1.29"
#define Module_HelpVersion "1.29 (28 Nov 2016)"
#define Module_LibraryVersionInfo "1:29"
#define Module_FullVersion "1.30"
#define Module_HelpVersion "1.30 (09 Sep 2017)"
#define Module_LibraryVersionInfo "1:30"
......@@ -561,8 +561,8 @@ UnLockMedia
SavePSR R6
ADR R2, CDB_UnLockMedia
UnLocMed_10
AND R1, R1, #&FF ; Incase any high order bits are set
sbaddr R5, BlockSizes+4 ; BUG - assumes non-AutoDetect drive mapping in use
mapDevToDrvLo R1, R1
sbaddr R5, BlockSizes
MOV R4, #0
STRB R4, [R5,R1]
......
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