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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2021-04-25 18:47:55 +02:00
parent b4c2a657a1 b68f69b2bd
commit 8535e746dc
9 changed files with 950 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,9 +109,8 @@ extern const device_t sis_85c471_device;
extern const device_t sis_85c496_device;
extern const device_t sis_85c496_ls486e_device;
extern const device_t sis_85c50x_device;
#if defined(DEV_BRANCH) && defined(USE_SIS_5571)
extern const device_t sis_5511_device;
extern const device_t sis_5571_device;
#endif
extern const device_t sis_5598_device;
/* ST */

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

@@ -422,6 +422,8 @@ extern const device_t *at_thor_get_device(void);
#endif
/* m_at_socket7_s7.c */
extern int machine_at_ap5s_init(const machine_t *);
extern int machine_at_chariot_init(const machine_t *);
extern int machine_at_mr586_init(const machine_t *);
extern int machine_at_thor_init(const machine_t *);
@@ -462,10 +464,9 @@ extern int machine_at_an430tx_init(const machine_t *);
extern int machine_at_mb540n_init(const machine_t *);
extern int machine_at_p5mms98_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_SIS_5571)
extern int machine_at_r534f_init(const machine_t *);
extern int machine_at_ms5146_init(const machine_t *);
#endif
#if defined(DEV_BRANCH) && defined(USE_M154X)
extern int machine_at_m560_init(const machine_t *);
extern int machine_at_ms5164_init(const machine_t *);