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

Fix building with latest kernel

Detail:
  s/Top, s/Video - Renamed HAL_Video entries to match naming convention used by latest kernel
Admin:
  Tested on Raspberry Pi with high processor vectors


Version 0.26. Tagged as 'BCM2835-0_26'
parent 47a0e5d7
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.25"
Module_Version SETA 25
Module_MajorVersion SETS "0.26"
Module_Version SETA 26
Module_MinorVersion SETS ""
Module_Date SETS "18 Sep 2012"
Module_ApplicationDate SETS "18-Sep-12"
Module_ComponentName SETS "BCM2835"
Module_ComponentPath SETS "mixed/RiscOS/Sources/HAL/BCM2835"
Module_FullVersion SETS "0.25"
Module_HelpVersion SETS "0.25 (18 Sep 2012)"
Module_FullVersion SETS "0.26"
Module_HelpVersion SETS "0.26 (18 Sep 2012)"
END
/* (0.25)
/* (0.26)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.25
#define Module_MajorVersion_CMHG 0.26
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Sep 2012
#define Module_MajorVersion "0.25"
#define Module_Version 25
#define Module_MajorVersion "0.26"
#define Module_Version 26
#define Module_MinorVersion ""
#define Module_Date "18 Sep 2012"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.25"
#define Module_HelpVersion "0.25 (18 Sep 2012)"
#define Module_LibraryVersionInfo "0:25"
#define Module_FullVersion "0.26"
#define Module_HelpVersion "0.26 (18 Sep 2012)"
#define Module_LibraryVersionInfo "0:26"
......@@ -88,22 +88,22 @@
IMPORT HAL_NVMemoryWrite
IMPORT HAL_VideoFlybackDevice
IMPORT HAL_Video_SetMode
IMPORT HAL_Video_WritePaletteEntry
IMPORT HAL_Video_WritePaletteEntries
IMPORT HAL_Video_ReadPaletteEntry
IMPORT HAL_Video_SetInterlace
IMPORT HAL_Video_SetBlank
IMPORT HAL_Video_SetPowerSave
IMPORT HAL_Video_UpdatePointer
IMPORT HAL_Video_SetDAG
IMPORT HAL_Video_VetMode
IMPORT HAL_Video_PixelFormats
IMPORT HAL_Video_Features
IMPORT HAL_Video_BufferAlignment
IMPORT HAL_Video_OutputFormat
IMPORT HAL_Video_Render
IMPORT HAL_Video_IICOp
IMPORT HAL_VideoSetMode
IMPORT HAL_VideoWritePaletteEntry
IMPORT HAL_VideoWritePaletteEntries
IMPORT HAL_VideoReadPaletteEntry
IMPORT HAL_VideoSetInterlace
IMPORT HAL_VideoSetBlank
IMPORT HAL_VideoSetPowerSave
IMPORT HAL_VideoUpdatePointer
IMPORT HAL_VideoSetDAG
IMPORT HAL_VideoVetMode
IMPORT HAL_VideoPixelFormats
IMPORT HAL_VideoFeatures
IMPORT HAL_VideoBufferAlignment
IMPORT HAL_VideoOutputFormat
IMPORT HAL_VideoRender
IMPORT HAL_VideoIICOp
IMPORT HAL_UARTPorts
IMPORT HAL_UARTStartUp
......@@ -140,8 +140,8 @@
IMPORT HAL_USBPortStatus
IMPORT HAL_USBPortIRQ
IMPORT HAL_Video_FramestoreAddress
IMPORT HAL_Video_StartupMode
IMPORT HAL_VideoFramestoreAddress
IMPORT HAL_VideoStartupMode
IMPORT SDIO_InitDevices
......@@ -439,20 +439,20 @@ HAL_EntryTable DATA
HALEntry HAL_IICMonitorTransfer
HALEntry HAL_VideoFlybackDevice
HALEntry HAL_Video_SetMode
HALEntry HAL_Video_WritePaletteEntry
HALEntry HAL_Video_WritePaletteEntries
HALEntry HAL_Video_ReadPaletteEntry
HALEntry HAL_Video_SetInterlace
HALEntry HAL_Video_SetBlank
HALEntry HAL_Video_SetPowerSave
HALEntry HAL_Video_UpdatePointer
HALEntry HAL_Video_SetDAG
HALEntry HAL_Video_VetMode
HALEntry HAL_Video_PixelFormats
HALEntry HAL_Video_Features
HALEntry HAL_Video_BufferAlignment
HALEntry HAL_Video_OutputFormat
HALEntry HAL_VideoSetMode
HALEntry HAL_VideoWritePaletteEntry
HALEntry HAL_VideoWritePaletteEntries
HALEntry HAL_VideoReadPaletteEntry
HALEntry HAL_VideoSetInterlace
HALEntry HAL_VideoSetBlank
HALEntry HAL_VideoSetPowerSave
HALEntry HAL_VideoUpdatePointer
HALEntry HAL_VideoSetDAG
HALEntry HAL_VideoVetMode
HALEntry HAL_VideoPixelFormats
HALEntry HAL_VideoFeatures
HALEntry HAL_VideoBufferAlignment
HALEntry HAL_VideoOutputFormat
NullEntry ; HALEntry HAL_MatrixColumns
NullEntry ; HALEntry HAL_MatrixScan
......@@ -523,24 +523,24 @@ HAL_EntryTable DATA
NullEntry ;HALEntry HAL_MonitorLeadID
HALEntry HAL_Video_Render
HALEntry HAL_VideoRender
HALEntry HAL_USBPortPower
HALEntry HAL_USBPortStatus
HALEntry HAL_USBPortIRQ
HALEntry HAL_Video_IICOp
HALEntry HAL_VideoIICOp
HALEntry HAL_TimerIRQClear
NullEntry ; HAL_TimerIRQStatus
HALEntry HAL_ExtMachineID
HALEntry HAL_Video_FramestoreAddress
HALEntry HAL_VideoFramestoreAddress
NullEntry ; HALEntry HAL_UARTDefault
HALEntry HAL_Video_StartupMode
HALEntry HAL_VideoStartupMode
HAL_Entries * (.-HAL_EntryTable)/4
......
......@@ -45,24 +45,24 @@
IMPORT HAL_DebugTXStrInline
]
EXPORT HAL_VideoFlybackDevice
EXPORT HAL_Video_SetMode
EXPORT HAL_Video_WritePaletteEntry
EXPORT HAL_Video_WritePaletteEntries
EXPORT HAL_Video_ReadPaletteEntry
EXPORT HAL_Video_SetInterlace
EXPORT HAL_Video_SetBlank
EXPORT HAL_Video_SetPowerSave
EXPORT HAL_Video_UpdatePointer
EXPORT HAL_Video_SetDAG
EXPORT HAL_Video_VetMode
EXPORT HAL_Video_PixelFormats
EXPORT HAL_Video_Features
EXPORT HAL_Video_BufferAlignment
EXPORT HAL_Video_OutputFormat
EXPORT HAL_Video_Render
EXPORT HAL_Video_IICOp
EXPORT HAL_Video_FramestoreAddress
EXPORT HAL_Video_StartupMode
EXPORT HAL_VideoSetMode
EXPORT HAL_VideoWritePaletteEntry
EXPORT HAL_VideoWritePaletteEntries
EXPORT HAL_VideoReadPaletteEntry
EXPORT HAL_VideoSetInterlace
EXPORT HAL_VideoSetBlank
EXPORT HAL_VideoSetPowerSave
EXPORT HAL_VideoUpdatePointer
EXPORT HAL_VideoSetDAG
EXPORT HAL_VideoVetMode
EXPORT HAL_VideoPixelFormats
EXPORT HAL_VideoFeatures
EXPORT HAL_VideoBufferAlignment
EXPORT HAL_VideoOutputFormat
EXPORT HAL_VideoRender
EXPORT HAL_VideoIICOp
EXPORT HAL_VideoFramestoreAddress
EXPORT HAL_VideoStartupMode
EXPORT Video_InitDevices
IMPORT memcpy
......@@ -85,43 +85,43 @@ myvalue SETS "$value"
]
MEND
HAL_Video_FramestoreAddress
HAL_VideoFramestoreAddress
MOV r1, #0
HAL_Video_OutputFormat
HAL_Video_VetMode
HAL_Video_IICOp
HAL_VideoOutputFormat
HAL_VideoVetMode
HAL_VideoIICOp
MOV r0, #0
HAL_Video_SetMode
HAL_Video_WritePaletteEntry
HAL_Video_WritePaletteEntries
HAL_Video_SetInterlace
HAL_Video_SetBlank
HAL_Video_SetPowerSave
HAL_Video_UpdatePointer
HAL_Video_SetDAG
HAL_Video_ReadPaletteEntry
HAL_Video_Render
HAL_VideoSetMode
HAL_VideoWritePaletteEntry
HAL_VideoWritePaletteEntries
HAL_VideoSetInterlace
HAL_VideoSetBlank
HAL_VideoSetPowerSave
HAL_VideoUpdatePointer
HAL_VideoSetDAG
HAL_VideoReadPaletteEntry
HAL_VideoRender
MOV pc, lr
HAL_VideoFlybackDevice
MOV a1, #-1
MOV pc, lr
HAL_Video_PixelFormats
HAL_VideoPixelFormats
MOV a1, #2_111111
MOV pc, lr
HAL_Video_Features
HAL_VideoFeatures
MOV a1, #2_10010 ; hw pointer, no VSyncs
MOV pc, lr
HAL_Video_BufferAlignment
HAL_VideoBufferAlignment
MOV a1, #4
MOV pc, lr
; returns a1 -> mode specifier for startup mode or unchanged if none
; HACK - should be in BCMVideo!
HAL_Video_StartupMode
HAL_VideoStartupMode
adr a1, DefaultModeList
MOV pc,lr
......
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