Makefile

@@ -16,10 +16,11 @@
 #
 
 COMPONENT     = ScrModes
-OBJS          = ScrModes
+OBJS          = ScrModes tables mdfsupport edidsupport
 CMHGFILE      = ScrModesv
 HDRS          =
 ASMHDRS       = ScrModes
+ASMCHDRS      = ScrModes
 CDFLAGS       = -DDODEBUG=1
 CMHGDEPENDS   = ScrModes
 RESFSDIR      = ${RESDIR}.ScreenMode

Resources/Germany/Messages

@@ -24,3 +24,9 @@ E20:Es wurde keine Bildschirm-Beschreibungsdatei geladen.
 E22:Es wurde ein unbekannter ScreenModes_ReadInfo-Aufruf gemacht.
 E23:Es wird eine Zahl erwartet.
 E24:Es wurde ein zu großer Parameterwert angegeben.
+E25:EDID checksum is incorrect (block %0 of %1 failed) - cannot read monitor settings
+E26:Unable to read EDID - does this hardware support it?
+E27:EDID channel communications error.
+E28:Bad ScreenModes_EnumerateAudioFormats flags
+E29:Invalid EDID block
+NoName:Unidentified

Resources/UK/Messages

@@ -24,3 +24,9 @@ E20:No monitor description file loaded
 E22:Unknown ScreenModes_ReadInfo call
 E23:Number expected
 E24:Overlarge value for parameter
+E25:EDID checksum is incorrect (block %0 of %1 failed) - cannot read monitor settings
+E26:Unable to read EDID - does this hardware support it?
+E27:EDID channel communications error
+E28:Bad ScreenModes_EnumerateAudioFormats flags
+E29:Invalid EDID block
+NoName:Unidentified

VersionNum

