Commit e3299240 authored by John Ballance's avatar John Ballance
Browse files

Detail: removed a flaw that crept in the last commit which prevented correct screen display.

	Now expects a start.elf released 24/7/2012 or later for correct
	display initialisation
Admin:


Version 0.16. Tagged as 'BCM2835-0_16'
parent edb5f642
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.15"
Module_Version SETA 15
Module_MajorVersion SETS "0.16"
Module_Version SETA 16
Module_MinorVersion SETS ""
Module_Date SETS "22 Jul 2012"
Module_ApplicationDate SETS "22-Jul-12"
Module_Date SETS "24 Jul 2012"
Module_ApplicationDate SETS "24-Jul-12"
Module_ComponentName SETS "BCM2835"
Module_ComponentPath SETS "mixed/RiscOS/Sources/HAL/BCM2835"
Module_FullVersion SETS "0.15"
Module_HelpVersion SETS "0.15 (22 Jul 2012)"
Module_FullVersion SETS "0.16"
Module_HelpVersion SETS "0.16 (24 Jul 2012)"
END
/* (0.15)
/* (0.16)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.15
#define Module_MajorVersion_CMHG 0.16
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Jul 2012
#define Module_Date_CMHG 24 Jul 2012
#define Module_MajorVersion "0.15"
#define Module_Version 15
#define Module_MajorVersion "0.16"
#define Module_Version 16
#define Module_MinorVersion ""
#define Module_Date "22 Jul 2012"
#define Module_Date "24 Jul 2012"
#define Module_ApplicationDate "22-Jul-12"
#define Module_ApplicationDate "24-Jul-12"
#define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.15"
#define Module_HelpVersion "0.15 (22 Jul 2012)"
#define Module_LibraryVersionInfo "0:15"
#define Module_FullVersion "0.16"
#define Module_HelpVersion "0.16 (24 Jul 2012)"
#define Module_LibraryVersionInfo "0:16"
......@@ -321,20 +321,21 @@ start MSR CPSR_c,#F32_bit+I32_bit+SVC32_mode
; query the platform and set up a frame buffer.
BL HAL_QueryPlatform
ADR R0, mbram
ORR R2, R0, #GPU_L2CnonAl + MB_Chan_FB; L2 cache on
MOV R0, R2
MOV r1, #0
BL HAL_SendHostMessage
ldr r3, mbscrsz
str r3, FB_Size
mov r0,r3
bl HAL_DebugHexTX4
ldr r3, mbbase
bic r3, r3, #GPU_CacheMask
str r3, FB_Base
; ADR R0, mbram
; ORR R2, R0, #GPU_L2CnonAl + MB_Chan_FB; L2 cache on
; MOV R0, R2
; MOV r1, #0
;; BL HAL_SendHostMessage
;
; ldr r3, mbscrsz
; str r3, FB_Size
; mov r0,r3
; bl HAL_DebugHexTX4
; ldr r3, mbbase
; bic r3, r3, #GPU_CacheMask
; str r3, FB_Base
LDR r3, FB_Base
mov r0,r3
bl HAL_DebugHexTX4
......@@ -700,7 +701,7 @@ HAL_Init
LDR a1,mbxres
LDR a2,mbbpp ;=1920*8*4
STR R2,BitsPerPixel
STR a2,BitsPerPixel
MUL a1, a2, a1
STR a1,BytesPerRow
STR a2,BytesPerChar
......
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