GitLab has been upgraded to 13.7.4 If you encounter any issues mail code@riscosopen.org

Commit f8dae056 authored by Ben Avison's avatar Ben Avison

Export clock IDs in Hdr:BCMSupport

Detail:
These will be used by future versions of the BCM2835 HAL

Version 0.10. Tagged as 'BCMSupport-0_10'
parent d71c49f8
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.09"
Module_Version SETA 9
Module_MajorVersion SETS "0.10"
Module_Version SETA 10
Module_MinorVersion SETS ""
Module_Date SETS "19 Jan 2019"
Module_ApplicationDate SETS "19-Jan-19"
Module_Date SETS "29 Jun 2019"
Module_ApplicationDate SETS "29-Jun-19"
Module_ComponentName SETS "BCMSupport"
Module_ComponentPath SETS "mixed/RiscOS/Sources/HWSupport/BCMSupport"
Module_FullVersion SETS "0.09"
Module_HelpVersion SETS "0.09 (19 Jan 2019)"
Module_FullVersion SETS "0.10"
Module_HelpVersion SETS "0.10 (29 Jun 2019)"
END
/* (0.09)
/* (0.10)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.09
#define Module_MajorVersion_CMHG 0.10
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 19 Jan 2019
#define Module_Date_CMHG 29 Jun 2019
#define Module_MajorVersion "0.09"
#define Module_Version 9
#define Module_MajorVersion "0.10"
#define Module_Version 10
#define Module_MinorVersion ""
#define Module_Date "19 Jan 2019"
#define Module_Date "29 Jun 2019"
#define Module_ApplicationDate "19-Jan-19"
#define Module_ApplicationDate "29-Jun-19"
#define Module_ComponentName "BCMSupport"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/BCMSupport"
#define Module_FullVersion "0.09"
#define Module_HelpVersion "0.09 (19 Jan 2019)"
#define Module_LibraryVersionInfo "0:9"
#define Module_FullVersion "0.10"
#define Module_HelpVersion "0.10 (29 Jun 2019)"
#define Module_LibraryVersionInfo "0:10"
......@@ -59,7 +59,6 @@ static bool init;
static uint32_t speeds[2];
#define CLOCK_CPU 3
#define CLOCK_SCALE 1000000
#define TEMP_CPU 0 /* ??? */
......@@ -93,11 +92,11 @@ void cpuclock_init(void)
.min.tag.tag = ARM2VC_Tag_GetMinClockRate,
.min.tag.bufsize = 8,
.min.tag.valsize = 4,
.min.data[0] = CLOCK_CPU,
.min.data[0] = BaseClockID_ARM,
.max.tag.tag = ARM2VC_Tag_GetMaxClockRate,
.max.tag.bufsize = 8,
.max.tag.valsize = 4,
.max.data[0] = CLOCK_CPU,
.max.data[0] = BaseClockID_ARM,
.end = ARM2VC_Tag_End,
};
if (_swix(BCMSupport_SendTempPropertyBuffer,_INR(0,2),&block,&block,0))
......@@ -198,7 +197,7 @@ uint32_t cpuclock_Get(struct cpuclkdevice *cpuclk)
.tag.tag = ARM2VC_Tag_GetClockRate,
.tag.bufsize = 8,
.tag.valsize = 4,
.data[0] = CLOCK_CPU,
.data[0] = BaseClockID_ARM,
.end = ARM2VC_Tag_End,
};
/* Enable IRQs for slow mailbox op */
......@@ -232,7 +231,7 @@ int cpuclock_Set(struct cpuclkdevice *cpuclk, uint32_t idx)
.tag.tag = ARM2VC_Tag_SetClockRate,
.tag.bufsize = 12,
.tag.valsize = 12,
.data[0] = CLOCK_CPU,
.data[0] = BaseClockID_ARM,
.data[1] = speeds[idx],
.data[2] = 0,
.end = ARM2VC_Tag_End,
......
......@@ -146,6 +146,17 @@ ARM2VC_Tag_FBGetTouchBuf * &0004000f ; get address of FT5406 register ba
ARM2VC_Tag_FBSetTouchBuf * &0004801f ; set address of FT5406 register bank softcopy
ARM2VC_Tag_GetVirtGPIOBuf * &00040010 ; get address of virtual GPIO buffer
ARM2VC_Tag_SetVirtGPIOBuf * &00048020 ; set address of virtual GPIO buffer
; Clock IDs for get/set clock state, get/set clock rate, get min/max clock rate, get clocks
BaseClockID_EMMC * 1
BaseClockID_UART * 2
BaseClockID_ARM * 3
BaseClockID_CORE * 4
BaseClockID_V3D * 5
BaseClockID_H264 * 6
BaseClockID_ISP * 7
BaseClockID_SDRAM * 8
BaseClockID_PIXEL * 9
BaseClockID_PWM * 10
; Errors
......
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