-/* (0.38)
+/* (0.68)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.38
+#define Module_MajorVersion_CMHG        0.68
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                09 Mar 2014
+#define Module_Date_CMHG                31 Mar 2018
 
-#define Module_MajorVersion             "0.38"
-#define Module_Version                  38
+#define Module_MajorVersion             "0.68"
+#define Module_Version                  68
 #define Module_MinorVersion             ""
-#define Module_Date                     "09 Mar 2014"
+#define Module_Date                     "31 Mar 2018"
 
-#define Module_ApplicationDate          "09-Mar-14"
+#define Module_ApplicationDate          "31-Mar-18"
 
 #define Module_ComponentName            "ScrModes"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Video/UserI/ScrModes"
 
-#define Module_FullVersion              "0.38"
-#define Module_HelpVersion              "0.38 (09 Mar 2014)"
-#define Module_LibraryVersionInfo       "0:38"
+#define Module_FullVersion              "0.68"
+#define Module_HelpVersion              "0.68 (31 Mar 2018)"
+#define Module_LibraryVersionInfo       "0:68"

cmhg/ScrModesv

@@ -25,6 +25,8 @@ date-string: Module_Date_CMHG
 
 title-string: ScreenModes
 
+initialisation-code: ScreenModes_initialise
+
 finalisation-code: ScreenModes_final
 
 ; service calls - the only ones we answer to are Service_EnumerateScreenModes,
@@ -32,17 +34,21 @@ finalisation-code: ScreenModes_final
 service-call-handler: ScreenModes_servicecall Service_EnumerateScreenModes,
                                               Service_ModeExtension,
                                               Service_ModeTranslation,
-                                              Service_DisplayChanged
+                                              Service_DisplayChanged,
+                                              Service_MonitorLeadTranslation
 
 international-help-file: "Resources:$.Resources.ScreenMode.Messages"
 
 command-keyword-table: ScreenModes_cmdhandler
      LoadModeFile(min-args:1, max-args: 1, international:,
                   invalid-syntax: "SSMDLMF",
-                  help-text: "HSMDLMF")
+                  help-text: "HSMDLMF"),
+     SaveModeFile(min-args:1, max-args: 1, international:,
+                  invalid-syntax: "SSMDSMF",
+                  help-text: "HSMDSMF")
 
 swi-chunk-base-number: 0x487C0
 
 swi-handler-code: ScreenModes_swihandler
 
-swi-decoding-table: ScreenModes ReadInfo
+swi-decoding-table: ScreenModes ReadInfo EnumerateAudioFormats Features

doc/BootStates

+1.MDF based scheme
+~~~~~~~~~~~~~~~~~~
+OS: Doesn't support EDID, configured with MonitorType Auto
+
+Monitor is?      Plugged in?  Outcome?                                                  Recovery story?
+----------       ----------   -------                                                   --------------
+Same model       Yes          Good image (most common situation)                        -
+as earlier       No           No image                                                  -
+                 No but later Good image (LoadModeFile loaded the MDF regardless)       -
+                 reconnected                                                            
+Different model  Yes          Only a good image if earlier MDF works on new monitor     Blind type *WimpMode, then run !Configure to choose new model
+than before      No           No image                                                  -
+                 No but later Only a good image if earlier MDF works on new monitor     Blind type *WimpMode, then run !Configure to choose new model
+                 reconnected
+
+2.EDID based scheme
+~~~~~~~~~~~~~~~~~~~
+OS: Does support EDID, has !Boot on read/write medium, EDID monitor was selected in !ScrnSetup
+
+Monitor is?      Plugged in?  Outcome?                                                  Recovery story?
+----------       ----------   -------                                                   --------------
+Same model       Yes          Early boot uses CMOS MonitorType until monitor choices    -
+as earlier                    obey file reached => good image (most common situation)
+                 No           No image                                                  -
+                 No but later Only a good image if OS's default mode (SVGA?) supported  Blind type *LoadModeFile
+                 reconnected                                                            or reboot
+Different model  Yes          Early boot uses CMOS MonitorType until monitor choices    -
+than before                   obey file reached => good image (read from new monitor)
+                 No           No image                                                  -
+                 No but later Only a good image if OS's default mode (SVGA?) supported  Blind type *LoadModeFile
+                 reconnected                                                            or reboot
+
+3.EDID based scheme softloaded on top of MDF only ROM
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+OS: Initial boot from old OS, as early as OS 3.50, softload does support EDID and was selected in !ScrnSetup 
+
+Monitor is?      Plugged in?  Outcome?                                                  Recovery story?
+----------       ----------   -------                                                   --------------
+Same model       Yes          Early boot uses Auto until softload starts then good      -
+as earlier                    image (most common situation); if softload is not         
+                              selected, loads MDF and behaves per scenario 1            
+                 No           No image
+                 No but later Only a good image if OS's default mode (SVGA?) supported  Blind type *LoadModeFile
+                 reconnected                                                            or reboot
+Different model  Yes          Early boot uses Auto until softload starts then good      -
+than before                   image (read from new monitor)                             
+                 No           No image                                                  -
+                 No but later Only a good image if OS's default mode (SVGA?) supported  Blind type *LoadModeFile
+                 reconnected                                                            or reboot
+
+4.EDID based scheme discless boot
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+OS: Does support EDID, no disc, or failed !Boot, configured MonitorType is EDID
+
+Monitor is?      Plugged in?  Outcome?                                                  Recovery story?
+----------       ----------   -------                                                   --------------
+Same model       Yes          Preferred mode chosen (most common situation)             -
+as earlier       No           No image                                                  -
+                 No but later Only a good image if OS's default mode (SVGA?) supported  Blind type *LoadModeFile
+                 reconnected                                                            or reboot
+Different model  Yes          Preferred mode chosen (read from new monitor)             -
+than before      No           No image                                                  -
+                 No but later Only a good image if OS's default mode (SVGA?) supported  Blind type *LoadModeFile
+                 reconnected                                                            or reboot
+
+Notes
+~~~~~
+Monitors are required to return EDID data if connected in, even if not turned on - the EDID memory is powered by
+the motherboard. Therefore, the above tables only consider the connected/not connected possibilities since the
+monitor being off or on isn't important.
+
+Tables assume hotplug is not supported by the hardware, let alone the software, and that EDID data from the
+monitor is truthful. Hotplug support in a later version will remove all requirements to recover a bad mode choice
+by blind typing when the monitor is plugged in after booting, presently a reboot is required.

doc/EDIDGoals

+Statement of aims
+~~~~~~~~~~~~~~~~~
+* Resiliance against corrupt or inaccurate EDID data from the monitor
+  => some default display, and ability to override EDID data with 'known good' library copy
+     in a similar manner to Windows overriding the EDID from an INF file as described here
+     https://msdn.microsoft.com/en-us/library/windows/hardware/jj133967(v=vs.85).aspx
+  => allow loading of disc based EDID on platforms that don't support it (eg. Risc PC)
+* Simple user interface
+  => user unlikely to care where the monitor settings came from, but they must work at least
+     as well as the previous MDF system
+  => checkbox or menu entry in !Configure plugin 
+* Fallback to MonitorType=Auto behaviour if EDID unavailable
+  => avoids problem when softload sets up to use EDID but underlying ROM OS doesn't support it
+  => R-power-on/Delete-power-on/Keypad-dot-power-on revert to Auto as currently
+* Advanced diagnostics for support staff
+  => "many to 1" problem, so most of the complexity should reside on the support staff's desk,
+     the remote system where the problem lies can be relatively simple
+  => PC tools used to offline analyse EDID dumps (or, enhanced !MakeModes application)
+  => means to capture EDID dump (utility, star command, BASIC, or similar)
+* Discless boot
+  => ability to select EDID without a boot sequence having run
+  => ensure that the initial mode (prior to !Boot running) is feasible by vetting modes with the
+     graphics driver
+  => fallback to kernel's numbered modes if EDID is corrupt or inaccurate
+* Hotplug and multi head
+  => not currently supported, but design should not preclude their introduction in future, for
+     example by setting the CMHG keyword matcher to let through some extra args but ignore
+     them today

h/edidmemory

+/* Copyright 2016 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.
+ */
+/* edidmemory.h */
+
+typedef struct _EDIDBlock
+{
+    /* 8 bytes of header */
+    uint8_t header[8];
+    /* 10 bytes of vendor id */
+    uint8_t manufacturer_id[2];
+    uint8_t product_id[2];
+    uint8_t serial[4];
+    uint8_t week_made;
+    uint8_t year_made;
+    /* 2 bytes of EDID Structure and version */
+    uint8_t edid_version;
+    uint8_t edid_revision;
+    /* 5 bytes of Basic parameters */
+    uint8_t video_input_definition;
+    uint8_t horizontal_screen_size; /* Listed in cm. Aspect ratio - landscape */
+    uint8_t vertical_screen_size;   /* Listed in cm. Aspect ratio - portrait */
+    uint8_t gamma;
+    uint8_t feature_support;
+#define FEATURE_SUPPORT_CONTINUOUS_FREQUENCY            (1 << 0)
+#define FEATURE_SUPPORT_PTM_INC_PIXELFMT_AND_REFRESH    (1 << 1)
+#define FEATURE_SUPPORT_SRGB_COLOUR_SPACE               (1 << 2)
+#define FEATURE_SUPPORT_COLOUR_ENC_MASK                 (3 << 3)
+#define FEATURE_SUPPORT_COLOUR_ENC_RGB444               (0 << 3)
+#define FEATURE_SUPPORT_COLOUR_ENC_RGB444_YUV444        (1 << 3)
+#define FEATURE_SUPPORT_COLOUR_ENC_RGB444_YUV422        (2 << 3)
+#define FEATURE_SUPPORT_COLOUR_ENC_RGB444_YUV444_YUV422 (3 << 3)
+#define FEATURE_SUPPORT_COLOUR_TYPE_MASK                (3 << 3)
+#define FEATURE_SUPPORT_COLOUR_TYPE_MONO                (0 << 3)
+#define FEATURE_SUPPORT_COLOUR_TYPE_RGB                 (1 << 3)
+#define FEATURE_SUPPORT_COLOUR_TYPE_NON_RGB             (2 << 3)
+#define FEATURE_SUPPORT_COLOUR_TYPE_UNDEFINED           (3 << 3)
+#define FEATURE_SUPPORT_DPM_MASK                        (7 << 5)
+#define FEATURE_SUPPORT_DPM_ACTIVE_OFF_SUPPORTED        (1 << 5)
+#define FEATURE_SUPPORT_DPM_SUSPEND_SUPPORTED           (1 << 6)
+#define FEATURE_SUPPORT_DPM_STANDBY_SUPPORTED           (1 << 7)
+    /* 10 bytes of colour characteristics */
+    uint8_t colour_characteristics[10];
+    /* 3 bytes of established timings */
+    uint8_t established_timings[3];
+    /* 16 bytes of standard timings identification 1-8 */
+    uint8_t standard_timings[16];
+    /* 72 bytes of 18 byte data blocks; */
+    uint8_t data_block[4][18];
+    /* Extension blocks */
+    uint8_t extension_block_count;
+    uint8_t checksum;
+} EDIDBlock, *EDIDBlockRef;
+
+enum
+{
+    /* 00-0F manufacturer */
+    DATA_TYPE_MANUFACTURER0 = 0,
+    DATA_TYPE_MANUFACTURER1,
+    DATA_TYPE_MANUFACTURER2,
+    DATA_TYPE_MANUFACTURER3,
+    DATA_TYPE_MANUFACTURER4,
+    DATA_TYPE_MANUFACTURER5,
+    DATA_TYPE_MANUFACTURER6,
+    DATA_TYPE_MANUFACTURER7,
+    DATA_TYPE_MANUFACTURER8,
+    DATA_TYPE_MANUFACTURER9,
+    DATA_TYPE_MANUFACTURERA,
+    DATA_TYPE_MANUFACTURERB,
+    DATA_TYPE_MANUFACTURERC,
+    DATA_TYPE_MANUFACTURERD,
+    DATA_TYPE_MANUFACTURERE,
+    DATA_TYPE_MANUFACTURERF,
+    /* 10 dummy tag for unused block */
+    DATA_TYPE_DUMMY,
+
+    /* 11-F6 reserved for future use */
+
+    /* F7-FF various info */
+    DATA_TYPE_ESTTIMINGS3 = 0xF7,
+    DATA_TYPE_CVT3BYTE,
+    DATA_TYPE_DCM,
+    DATA_TYPE_STDTIMING,
+    DATA_TYPE_COLOURPOINT,
+    DATA_TYPE_MONITORNAME,
+    DATA_TYPE_RANGELIMITS,
+    DATA_TYPE_STRING,
+    DATA_TYPE_MONITORSERIALNUM
+};
+
+typedef struct _EDIDExtensionBlock
+{
+    uint8_t tag;
+    uint8_t revision;
+    uint8_t data[125];
+    uint8_t checksum;
+} EDIDExtensionBlock, *EDIDExtensionBlockRef;
+
+/* EOF edidmemory.h */

