Browse Source
Merge pull request #257 from b1ackmai1er/dev
Revert conflict concept. Fix incorrect comparison
pull/259/head
Wayne Warthen
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
Source/HBIOS/md.asm
|
|
|
@ -376,7 +376,7 @@ MD_SECM: |
|
|
|
ADD HL,DE ; WANT TO COPY |
|
|
|
LD DE,(MD_DSKBUF) |
|
|
|
; |
|
|
|
#IF (DMAENABLE & (DMAMODE!DMAMODE_NONE)) |
|
|
|
#IF (DMAENABLE & (DMAMODE!=DMAMODE_NONE)) |
|
|
|
#IF (DMA_FBACK) |
|
|
|
LD A,(DMA_FAIL_FLAG) |
|
|
|
OR A |
|
|
|
@ -386,7 +386,7 @@ MD_SECM: |
|
|
|
JP DMALDIR ; 4K SECTOR TO THE DISK BUFFER |
|
|
|
#ENDIF |
|
|
|
MD_NODMA: |
|
|
|
#IF (!(DMAENABLE & (DMAMODE!DMAMODE_NONE))) |
|
|
|
#IF (!(DMAENABLE & (DMAMODE!=DMAMODE_NONE))) |
|
|
|
LD BC,512 ; COPY ONE 512B SECTOR FROM THE |
|
|
|
LDIR ; 4K SECTOR TO THE DISK BUFFER |
|
|
|
XOR A |
|
|
|
@ -510,7 +510,7 @@ MD_SECM1: ; DESIRED SECTOR IS IN BUFFER |
|
|
|
EX DE,HL |
|
|
|
; |
|
|
|
LD HL,(MD_DSKBUF) |
|
|
|
#IF (DMAENABLE & (DMAMODE!DMAMODE_NONE)) |
|
|
|
#IF (DMAENABLE & (DMAMODE!=DMAMODE_NONE)) |
|
|
|
#IF (DMA_FBACK) |
|
|
|
LD A,(DMA_FAIL_FLAG) |
|
|
|
OR A |
|
|
|
@ -522,7 +522,7 @@ MD_SECM1: ; DESIRED SECTOR IS IN BUFFER |
|
|
|
JR MD_NODMAERR |
|
|
|
#ENDIF |
|
|
|
MD_NODMA1: |
|
|
|
#IF (!(DMAENABLE & (DMAMODE!DMAMODE_NONE))) |
|
|
|
#IF (!(DMAENABLE & (DMAMODE!=DMAMODE_NONE))) |
|
|
|
LD BC,512 ; COPY ONE 512B SECTOR FROM THE |
|
|
|
LDIR |
|
|
|
#ELSE |
|
|
|
|
