claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1272 from richardg867/master

Browse Source 
Bugfixes, STPC un-devbranch and more
This commit is contained in:
Miran Grča
2021-02-09 01:24:38 +01:00
committed by GitHub
parent a496194bea 1f3f204301
commit c65777c309
12 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/chipset.h
View File

@@ -106,14 +106,12 @@ extern const device_t sis_5571_device;
#endif
/* ST */
#if defined(DEV_BRANCH) && defined(USE_STPC)
extern const device_t stpc_client_device;
extern const device_t stpc_consumer2_device;
extern const device_t stpc_elite_device;
extern const device_t stpc_atlas_device;
extern const device_t stpc_serial_device;
extern const device_t stpc_lpt_device;
#endif
/* VIA */
extern const device_t via_vt82c49x_device;

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

@@ -338,12 +338,10 @@ extern int machine_at_486vipio2_init(const machine_t *);
extern int machine_at_abpb4_init(const machine_t *);
extern int machine_at_win486pci_init(const machine_t *);
#endif
#if defined(DEV_BRANCH) && defined(USE_STPC)
extern int machine_at_itoxstar_init(const machine_t *);
extern int machine_at_arb1479_init(const machine_t *);
extern int machine_at_pcm9340_init(const machine_t *);
extern int machine_at_pcm5330_init(const machine_t *);
#endif
#ifdef EMU_DEVICE_H
extern const device_t *at_acera1g_get_device(void);