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/machine.h
+++ b/src/include/86box/machine.h
@@ -37,6 +37,7 @@
 #define MACHINE_BUS_PCI		0x00000200	/* sys has PCI bus */
 #define MACHINE_BUS_PCMCIA	0x00000400	/* sys has PCMCIA bus */
 #define MACHINE_BUS_AGP		0x00000800	/* sys has AGP bus */
+#define MACHINE_BUS_AC97	0x00080000	/* sys has AC97 bus (ACR/AMR/CNR slot) */
 /* Combined flags. */
 #define MACHINE_PC		0x00000004	/* sys is PC/XT-compatible (ISA) */
 #define MACHINE_AT		0x0000000C	/* sys is AT-compatible (ISA + ISA16) */