Merge pull request #1676 from 86Box/master

Bring the branch up to par with master.

src/include/86box/chipset.h

@@ -41,6 +41,7 @@ extern const device_t	contaq_82c596a_device;
 extern const device_t	contaq_82c597_device;
 
 /* C&T */
+extern const device_t	ct_82c100_device;
 extern const device_t	neat_device;
 extern const device_t	scat_device;
 extern const device_t	scat_4_device;
@@ -67,6 +68,7 @@ extern const device_t	i420zx_device;
 extern const device_t	i430lx_device;
 extern const device_t	i430nx_device;
 extern const device_t	i430fx_device;
+extern const device_t	i430fx_old_device;
 extern const device_t	i430fx_rev02_device;
 extern const device_t	i430hx_device;
 extern const device_t	i430vx_device;
@@ -86,6 +88,7 @@ extern const device_t	sio_device;
 extern const device_t	sio_zb_device;
 
 extern const device_t	piix_device;
+extern const device_t	piix_old_device;
 extern const device_t	piix_rev02_device;
 extern const device_t	piix3_device;
 extern const device_t	piix4_device;

src/include/86box/machine.h

@@ -661,6 +661,9 @@ extern int	machine_tandy_init(const machine_t *);
 extern int	machine_tandy1000hx_init(const machine_t *);
 extern int	machine_tandy1000sl2_init(const machine_t *);
 
+/* m_v86p.c */
+extern int	machine_v86p_init(const machine_t *);
+
 #ifdef EMU_DEVICE_H
 extern const device_t	*tandy1k_get_device(void);
 extern const device_t	*tandy1k_hx_get_device(void);

src/include/86box/nvr.h

@@ -121,6 +121,7 @@ extern void	nvr_wp_set(int set, int h, nvr_t *nvr);
 extern void	nvr_via_wp_set(int set, int reg, nvr_t *nvr);
 extern void	nvr_bank_set(int base, uint8_t bank, nvr_t *nvr);
 extern void	nvr_lock_set(int base, int size, int lock, nvr_t *nvr);
+extern void	nvr_irq_set(int irq, nvr_t *nvr);
 
 
 #endif	/*EMU_NVR_H*/

src/include/86box/plat.h

@@ -36,7 +36,7 @@ extern int stricmp(const char* s1, const char* s2);
 extern int strnicmp(const char* s1, const char* s2, size_t n);
 #endif
 
-#if defined(UNIX) && defined(FREEBSD) || defined(__APPLE__)
+#if (defined(__unix__) || defined(__APPLE__)) && !defined(__linux__)
 /* FreeBSD has largefile by default. */
 # define fopen64        fopen
 # define fseeko64       fseeko

src/include/86box/serial.h

@@ -77,7 +77,7 @@ extern serial_t *	serial_attach(int port,
 			      void *priv);
 extern void	serial_remove(serial_t *dev);
 extern void	serial_set_type(serial_t *dev, int type);
-extern void	serial_setup(serial_t *dev, uint16_t addr, int irq);
+extern void	serial_setup(serial_t *dev, uint16_t addr, uint8_t irq);
 extern void	serial_clear_fifo(serial_t *dev);
 extern void	serial_write_fifo(serial_t *dev, uint8_t dat);
 extern void	serial_set_next_inst(int ni);

src/include/86box/sio.h

@@ -20,6 +20,7 @@ extern void		vt82c686_sio_write(uint8_t addr, uint8_t val, void *priv);
 
 extern const device_t	acc3221_device;
 extern const device_t	f82c710_device;
+extern const device_t	f82c606_device;
 extern const device_t	fdc37c651_device;
 extern const device_t	fdc37c651_ide_device;
 extern const device_t	fdc37c661_device;

src/include/86box/vid_svga.h

@@ -156,6 +156,7 @@ typedef struct svga_t
 
 	/*Force CRTC to dword mode, regardless of CR14/CR17. Required for S3 enhanced mode*/
 	int force_dword_mode;
+	int force_byte_mode;
 
 	int remap_required;
 	uint32_t (*remap_func)(struct svga_t *svga, uint32_t in_addr);

src/include/86box/vid_svga_render_remap.h

@@ -101,7 +101,7 @@ void svga_recalc_remap_func(svga_t *svga)
 {
         int func_nr;
         
-        if (svga->fb_only)
+        if (svga->fb_only || svga->force_byte_mode)
                 func_nr = 0;
         else {
                 if (svga->force_dword_mode)

src/include/86box/video.h

@@ -250,6 +250,9 @@ extern const device_t compaq_cga_2_device;
 extern const device_t ogc_device;
 extern const device_t ogc_m24_device;
 
+/* Chips & Technologies 82C425 */
+extern const device_t f82c425_video_device;
+
 /* NCR NGA */
 extern const device_t nga_device;