mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-03-02 10:48:24 -07:00
Code Issues Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-19 13:48:10 -05:00
parent fd8c5cf1af 38b9d4e9fa
commit 960bb3614b
394 changed files with 78773 additions and 75725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/86box/machine.h
View File

@@ -127,7 +127,10 @@
#define IS_AT(m) (((machines[m].bus_flags & (MACHINE_BUS_ISA16 | MACHINE_BUS_EISA | MACHINE_BUS_VLB | MACHINE_BUS_MCA | MACHINE_BUS_PCI | MACHINE_BUS_PCMCIA | MACHINE_BUS_AGP | MACHINE_BUS_AC97)) && !(machines[m].bus_flags & MACHINE_PC98)) ? 1 : 0)
#define CPU_BLOCK(...) \
(const uint8_t[]) { __VA_ARGS__, 0 }
(const uint8_t[]) \
{ \
__VA_ARGS__, 0 \
}
#define MACHINE_MULTIPLIER_FIXED -1
#define CPU_BLOCK_NONE 0