Move ScreenModes to before video drivers

Detail:
  Components/ROOL/BCM2835, BCM2835Pico, IOMD32, OMAP3, OMAP3Live, OMAP4, Tungsten - Moved ScreenModes (+FPEmulator) to just before the video drivers, so that (once the EDID changes are submitted) the first mode change will be able to use EDID-derived mode timings instead of fixed ones.
  IOMD change is somewhat non-essential due to lack of EDID reading support, but keeps things consistent with the other ROMs.
  Also moved PandoraKey to be with the other keyboard (USB) drivers.
Admin:
  Tested on BB-xM, Iyonix, Pandora, Raspberry Pi, RiscPC


Version 6.47. Tagged as 'BuildSys-6_47'

Components/ROOL/BCM2835

@@ -65,6 +65,8 @@ USBDriver
 DWCDriver
 VCHIQ
 BCMSound
+FPEmulator            -options FPE_APCS=3/32bit
+ScreenModes
 BCMVideo
 DisplayManager
 DMAManager
@@ -79,7 +81,6 @@ Filer
 FilerSWIs
 FSLock
 FontManager           
-FPEmulator            -options FPE_APCS=3/32bit
 VFPSupport
 Free
 Hourglass
@@ -133,7 +134,6 @@ SDFS
 SDFSFiler             -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
 SDCMOS                -options MYASFLAGS="-pd \"StoreInHAL SETL {TRUE}\""
 ColourPicker
-ScreenModes
 DrawFile
 BootCommands
 AUNMsgs

Components/ROOL/BCM2835Pico

@@ -63,6 +63,8 @@ USBDriver
 DWCDriver
 VCHIQ
 BCMSound
+FPEmulator            -options FPE_APCS=3/32bit
+ScreenModes
 BCMVideo
 DMAManager
 DrawMod               -type EXP
@@ -70,7 +72,6 @@ FileCore
 ADFS                  -type EXP
 RamFS
 FontManager           -type EXP
-FPEmulator            -options FPE_APCS=3/32bit
 VFPSupport
 Free                  -type EXP
 Hourglass             -type EXP
@@ -105,7 +106,6 @@ SCSIFS
 SDIODriver
 SDFS
 SDCMOS                -options MYASFLAGS="-pd \"StoreInHAL SETL {TRUE}\""
-ScreenModes
 BootCommands
 
 #

Components/ROOL/IOMD32

@@ -50,6 +50,8 @@ TaskManager
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
+FPEmulator            -options FPE_APCS=3/32bit
+ScreenModes
 VIDC20Video
 Mouse
 PS2Driver
@@ -74,7 +76,6 @@ Filer
 FilerSWIs
 FSLock
 FontManager
-FPEmulator            -options FPE_APCS=3/32bit
 Free
 Hourglass
 IIC
@@ -118,7 +119,6 @@ SharedSnd
 Filer_Action
 DOSFS                 -options PCMCIA=TRUE
 ColourPicker
-ScreenModes
 DrawFile
 BootCommands
 AUNMsgs

Components/ROOL/OMAP3

@@ -51,6 +51,8 @@ TaskManager
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
+FPEmulator            -options FPE_APCS=3/32bit
+ScreenModes
 OMAPVideo             -options CDEFINES="-DOMAP=3"
 BASIC105
 BASIC64
@@ -65,6 +67,7 @@ RTSupport
 USBDriver
 EHCIDriver
 MUSBDriver
+PandoraKey
 DisplayManager
 DMAManager
 DragASprite
@@ -78,7 +81,6 @@ Filer
 FilerSWIs
 FSLock
 FontManager           
-FPEmulator            -options FPE_APCS=3/32bit
 VFPSupport
 Free
 Hourglass
@@ -131,7 +133,6 @@ SDFS
 SDFSFiler             -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
 SDCMOS
 ColourPicker
-ScreenModes
 DrawFile
 BootCommands
 AUNMsgs
@@ -184,7 +185,6 @@ CDFS
 CDFSFiler
 
 UnSqzAIF
-PandoraKey
 BatMgrHAL
 InetRes               -options TYPE=EmergencyUtils
 

Components/ROOL/OMAP4

@@ -50,6 +50,8 @@ TaskManager
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
+FPEmulator            -options FPE_APCS=3/32bit
+ScreenModes
 OMAPVideo             -options CDEFINES="-DOMAP=4"
 BASIC105
 BASIC64
@@ -77,7 +79,6 @@ Filer
 FilerSWIs
 FSLock
 FontManager           
-FPEmulator            -options FPE_APCS=3/32bit
 VFPSupport
 Free
 Hourglass
@@ -130,7 +131,6 @@ SDFS
 SDFSFiler             -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
 SDCMOS
 ColourPicker
-ScreenModes
 DrawFile
 BootCommands
 AUNMsgs

Components/ROOL/Tungsten

@@ -50,6 +50,8 @@ WindowManager         -options OPTIONS=Ursula
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
+FPEmulator            -options FPE_APCS=3/32bit
+ScreenModes
 NVidia                
 TaskManager
 ADFSFiler
@@ -78,7 +80,6 @@ Filer
 FilerSWIs
 FSLock
 FontManager
-FPEmulator            -options FPE_APCS=3/32bit
 Free
 Hourglass
 IIC
@@ -126,7 +127,6 @@ SCSISoftUSB
 SCSIFS
 SCSIFiler             -options ASFLAGS="-PD \"SCSI SETL {TRUE}\"" TEMPLATES=no
 ColourPicker
-ScreenModes
 DrawFile
 BootCommands
 AUNMsgs

VersionNum

-/* (6.46)
+/* (6.47)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        6.46
+#define Module_MajorVersion_CMHG        6.47
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                19 Jul 2014
+#define Module_Date_CMHG                20 Jul 2014
 
-#define Module_MajorVersion             "6.46"
-#define Module_Version                  646
+#define Module_MajorVersion             "6.47"
+#define Module_Version                  647
 #define Module_MinorVersion             ""
-#define Module_Date                     "19 Jul 2014"
+#define Module_Date                     "20 Jul 2014"
 
-#define Module_ApplicationDate          "19-Jul-14"
+#define Module_ApplicationDate          "20-Jul-14"
 
 #define Module_ComponentName            "BuildSys"
 #define Module_ComponentPath            "castle/RiscOS/BuildSys"
 
-#define Module_FullVersion              "6.46"
-#define Module_HelpVersion              "6.46 (19 Jul 2014)"
-#define Module_LibraryVersionInfo       "6:46"
+#define Module_FullVersion              "6.47"
+#define Module_HelpVersion              "6.47 (20 Jul 2014)"
+#define Module_LibraryVersionInfo       "6:47"