h/edidsupport

+/* Copyright 2016 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.
+ */
+/* edidsupport.h */
+void release_edidblocks(void);
+_kernel_oserror *loadedid(const char *file);
+_kernel_oserror *readedid(int, bool);
+
+/* EOF edidsupport.h */

h/errors

@@ -46,6 +46,11 @@
 #define ERR_BADREADINFO   22    /* Unknown ScreenModes_ReadInfo call */
 #define ERR_EXPNUM2       23    /* Number expected */
 #define ERR_VALUEOVF2     24    /* Overlarge value for parameter */
+#define ERR_BADCHECKSUM   25    /* EDID Checksum failed */
+#define ERR_CANTREADEDID  26    /* Cannot read EDID */
+#define ERR_IICOPFAIL     27    /* IICStatus reported an error reading EDID */
+#define ERR_BADENUMAUDIO  28    /* Bad ScreenModes_EnumerateAudioFormats flags */
+#define ERR_INVALIDEDID   29    /* Invalid EDID block */
 
 /* EOF errors.h */
 

h/mdfsupport

+/* Copyright 2016 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.
+ */
+/* mdfsupport.h */
+_kernel_oserror *loadtextMDF(const char *file, FILE *);
+
+/* EOF mdfsupport.h */

h/modex

@@ -18,6 +18,48 @@
  * Internal definitions used by ScreenModes module.
  */
 
