hdr/NewErrors

@@ -214,7 +214,7 @@ ErrorBase_TerritoryManager # 16
         AddError  BadPixelDepth,        "BadPixelDepth:Bad pixel depth"
         AddError  BadMSFlags,           "BadMSFlags:Illegal flags in mode selector"
         AddError  BadPlatReas,          "BadPlatReas:Unknown OS_PlatformFeatures reason code"
-
+        AddError  UnConv,               "UnConv:Unsupported conversion"
 
 ; Font errors
 
@@ -590,14 +590,18 @@ ErrorBase_Econet  * &300
         AddError2 Sprite_BadTransformation, "SpriteExtend can only do linear transformations"
         AddError2 Sprite_BadDepth,      "Unable to plot sprites of this format"
         AddError2 Sprite_BadSwitchDepth, "Cannot switch output to sprites of this format"
-        AddError2 Sprite_NoMaskOrPaletteAllowedInThisDepth, "SNoMask:Mask or Palette operations not supported in this display depth"
+        AddError2 Sprite_NoMaskOrPaletteAllowedInThisDepth, "SNoMask:Mask or palette operations not supported in this display depth"
         AddError2 Sprite_BadDPI,        "BadDPI:Illegal XDPI or YDPI in sprite"
-        AddError2 Sprite_BadJPEG,       "Image not a valid JPEG"
+        AddError2 Sprite_BadJPEG,       "Incomplete or corrupt JPEG data"
         AddError2 Sprite_BadJPEGPlot,   "Transformed JPEG plotting is not supported by this version of the SpriteExtend module"
         AddError2 Sprite_JPEGNoRoom,   "Not enough memory available to plot JPEG"
-        AddError2 Sprite_JPEGFatal,    "JPEG plot failed due to Internal Error"
-        AddError2 Sprite_BadData,     "Unrecognised Sprite Data"
-        AddError2 Sprite_NoGrScl,     "Sprite Operation 'PutSpriteGreyScaled' is not supported by this version of RISC OS"
+        AddError2 Sprite_JPEGFatal,     "JPEG plot failed due to fatal inconsistency"
+        AddError2 Sprite_BadData,       "Unrecognised sprite data"
+        AddError2 Sprite_NoGrScl,       "Operation 'PutSpriteGreyScaled' is not supported by this version of the SpriteExtend module"
+        AddError2 Sprite_BadColourMap,  "Bad colour map"
+        AddError2 Sprite_BadJPEGUnsupported, "JPEG format is not supported by this version of the SpriteExtend module"
+        AddError2 Sprite_BadJPEGProgressive, "Progressive JPEG rendering failed due to an internal error"
+        AddError2 Sprite_BadType,       "Sprite type is not supported by this version of the SpriteExtend module"
 
 ; Debugger errors
 
@@ -1040,6 +1044,12 @@ ErrorBase_SerialUtils # &20
 ; See the DeviceFS sources for these errors
 
 
+; SDFS errors
+
+ErrorBase_SDFS * &00010000 + ( fsnumber_SDFS :SHL: 8 ) ; fs 192
+ ASSERT @ <= ErrorBase_SDFS
+ ^ ErrorBase_SDFS
+
 ; -----------------------------------------
 
 ; Sound system errors
@@ -1384,5 +1394,7 @@ ErrorBase_RT			#	&100	; &0081BD00 Ben Avison
 ErrorBase_Tematic1		#	&100	; &0081d900 Tematic: ScreenFX and KeyUtils
                          ^ &0081DE00
 ErrorBase_SysLoad		#	&100	; &0081de00 Steve Revill (Castle)
+                         ^ &0081EE00
+ErrorBase_SDIO                  #       &100    ; &0081EE00 Ben Avison (ROOL)
         OPT     OldOpt
         END

hdr/SWIs

@@ -1673,6 +1673,21 @@ DragAFileSWI                    EQU     &00001635
 DragAFileSWI_Base               EQU     &00058D40
 DragAFileSWI_Name               SETS    "DragAFile"
 
+                                GBLS    VFPSupportSWI_Name
+VFPSupportSWI                   EQU     &0000163B
+VFPSupportSWI_Base              EQU     &00058EC0
+VFPSupportSWI_Name              SETS    "VFPSupport"
+
+                                GBLS    SDIODriverSWI_Name
+SDIODriverSWI                   EQU     &00001640
+SDIODriverSWI_Base              EQU     &00059000
+SDIODriverSWI_Name              SETS    "SDIO"
+
+                                GBLS    SDFSSWI_Name
+SDFSSWI                         EQU     &00001641
+SDFSSWI_Base                    EQU     &00059040
+SDFSSWI_Name                    SETS    "SDFS"
+
 
         ; Application SWI Chunks
 

hdr/Services

@@ -295,6 +295,8 @@ Service_SafeAreaChanged		#	1	; &4D480
 
                                 ^       &80540
 AcornProtocols                  #       64      ; &80540, ART rce
+                                ^       &81040
+SDIODriverService               #       64      ; &81040, ROOL / Ben Avison
 
                                 ^       &82880  ; Aquarius Window services
 Service_WindowModuleUnused      #       1       ; &82880

hdr/UserIF/Sovereign

+; Copyright 2012 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.
+;
+        SUBT    Definition of the Sovereign user interface (Castle branded) => Hdr:UserIF.Sovereign
+
+        GBLS    UserIF
+UserIF  SETS    "Sovereign"
+
+        GET     Hdr:UserIF.UserIF
+
+        END
+

hdr/UserIF/UserIF

@@ -36,6 +36,7 @@ Included_Hdr_UserIF_UserIF SETL {TRUE}
                 GBLL    UI_Lazarus
                 GBLL    UI_Morris4
                 GBLL    UI_NC2
+                GBLL    UI_Sovereign
                 GBLL    UI_STB22
                 GBLL    UI_STB3
                 GBLL    UI_STB400
@@ -44,6 +45,7 @@ UI_Iyonix       SETL    UserIF="Iyonix"
 UI_Lazarus      SETL    UserIF="Lazarus"
 UI_Morris4      SETL    UserIF="Morris4"
 UI_NC2          SETL    UserIF="NC2"
+UI_Sovereign    SETL    UserIF="Sovereign"
 UI_STB22        SETL    UserIF="STB22"
 UI_STB3         SETL    UserIF="STB3"
 UI_STB400       SETL    UserIF="STB400"