diff --git a/Makefile b/Makefile
index a3c1f097a568492566fcf786c757c8bb6ab12dce..bbe1e25eea42113503f461c82482379007d6bfb0 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ EXPORTS = ${EXP_HDR}.EnvNumbers \
${EXP_HDR}.HALEntries \
${EXP_HDR}.HALDevice \
${EXP_HDR}.RTCDevice \
+ ${EXP_HDR}.VideoDevice \
${EXP_HDR}.OSEntries \
${C_EXP_HDR}.RISCOS \
${C_EXP_HDR}.HALEntries \
diff --git a/VersionASM b/VersionASM
index ec1ede53e096e69fb75af751b1a07481de305a93..e7ed9fae149676af6b483bdcee755f913dd6f434 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
-Module_MinorVersion SETS "4.79.2.98.2.15"
-Module_Date SETS "06 Nov 2009"
-Module_ApplicationDate SETS "06-Nov-09"
+Module_MinorVersion SETS "4.79.2.98.2.16"
+Module_Date SETS "28 Nov 2009"
+Module_ApplicationDate SETS "28-Nov-09"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.98.2.15)"
-Module_HelpVersion SETS "5.35 (06 Nov 2009) 4.79.2.98.2.15"
+Module_FullVersion SETS "5.35 (4.79.2.98.2.16)"
+Module_HelpVersion SETS "5.35 (28 Nov 2009) 4.79.2.98.2.16"
END
diff --git a/VersionNum b/VersionNum
index 4a578b1cc858b44b363963b14dfa3b9d365c31cd..87efc5c0b829b20e88199c8414f28362c93e7f2d 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.98.2.15
-#define Module_Date_CMHG 06 Nov 2009
+#define Module_MinorVersion_CMHG 4.79.2.98.2.16
+#define Module_Date_CMHG 28 Nov 2009
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.98.2.15"
-#define Module_Date "06 Nov 2009"
+#define Module_MinorVersion "4.79.2.98.2.16"
+#define Module_Date "28 Nov 2009"
-#define Module_ApplicationDate "06-Nov-09"
+#define Module_ApplicationDate "28-Nov-09"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.98.2.15)"
-#define Module_HelpVersion "5.35 (06 Nov 2009) 4.79.2.98.2.15"
+#define Module_FullVersion "5.35 (4.79.2.98.2.16)"
+#define Module_HelpVersion "5.35 (28 Nov 2009) 4.79.2.98.2.16"
#define Module_LibraryVersionInfo "5:35"
diff --git a/hdr/HALDevice b/hdr/HALDevice
index 7e49b84baeb560b5c6041b6ba854d17ccb3159ad..dd65bcc219075b2fcb95daeddbb476e0f543fb68 100644
--- a/hdr/HALDevice
+++ b/hdr/HALDevice
@@ -98,9 +98,11 @@ HALDeviceID_Mixer_STAC9750 # 1
^ 0
HALDeviceID_DMAC_M1535 # 1
HALDeviceID_DMAC_M5229 # 1
+HALDeviceID_DMAC_OMAP3 # 1
^ 0
HALDeviceID_DMAB_M1535 # 1
+HALDeviceID_DMAB_OMAP3 # 1
^ 0
HALDeviceID_DMAL_M5229 # 1
@@ -108,6 +110,9 @@ HALDeviceID_DMAL_M5229 # 1
^ 0
HALDeviceID_RTC_TPS65950 # 1
+ ^ 0
+HALDeviceID_VDU_OMAP3 # 1
+
]
OPT OldOpt
diff --git a/hdr/VideoDevice b/hdr/VideoDevice
new file mode 100644
index 0000000000000000000000000000000000000000..e0b0197897d6109c05e2d51961a488ded6430b98
--- /dev/null
+++ b/hdr/VideoDevice
@@ -0,0 +1,39 @@
+; Copyright 2009 Castle Technology Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+; Public interface of Video HAL devices
+
+ GET hdr:HALDevice
+
+OldOpt SETA {OPT}
+ OPT OptNoList+OptNoP1List
+
+ [ :LNOT: :DEF: Included_Hdr_VideoDevice
+ GBLL Included_Hdr_VideoDevice
+Included_Hdr_VideoDevice SETL {TRUE}
+
+; Device for VDU video devices
+
+ ^ 0
+ # HALDeviceSize
+HALDevice_VDUAddress2 # 4
+HALDevice_VDUDevice2 # 4
+HALDevice_VDUDeviceSpecificField # 4
+HALDevice_VDU_Size * :INDEX: @
+
+ ]
+
+ OPT OldOpt
+ END