Revert "Revert "Merge branch 'feature/machine_and_kb' into master""

This reverts commit f2cd3756dd.
2021-07-04 17:40:39 +02:00
parent 3b61d8a4d1
commit 4f6df76f10
77 changed files with 11883 additions and 3484 deletions
--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -150,5 +150,8 @@ extern int	(*ide_bus_master_dma)(int channel, uint8_t *data, int transfer_length
 extern void	(*ide_bus_master_set_irq)(int channel, void *priv);
 extern void	*ide_bus_master_priv[2];

+extern uint8_t	ide_read_ali_75(void);
+extern uint8_t	ide_read_ali_76(void);
+

 #endif	/*EMU_IDE_H*/