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

Fix to argument mixup

When reprogramming a buffer due to early overrun, R2 should be the length not the physical address.

Version 0.22. Tagged as 'DMA-0_22'
parent 3e31339e
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.21"
Module_Version SETA 21
Module_MajorVersion SETS "0.22"
Module_Version SETA 22
Module_MinorVersion SETS ""
Module_Date SETS "18 Oct 2014"
Module_ApplicationDate SETS "18-Oct-14"
Module_Date SETS "02 Jun 2015"
Module_ApplicationDate SETS "02-Jun-15"
Module_ComponentName SETS "DMA"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/DMA"
Module_FullVersion SETS "0.21"
Module_HelpVersion SETS "0.21 (18 Oct 2014)"
Module_FullVersion SETS "0.22"
Module_HelpVersion SETS "0.22 (02 Jun 2015)"
END
/* (0.21)
/* (0.22)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.21
#define Module_MajorVersion_CMHG 0.22
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Oct 2014
#define Module_Date_CMHG 02 Jun 2015
#define Module_MajorVersion "0.21"
#define Module_Version 21
#define Module_MajorVersion "0.22"
#define Module_Version 22
#define Module_MinorVersion ""
#define Module_Date "18 Oct 2014"
#define Module_Date "02 Jun 2015"
#define Module_ApplicationDate "18-Oct-14"
#define Module_ApplicationDate "02-Jun-15"
#define Module_ComponentName "DMA"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/DMA"
#define Module_FullVersion "0.21"
#define Module_HelpVersion "0.21 (18 Oct 2014)"
#define Module_LibraryVersionInfo "0:21"
#define Module_FullVersion "0.22"
#define Module_HelpVersion "0.22 (02 Jun 2015)"
#define Module_LibraryVersionInfo "0:22"
......@@ -2871,6 +2871,8 @@ finished
; r10 = ptr to DMA request block
; [ :LNOT: HAL
; r11 = IOMD base address
; |
; r11 = ptr to HAL device
; ]
;
Debug int," finished"
......@@ -3240,7 +3242,7 @@ reprogram
;
LDR r3, [r0, #ptab_Physical] ; Get physical address from page table.
ADD r1, r3, r1 ; r1 = start address
ADD r2, r1, r2 ; r2 = end address
; r2 = length already
MOV r3, #0 ; Default flag contents.
TST r8, #dmarf_Infinite ; If finite transfer and
......
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