Merge branch 'master' of https://github.com/86Box/86Box

src/include/86box/86box.h

@@ -201,6 +201,9 @@ extern int  start_vmm;             /* the current execution will start the manag
 extern int  portable_mode;         /* we are running in portable mode 
                                       (global dirs = exe path) */
 
+extern int  monitor_edid;                   /* (C) Which EDID to use. 0=default, 1=custom. */
+extern char monitor_edid_path[1024];        /* (C) Path to custom EDID */
+
 #ifndef USE_NEW_DYNAREC
 extern FILE *stdlog; /* file to log output to */
 #endif

src/include/86box/plat.h

@@ -52,7 +52,8 @@ enum {
     STRING_GHOSTPCL_ERROR_TITLE,      /* "Unable to initialize GhostPCL" */
     STRING_GHOSTPCL_ERROR_DESC,       /* "gpcl6dll32.dll/gpcl6dll64.dll/libgpcl6 is required..." */
     STRING_ESCP_ERROR_TITLE,          /* "Unable to find Dot-Matrix fonts" */
-    STRING_ESCP_ERROR_DESC            /* "TrueType fonts in the \"roms/printer/fonts\" directory..." */
+    STRING_ESCP_ERROR_DESC,           /* "TrueType fonts in the \"roms/printer/fonts\" directory..." */
+    STRING_EDID_TOO_LARGE,            /* "EDID file \"%ls\" is too large (%lld bytes)." */
 };
 
 /* The Win32 API uses _wcsicmp. */

src/include/86box/vid_ddc.h

@@ -22,5 +22,6 @@
 
 extern void *ddc_init(void *i2c);
 extern void  ddc_close(void *eeprom);
+extern void *ddc_create_default_edid(ssize_t* size_out);
 
 #endif /*EMU_VID_DDC_H*/