Merge remote-tracking branch 'upstream/master' into feature/ich2

src/include/86box/machine.h

@@ -612,6 +612,7 @@ extern int machine_at_acerv35n_init(const machine_t *);
 extern int machine_at_p55t2p4_init(const machine_t *);
 extern int machine_at_m7shi_init(const machine_t *);
 extern int machine_at_tc430hx_init(const machine_t *);
+extern int machine_at_infinia7200_init(const machine_t *);
 extern int machine_at_equium5200_init(const machine_t *);
 extern int machine_at_pcv90_init(const machine_t *);
 extern int machine_at_p65up5_cp55t2d_init(const machine_t *);

src/include/86box/serial.h

@@ -53,15 +53,17 @@ typedef struct serial_s {
         dat, int_status, scratch, fcr,
         irq, type, inst, transmit_enabled,
         fifo_enabled, rcvr_fifo_len, bits, data_bits,
-        baud_cycles, rcvr_fifo_full, txsr, pad, msr_set;
+        baud_cycles, rcvr_fifo_full, txsr, out,
+        msr_set, pad, pad0, pad1;
 
-    uint16_t dlab, base_address;
+    uint16_t dlab, base_address, out_new, pad2;
 
     uint8_t rcvr_fifo_pos, xmit_fifo_pos,
-        pad0, pad1,
+        rcvr_fifo_end, xmit_fifo_end,
         rcvr_fifo[SERIAL_FIFO_SIZE], xmit_fifo[SERIAL_FIFO_SIZE];
 
-    pc_timer_t transmit_timer, timeout_timer;
+    pc_timer_t transmit_timer, timeout_timer,
+               receive_timer;
     double     clock_src, transmit_period;
 
     struct serial_device_s *sd;

src/include/86box/serial_passthrough.h

@@ -50,6 +50,7 @@ typedef struct serial_passthrough_s {
     intptr_t                     master_fd;    /* file desc for master pseudo terminal or
                                                 * socket or alike */
     char  host_serial_path[1024];              /* Path to TTY/host serial port on the host */
+    char  named_pipe[1024];                    /* (Windows only) Name of the pipe. */
     void *backend_priv;                        /* Private platform backend data */
 } serial_passthrough_t;