Commit d810cab3 authored by Ben Avison's avatar Ben Avison
Browse files

Resync with allocations database

Detail:
  * Retire hdr:FreeWay in favour of hdr:FreewayReg
  * SWI chunk and error base for RTC module
  * New shared single error number for drivers to report hardware not found
  * Single service calls for boot sequence to inform (primarily ROM) modules
    that system variables have become valid


Version 2.36. Tagged as 'HdrSrc-2_36'
parent 25c2cd72
...@@ -120,7 +120,6 @@ EXPORTS = \ ...@@ -120,7 +120,6 @@ EXPORTS = \
${HDIR}.Global.h.DrawObj \ ${HDIR}.Global.h.DrawObj \
${HDIR}.Global.h.EnvNumbers \ ${HDIR}.Global.h.EnvNumbers \
${HDIR}.Global.h.FileTypes \ ${HDIR}.Global.h.FileTypes \
${HDIR}.Global.h.FreeWay \
${HDIR}.Global.h.FreewayReg \ ${HDIR}.Global.h.FreewayReg \
${HDIR}.Global.h.FSNumbers \ ${HDIR}.Global.h.FSNumbers \
${HDIR}.Global.h.GraphicsV \ ${HDIR}.Global.h.GraphicsV \
...@@ -245,7 +244,6 @@ ${HDIR}.Global.h.DevNos: hdr.DevNos; ${HDR2H} hdr.DevNos $@ ...@@ -245,7 +244,6 @@ ${HDIR}.Global.h.DevNos: hdr.DevNos; ${HDR2H} hdr.DevNos $@
${HDIR}.Global.h.DrawObj: hdr.DrawObj; ${HDR2H} hdr.DrawObj $@ ${HDIR}.Global.h.DrawObj: hdr.DrawObj; ${HDR2H} hdr.DrawObj $@
${HDIR}.Global.h.EnvNumbers: hdr.EnvNumbers; ${HDR2H} hdr.EnvNumbers $@ ${HDIR}.Global.h.EnvNumbers: hdr.EnvNumbers; ${HDR2H} hdr.EnvNumbers $@
${HDIR}.Global.h.FileTypes: hdr.FileTypes; ${HDR2H} hdr.FileTypes $@ ${HDIR}.Global.h.FileTypes: hdr.FileTypes; ${HDR2H} hdr.FileTypes $@
${HDIR}.Global.h.FreeWay: hdr.FreeWay; ${HDR2H} hdr.FreeWay $@
${HDIR}.Global.h.FreewayReg: hdr.FreewayReg; ${HDR2H} hdr.FreewayReg $@ ${HDIR}.Global.h.FreewayReg: hdr.FreewayReg; ${HDR2H} hdr.FreewayReg $@
${HDIR}.Global.h.FSNumbers: hdr.FSNumbers; ${HDR2H} hdr.FSNumbers $@ ${HDIR}.Global.h.FSNumbers: hdr.FSNumbers; ${HDR2H} hdr.FSNumbers $@
${HDIR}.Global.h.GraphicsV: hdr.GraphicsV; ${HDR2H} hdr.GraphicsV $@ ${HDIR}.Global.h.GraphicsV: hdr.GraphicsV; ${HDR2H} hdr.GraphicsV $@
......
/* (2.35) /* (2.36)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 2.35 #define Module_MajorVersion_CMHG 2.36
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Oct 2013 #define Module_Date_CMHG 18 Nov 2013
#define Module_MajorVersion "2.35" #define Module_MajorVersion "2.36"
#define Module_Version 235 #define Module_Version 236
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "13 Oct 2013" #define Module_Date "18 Nov 2013"
#define Module_ApplicationDate "13-Oct-13" #define Module_ApplicationDate "18-Nov-13"
#define Module_ComponentName "HdrSrc" #define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc" #define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "2.35" #define Module_FullVersion "2.36"
#define Module_HelpVersion "2.35 (13 Oct 2013)" #define Module_HelpVersion "2.36 (18 Nov 2013)"
#define Module_LibraryVersionInfo "2:35" #define Module_LibraryVersionInfo "2:36"
; Copyright 2008 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.
;
; This header file is autogenerated from the files maintained by the
; RISC OS allocations manager and should not be edited by anyone else.
; FreeWay type numbers.
Freeway_Discs * 1
Freeway_Printers * 2
Freeway_Hosts * 5
Freeway_Users * 32
...@@ -886,6 +886,7 @@ ErrorBase_ARM # &20 ; See ARM sources for allocation ...@@ -886,6 +886,7 @@ ErrorBase_ARM # &20 ; See ARM sources for allocation
^ &C60 ; Error block for Hardware Layer interfaces ^ &C60 ; Error block for Hardware Layer interfaces
AddError HardwareBadReason, "HWBadReason:Bad OS_Hardware reason code" AddError HardwareBadReason, "HWBadReason:Bad OS_Hardware reason code"
AddError HardwareBadEntry, "HWBadEntry:Hardware call not available" AddError HardwareBadEntry, "HWBadEntry:Hardware call not available"
AddError HardwareDepends, "HWDep:Hardware dependency not met"
ASSERT @ <= &C80 ASSERT @ <= &C80
...@@ -1523,5 +1524,6 @@ ErrorBase_VCHIQ # &100 ; &0081F500 Jeffrey Lee ...@@ -1523,5 +1524,6 @@ ErrorBase_VCHIQ # &100 ; &0081F500 Jeffrey Lee
^ &0081F800 ^ &0081F800
ErrorBase_DeskRecord # &100 ; &0081F800 Steve Revill ErrorBase_DeskRecord # &100 ; &0081F800 Steve Revill
ErrorBase_USBAudio # &100 ; &0081F900 Dave Higton ErrorBase_USBAudio # &100 ; &0081F900 Dave Higton
ErrorBase_RTC # &100 ; &0081FA00 Rob Sprowson
OPT OldOpt OPT OldOpt
END END
...@@ -1728,6 +1728,11 @@ USBAudioSWI EQU &00001652 ...@@ -1728,6 +1728,11 @@ USBAudioSWI EQU &00001652
USBAudioSWI_Base EQU &00059480 USBAudioSWI_Base EQU &00059480
USBAudioSWI_Name SETS "USBAudio" USBAudioSWI_Name SETS "USBAudio"
GBLS RTCSWI_Name
RTCSWI EQU &00001653
RTCSWI_Base EQU &000594C0
RTCSWI_Name SETS "RTC"
; Application SWI Chunks ; Application SWI Chunks
......
...@@ -280,6 +280,14 @@ AcornProtocols # 64 ; &80540, ART rce ...@@ -280,6 +280,14 @@ AcornProtocols # 64 ; &80540, ART rce
SDIODriverService # 64 ; &81040, ROOL / Ben Avison SDIODriverService # 64 ; &81040, ROOL / Ben Avison
TerritoryService # 64 ; &81080, Rob Sprowson TerritoryService # 64 ; &81080, Rob Sprowson
; Boot service calls listed here individually to avoid introducing a dependency
; between multiple ROM modules and the Boot component
^ &810C0
Service_BootBootVarsSet # 1 ; &810C0
Service_BootResourcesVarsSet # 1 ; &810C1
Service_BootChoicesVarsSet # 1 ; &810C2
^ &82880 ; Aquarius Window services ^ &82880 ; Aquarius Window services
Service_WindowModuleUnused # 1 ; &82880 Service_WindowModuleUnused # 1 ; &82880
Service_WindowModuleStarting # 1 ; &82881 Service_WindowModuleStarting # 1 ; &82881
......
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