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

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

Browse Source
This commit is contained in:
OBattler
2020-06-11 12:53:06 +02:00
parent 464a6da62f 563a432b7e
commit 244874ed61
13 changed files with 349 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,8 +45,11 @@ extern const device_t i440fx_device;
extern const device_t i440lx_device;
extern const device_t i440ex_device;
extern const device_t i440bx_device;
extern const device_t i440gx_device;
extern const device_t i440zx_device;
extern const device_t ioapic_device;
/* OPTi */
extern const device_t opti495_device;
extern const device_t opti5x7_device;

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

@@ -336,6 +336,8 @@ extern int machine_at_p65up5_cp6nd_init(const machine_t *);
extern int machine_at_p65up5_cpknd_init(const machine_t *);
extern int machine_at_kn97_init(const machine_t *);
extern int machine_at_lx6_init(const machine_t *);
extern int machine_at_p6i440e2_init(const machine_t *);
extern int machine_at_p2bls_init(const machine_t *);
@@ -354,9 +356,7 @@ extern const device_t *at_tsunamiatx_get_device(void);
#endif
/* m_at_slot2.c */
#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_s2dge_init(const machine_t *);
#endif
extern int machine_at_6gxu_init(const machine_t *);
/* m_at_socket370.c */
extern int machine_at_s370slm_init(const machine_t *);

1
src/include/86box/postcard.h
View File

@@ -11,6 +11,7 @@
*
*
* Author: RichardG, <richardg867@gmail.com>
*
* Copyright 2020 RichardG.
*/
#ifndef POSTCARD_H