Commit 29e1cc10 authored by Ben Avison's avatar Ben Avison
Browse files

Correct merging errors

  A couple of lines of dead code and an unaligned word load that should have
  been a byte load crept into the last commit. This worked fine when
  softloaded with exceptions off but not so well in a ROM...
  Now tested in a ROM build.

Retagged as 'FileCore-3_65'
parent d216d585
......@@ -129,7 +129,7 @@ WhatDisc ROUT
; boot block - this was designed to support ADFS floppies, but interacts
; badly in particular with SDFS for removable drives with no disc detect
; (e.g. Raspberry Pi B+). If this happens, loop round and try again.
LDR r0, [r3, #DiscsDrv]
LDRB r0, [r3, #DiscsDrv]
TEQ r0, #8
Pull "r0,r4,r5,r6,pc"
......@@ -137,9 +137,6 @@ WhatDisc ROUT
90 ADD sp, sp, #4
Pull "r4,r5,r6,pc"
STRVS r0, [sp]
Pull "r0,r4,r5,r6,pc"
; ================
; CheckDriveNumber
; ================
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