diff --git a/VersionASM b/VersionASM index ab802e478b693c124f68a800eb9303330817a06b..53aa0e53f0aa6e7acaeea715b41ebfe895a93988 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.287" -Module_Date SETS "06 Sep 2015" -Module_ApplicationDate SETS "06-Sep-15" +Module_MinorVersion SETS "4.79.2.288" +Module_Date SETS "08 Sep 2015" +Module_ApplicationDate SETS "08-Sep-15" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.287)" -Module_HelpVersion SETS "5.35 (06 Sep 2015) 4.79.2.287" +Module_FullVersion SETS "5.35 (4.79.2.288)" +Module_HelpVersion SETS "5.35 (08 Sep 2015) 4.79.2.288" END diff --git a/VersionNum b/VersionNum index d2e0a0e62f5d2e566bb8eb7f7dec63c2d9bfd04d..32a2537bc47f627e9763c64b9790d2b8f320ec1d 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.287 -#define Module_Date_CMHG 06 Sep 2015 +#define Module_MinorVersion_CMHG 4.79.2.288 +#define Module_Date_CMHG 08 Sep 2015 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.287" -#define Module_Date "06 Sep 2015" +#define Module_MinorVersion "4.79.2.288" +#define Module_Date "08 Sep 2015" -#define Module_ApplicationDate "06-Sep-15" +#define Module_ApplicationDate "08-Sep-15" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.287)" -#define Module_HelpVersion "5.35 (06 Sep 2015) 4.79.2.287" +#define Module_FullVersion "5.35 (4.79.2.288)" +#define Module_HelpVersion "5.35 (08 Sep 2015) 4.79.2.288" #define Module_LibraryVersionInfo "5:35" diff --git a/s/PMF/i2cutils b/s/PMF/i2cutils index d5e7a09877152a0acc76f839f540776f8ca0b703..fb5258899357db10265fb1e482cdc96bd8499a0e 100644 --- a/s/PMF/i2cutils +++ b/s/PMF/i2cutils @@ -1813,7 +1813,11 @@ DefaultCMOSTable DCB FileLangCMOS, fsnumber_adfs ; ADFS ] ] + [ "$Machine"="CortexA9" + DCB FontCMOS, 255 ; Changed to 1016k from 256K for modern machines + | DCB FontCMOS, 64 ; KJB 13-Dec-02: Changed to 256K from 64K + ] DCB PigCMOS, 10 DCB KeyRepCMOS, 8 DCB RMASizeCMOS, 0 @@ -1891,8 +1895,12 @@ DefaultCMOSTable ; FontMaxCMOS yes, omitting is deliberate! DCB FontMax2CMOS, &2C ; 32 point DCB FontMax3CMOS, &38 ; 32 point + | + [ "$Machine"="CortexA9" + DCB FontMaxCMOS, 255 ; 16380k | DCB FontMaxCMOS, 64 ; 4096k + ] DCB FontMax2CMOS, 36:EOR:12 ; 36 point DCB FontMax3CMOS, 36:EOR:24 ; 36 point DCB FontMax4CMOS, 16 ; 16 point @@ -1907,6 +1915,9 @@ DefaultCMOSTable | DCB CDROMFSCMOS, &C1 ; drives = 1, buffer size = 256K ] + [ "$Machine"="CortexA9" + DCB SCSIFSDrivesCMOS, &20 ; default to SCSIFS Drive 4 + ] ] DCB &FF ALIGN