+#ifndef DODEBUG
+#define DODEBUG 0
+#endif
+
+#if DODEBUG
+#define IFDEBUG    if (!1) {} else
+#else
+#define IFDEBUG    if (1) {} else
+#endif
+
+/* When defined, we can derive monitor definitions from the
+ * DMT set using the 3-byte lookup table.
+ */
+#define DERIVE_CVT3_FROM_DMT
+
+/* When defined, set the value to force a particular timing
+ * calculation type from the available set.
+ */
+#undef  FORCE_TIMINGS /* eg. EDID_USE_CVTRB */
+
+/* When defined, force calculated values (ie. don't prefer DMT) */
+#undef  FORCE_CALCULATED_VALUES
+
+/* HSync & VSync polarities for use by display_monitor_timings */
+#define HSync_Positive 0
+#define HSync_Negative SyncPol_InvertHSync
+#define VSync_Positive 0
+#define VSync_Negative SyncPol_InvertVSync
+#define PP HSync_Positive+VSync_Positive
+#define PN HSync_Positive+VSync_Negative
+#define NP HSync_Negative+VSync_Positive
+#define NN HSync_Negative+VSync_Negative
+
+/* Defines which is the most advanced timing calculation available
+ * We use DMT if defined for that mode and calculate using the timing
+ * If not. If USE_DMT is highest it is DMT or nothing.
+ */
+#define EDID_USE_DMT   (0) /* Display monitor timings */
+#define EDID_USE_GTF   (1) /* Generalised timing formula */
+#define EDID_USE_GTF2  (2)
+#define EDID_USE_CVT   (3) /* Coordinated video timings from VESA */
+#define EDID_USE_CVTRB (4) /* CVT with reduced blanking */
 
 /*
  * The 6 field framing parameters for each direction, horizontal and
@@ -37,29 +79,17 @@
  */
 
 /**Added by WT 13-1-95 for Stork **/
