Merge pull request #1581 from 86Box/master

Bring the branch up to par with master.
2021-08-04 09:15:08 +02:00
parent 66da8a9905 ded75f30d9
commit 77a5cf6891
30 changed files with 2075 additions and 480 deletions
--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -136,6 +136,9 @@ extern void	ide_sec_enable(void);
 extern void	ide_sec_disable(void);

 extern void	ide_board_set_force_ata3(int board, int force_ata3);
+#ifdef EMU_ISAPNP_H
+extern void	ide_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv);
+#endif

 extern double	ide_atapi_get_period(uint8_t channel);
 #ifdef SCSI_DEVICE_H