Merge branch '86Box:master' into master

src/include/86box/86box.h

@@ -27,7 +27,7 @@
 
 /* Configuration values. */
 #define GFXCARD_MAX  2
-#define SERIAL_MAX   7
+#define SERIAL_MAX   8
 #define PARALLEL_MAX 4
 #define SCREEN_RES_X 640
 #define SCREEN_RES_Y 480

src/include/86box/mouse.h

@@ -41,6 +41,7 @@
 #define MOUSE_TYPE_PS2       11 /* PS/2 series Bus Mouse */
 #define MOUSE_TYPE_WACOM     12 /* WACOM tablet */
 #define MOUSE_TYPE_WACOMARTP 13 /* WACOM tablet (ArtPad) */
+#define MOUSE_TYPE_MSYSTEMSB 14 /* Mouse Systems bus mouse */
 
 #define MOUSE_TYPE_ONBOARD   0x80 /* Mouse is an on-board version of one of the above. */
 
@@ -68,6 +69,7 @@ extern const device_t mouse_msinport_device;
 extern const device_t mouse_genibus_device;
 #    endif
 extern const device_t mouse_mssystems_device;
+extern const device_t mouse_mssystems_bus_device;
 extern const device_t mouse_msserial_device;
 extern const device_t mouse_ltserial_device;
 extern const device_t mouse_ps2_device;

src/include/86box/serial_passthrough.h

@@ -55,7 +55,7 @@ typedef struct serial_passthrough_s {
     void *backend_priv;                        /* Private platform backend data */
 } serial_passthrough_t;
 
-extern bool           serial_passthrough_enabled[SERIAL_MAX];
+extern bool           serial_passthrough_enabled[SERIAL_MAX - 1];
 extern const device_t serial_passthrough_device;
 
 extern void serial_passthrough_init(void);

src/include/86box/vid_svga.h

@@ -315,6 +315,8 @@ typedef struct svga_t {
       card should not attempt to display anything. */
     void       (*render_override)(void *priv);
     void *     priv_parent;
+
+    void *     local;
 } svga_t;
 
 extern void     ibm8514_set_poll(svga_t *svga);