-#define LCDMODE_INDEX   01
     #define LCDMODE_VALUE       1       /*Enable*/
-#define LCDDUAL_INDEX   02
     #define LCDDUAL_VALUE       1       /*Enable*/
-#define LCDOFF0_INDEX   03
     #define LCDOFF0_VALUE       6       /*Defining a 640x480 dual-panel LCD as used in Stork*/
-#define LCDOFF1_INDEX   04
     #define LCDOFF1_VALUE       129     /*Defining a 640x480 dual-panel LCD as used in Stork*/
-#define DACCTRL_INDEX   06
     #define DACCTRL_VALUE       1       /*Enable - testing only*/
 /**End of additions**/
 
-#define HCLK_INDEX       9
-#define DPMS_INDEX       11
-#define INTERLACED_INDEX 12
-#define OPFORMAT_INDEX   13
-#define NCOLOUR_INDEX    15
-#define MODEFLAGS_INDEX  16
-
 /* Pixel format representation used by GraphicsV */
 typedef struct
 {
-    int32_t ncolour;                    /* NColour mode variable */
+    int32_t  ncolour;                   /* NColour mode variable */
     uint32_t modeflags;                 /* relevant ModeFlags */
     uint32_t log2bpp;                   /* Log2BPP mode variable */
 } PixelFormat, *PixelFormatRef;
@@ -90,7 +120,7 @@ typedef struct
     uint32_t vpar[FR__COUNT];           /* vertical parameters */
     uint32_t pixelrate;                 /* pixel rate measured in kHz */
     uint32_t syncpol;                   /* sync polarity code, 0..3 */
-    ModeParam vcparam[12];              /* Holds VCparameters: LCD mode, LCD dual-panel, LCD offsets(2), DAC control, -1
+    ModeParam vcparam[13];              /* Holds VCparameters: LCD mode, LCD dual-panel, LCD offsets(2), DAC control, ExtraBytes, -1
                                          * with optional NColour, ModeFlags, DPMS, HCLK Interlaced and/or output_format fields
                                          */
 } VIDCList, *VIDCListRef;
