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

Update IOMD HAL build to use OS_Memory 9 instead of HAL_ControllerAddress for...

Update IOMD HAL build to use OS_Memory 9 instead of HAL_ControllerAddress for finding the floppy controller

Detail:
  s/Adfs19 - The (currently disabled) floppy code now uses OS_Memory 9 to look for controller 34 instead of the less-portable (and allocation clashing) HAL_ControllerAddress (to look for controller 6).
Admin:
  Compiles but untested. IOMD floppy support is broken at the moment anyway.


Version 3.39. Tagged as 'ADFS-3_39'
parent 013c01da
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.38"
Module_Version SETA 338
Module_MajorVersion SETS "3.39"
Module_Version SETA 339
Module_MinorVersion SETS ""
Module_Date SETS "22 Jun 2011"
Module_ApplicationDate SETS "22-Jun-11"
Module_Date SETS "18 Jul 2011"
Module_ApplicationDate SETS "18-Jul-11"
Module_ComponentName SETS "ADFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
Module_FullVersion SETS "3.38"
Module_HelpVersion SETS "3.38 (22 Jun 2011)"
Module_FullVersion SETS "3.39"
Module_HelpVersion SETS "3.39 (18 Jul 2011)"
END
/* (3.38)
/* (3.39)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.38
#define Module_MajorVersion_CMHG 3.39
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Jun 2011
#define Module_Date_CMHG 18 Jul 2011
#define Module_MajorVersion "3.38"
#define Module_Version 338
#define Module_MajorVersion "3.39"
#define Module_Version 339
#define Module_MinorVersion ""
#define Module_Date "22 Jun 2011"
#define Module_Date "18 Jul 2011"
#define Module_ApplicationDate "22-Jun-11"
#define Module_ApplicationDate "18-Jul-11"
#define Module_ComponentName "ADFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
#define Module_FullVersion "3.38"
#define Module_HelpVersion "3.38 (22 Jun 2011)"
#define Module_LibraryVersionInfo "3:38"
#define Module_FullVersion "3.39"
#define Module_HelpVersion "3.39 (18 Jul 2011)"
#define Module_LibraryVersionInfo "3:39"
......@@ -201,24 +201,18 @@ FlpInit ROUT
|
[ HAL
[ {FALSE} ; IOMD HAL floppy support doesn't work yet. Disable it.
Push "r0-r3,r8,r9"
MOV r0, #0
MOV r1, #&600
MOV r8, #0
MOV r9, #EntryNo_HAL_ControllerAddress
SWI XOS_Hardware
MOVVS r0, #MachHasNoFDC
ASSERT MachHasNoFDC = -1 ; 0 or -1 can be returned if controller unknown
MOVS lr, r0
MOVEQ lr, #MachHasNoFDC
CMPNE lr, #MachHasNoFDC
STREQ lr, MachineID
ADDNE r1, r0, #&3F0*4
STRNE r1, FlpBase
ADDNE r1, r0, #&1A000
STRNE r1, FlpDACK_TC
Pull "r0-r3,r8,r9"
MOV r0, #9
MOV r1, #34<<8
SWI XOS_Memory
MOVVS r1, #0
CMP r1, #0
MOVEQ r0, #MachHasNoFDC
STREQ r0, MachineID
BEQ %BT02
ADD r0, r1, #&3F0*4
STR r0, FlpBase
ADD r0, r1, #&1A000
STR r0, FlpDACK_TC
|
MOV R0, #MachHasNoFDC
STR R0, MachineID
......
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