@@ -121,8 +151,11 @@ typedef struct
 
 #define IS_MODE_NUMBER(p)  ((uint32_t)(p) < 256)
 #define IS_MODE_SEL_PTR(p) (!IS_MODE_NUMBER(p))
+#define ALIGN(a)           (((a) + 3) & ~3)
 #define UNUSED(k)          ((k)=(k))
 #define MODESEL(p)         ((ModeSelectorRef)(p))
+#define MAX(a,b)           (((a)<(b))?(b):(a))
+#define MIN(a,b)           (((a)>(b))?(b):(a))
 
 /*
  * Monitor & modes description as loaded from ModeInfo file: note,
@@ -133,20 +166,24 @@ typedef struct
 
 typedef struct
 {
-    char name[MAXMODENAME+1];
     uint32_t xres;                      /* User quoted xres (may differ from hpar[FR_DISP], especially in interlaced modes) */
     uint32_t yres;                      /* User quoted yres (may differ from vpar[FR_DISP], ... */
-    uint16_t hpar[FR__COUNT];           /* H. framing in vidc pixel times */
-    uint16_t vpar[FR__COUNT];           /* V. framing in vidc raster times */
-    uint32_t pixel_khz;                 /* vidc pixel rate in kHz */
+    uint16_t hpar[FR__COUNT];           /* H. framing in pixel times */
+    uint16_t vpar[FR__COUNT];           /* V. framing in raster times */
+    uint32_t pixel_khz;                 /* pixel rate in kHz */
     uint32_t external_clock;            /* rate of external clock in kHz (use it instead of VCO), or -1 */
     uint8_t  syncpol;                   /* sync polarity code (0..3 for now) */
     uint8_t  interlaced;                /* whether mode is interlaced using two seperate framebuffers (0 or 1) */
-    uint8_t  spare1, spare2;            /* explicit padding so struct is N*4 bytes long */
+    uint8_t  freq, spare2;              /* explicit padding so struct is N*4 bytes long */
+} ModeDef; /* Abbreviated form, without the name */
+
+typedef struct
+{
+    char    name[MAXMODENAME+1];
+    ModeDef timings;
 } ModeDefinition;
 
 /* As stored internally by ScreenModes module */
-
 typedef struct mode_description_
 {
     struct mode_description_ *next;     /* in list built during file parsing */
@@ -155,8 +192,27 @@ typedef struct mode_description_
     uint32_t line_hz;                   /* line rate in Hz (for diagnostics only) */
     uint32_t frame_hz:8;                /* frame rate in Hz, for user frame rate selection */
     uint32_t frame_mhz:24;              /* also in mHz (millihertz), for more precise cmp */
+    uint8_t  priority;                  /* Bits 0-2 = 'Parameter type' from? (EDID 1.4 Section 5) */
+                                        /*            0 = Undefined (MDF or something which overrides all else) */
+                                        /*            1 = Preferred Timing Mode from base EDID */
+                                        /*            2 = Detailed Timing Mode in the base EDID */
+                                        /*            3 = Any detailed timing modes in extension blocks */
+                                        /*            4 = Any optional 3-byte CVT codes in the base EDID or extension block */
+                                        /*            5 = Standard Timings listed in base EDID or extension blocks */
+                                        /*            6 = Additional timing mode information: Established Timings I, II, III, */
+                                        /*                default GTF, GTF secondary curve and CVT */
+                                        /*            7 = Base VIDEO MODE (defined as 640 x 480 x 60Hz). */
 } ModeDescription, *ModeDescriptionRef;
 
+/* Audio format information extracted from EDID */
+typedef struct
+{
+    uint8_t format_code;                /* As per CEA 861-D */
+    uint8_t max_channels;
+    uint8_t sample_rates;               /* Byte #2 of short audio descriptor */
+    uint8_t format_specific;            /* Byte #3 of short audio descriptor */
+} AudioFormat;
+
 /* Description of a monitor & its associated modes */
 typedef struct
 {
@@ -166,7 +222,44 @@ typedef struct
     uint32_t lcd_support;               /* 0=>modefile is CRT, 1=>LCD single-panel, 2=>LCD dual panel [WT13-01-95] */
     uint32_t external_clock;            /* rate of external clock in kHz (use it instead of VCO) */
     uint32_t output_format;             /* 0=analogue, 1=digital */
+
+    AudioFormat *audio_formats;         /* (Optional) list of supported audio formats */
+    int      audio_format_count;        /* Length of list */
+    uint8_t  speaker_mask;              /* (Optional) speaker mask (as per CEA 861-D) */
+    bool     speaker_mask_provided;
 } MonitorDescription, *MonitorDescriptionRef;
 
+/* Maps a 2-byte 'STD code' to a DMT (STD codes defined in EDID spec) */
+typedef struct
+{
+    char stdcode[2];                    /* TODO: comment required here */
+    char dmt;                           /* TODO: comment required here */
+} STDTiming;
+
+/* Maps a 3-byte 'CVT code' to a DMT (CVT codes defined in EDID spec) */
+typedef struct
+{
+    char cvtcode[3];                    /* TODO: comment required here */
+    char dmt;                           /* TODO: comment required here */
+} CVTTiming;
+
+/* Extern variables and functions */
+extern ModeSelectorRef preferred_mode;
+extern MonitorDescriptionRef current_monitor;
+extern int old_monitortype;
+extern int preferred_sync_type;
+
+_kernel_oserror *error(int, const char *, const char *, const char *);
+_kernel_oserror *messages_lookup(char *, size_t, const char *, const char *, const char *, const char *);
+_kernel_oserror *new_monitordescription(MonitorDescriptionRef *);
+void release_currentmonitor(void);
+void free_monitordescription(MonitorDescriptionRef);
+void compute_modedescription(ModeDescriptionRef);
+void sort_modelist(ModeDescriptionRef *);
+bool is_old_format(const PixelFormatRef);
+bool find_deepest_by_xyhz(PixelFormatRef, ModeDescriptionRef);
+_kernel_oserror *set_monitortype(int);
+int read_monitortype(void);
+_kernel_oserror *restore_monitortype(void);
 
 /* EOF modex.h */

h/monitors

@@ -16,15 +16,18 @@
 /*
  * Definitions of standard RISC OS monitor types
  */
-#define MONITOR_PALFORMAT	0	/* standard TV-format monitor */
-#define MONITOR_MULTISCAN	1	/* multiple-scan-rate monitor */
-#define MONITOR_HIRESMONO	2	/* 1152x896 64Hz monochrome */
-#define MONITOR_VGA		3	/* standard VGA (640x480) */
-#define MONITOR_SVGA		4	/* super VGA (800x600) */
-#define MONITOR_LCD		5	/* liquid crystal display on portables */
-/* type 6 undefined */
-#define MONITOR_FILE		7	/* defined by ScreenModes module, from file */
-/* types 8-30 undefined */
-#define MONITOR_AUTO		31
+#define MONITOR_PALFORMAT	0  /* standard 50Hz TV-format monitor */
+#define MONITOR_MULTISCAN	1  /* multiple-scan-rate monitor */
+#define MONITOR_HIRESMONO	2  /* 1152x896 64Hz monochrome */
+#define MONITOR_VGA		3  /* standard VGA (640x480) */
+#define MONITOR_SVGA		4  /* super VGA (800x600) */
+#define MONITOR_LCD		5  /* liquid crystal display on portables */
+#define MONITOR_3RDPARTY	6  /* reserved for 3rd party use */
+#define MONITOR_FILE		7  /* defined by ScreenModes module, from file */
+#define MONITOR_NTSCFORMAT	8  /* standard 60Hz TV-format monitor */
+/* types 9-15 undefined */
+#define MONITOR_EDID		16 /* determined from EDID read by DDC */
+/* types 17-30 reserved for future use */
+#define MONITOR_AUTO		31 /* determined from VGA pins ID0-3 */
 
 /* EOF monitors.h */